Local nodes and widearea nodes now implemented in ptopgen-new.

How simple you all seemed compared to the terrible links ahead...

db/Node.pm.in

@@ -1294,6 +1294,8 @@ sub L__reservation($$)
 sub vname($)		{ return L__reservation($_[0], 'vname'); }
 sub sharing_mode($)	{ return L__reservation($_[0], 'sharing_mode'); }
 sub erole($)		{ return L__reservation($_[0], 'erole'); }
+sub eid($)              { return L__reservation($_[0], 'eid'); }
+sub pid($)              { return L__reservation($_[0], 'pid'); }
 sub external_resource_index($) {
     return L__reservation($_[0], 'external_resource_index'); }
 sub external_resource_id($) {

tbsetup/ptopgen-new.in

@@ -32,7 +32,7 @@ sub printResults();
 #
 $| = 1;
 
-my $print_xml = 1;
+my $print_xml = 0;
 my $print_ns = $GeniXML::RSPEC_2_NS;
 
 # Initialize permissions table for the current project
@@ -46,19 +46,8 @@ sub processArgs()
 
 sub consultDatabase()
 {
-    my $dbresult;
-    my $row;
     # Bulk lookup on nodes table
-    $dbresult = DBQueryFatal("select * from nodes");
-    while ($row = $dbresult->fetchrow_hashref()) {
-	libptopnew::CreateNode($row);
-    }
-
-    # Bulk lookup on reserved table
-    $dbresult = DBQueryFatal("select * from reserved");
-    while ($row = $dbresult->fetchrow_hashref()) {
-	libptopnew::Nodes()->{$row->{"node_id"}}->node()->SetReservedRow($row);
-    }
+    libptopnew::LookupNodes();
 
     # Bulk lookup of permissions table for project
     libptopnew::LookupPermissions();
@@ -75,6 +64,9 @@ sub consultDatabase()
     # Bulk lookup of osids for features and genimode
     libptopnew::LookupOsids();
 
+    # Bulk lookup of wires and interfaces
+    libptopnew::LookupLinks();
+
     # Process each node adding ptypes and features
     foreach my $current (values(%{ libptopnew::Nodes() })) {
 	if ($current->willPrint()) {