Index: openacs-4/packages/acs-tcl/tcl/site-nodes-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/site-nodes-procs-oracle.xql,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-tcl/tcl/site-nodes-procs-oracle.xql	22 Jun 2002 20:09:31 -0000	1.10
+++ openacs-4/packages/acs-tcl/tcl/site-nodes-procs-oracle.xql	14 Sep 2002 20:20:47 -0000	1.11
@@ -21,7 +21,8 @@
                     from acs_objects
                     where acs_objects.object_id = site_nodes.object_id) as object_type,
                    apm_packages.package_key,
-                   apm_packages.package_id
+                   apm_packages.package_id,
+                   apm_packages.instance_name
             from site_nodes,
                  apm_packages
             where site_nodes.object_id = apm_packages.package_id(+)
@@ -40,7 +41,8 @@
                     from acs_objects
                     where acs_objects.object_id = site_nodes.object_id) as object_type,
                    apm_packages.package_key,
-                   apm_packages.package_id
+                   apm_packages.package_id,
+                   apm_packages.instance_name
             from site_nodes,
                  apm_packages
             where site_nodes.node_id = :node_id
Index: openacs-4/packages/acs-tcl/tcl/site-nodes-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/site-nodes-procs-postgresql.xql,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/acs-tcl/tcl/site-nodes-procs-postgresql.xql	22 Jun 2002 20:09:31 -0000	1.14
+++ openacs-4/packages/acs-tcl/tcl/site-nodes-procs-postgresql.xql	14 Sep 2002 20:20:47 -0000	1.15
@@ -21,7 +21,8 @@
                     from acs_objects
                     where acs_objects.object_id = site_nodes.object_id) as object_type,
                    apm_packages.package_key,
-                   apm_packages.package_id
+                   apm_packages.package_id,
+                   apm_packages.instance_name
             from site_nodes left join apm_packages on site_nodes.object_id = apm_packages.package_id
         </querytext>
     </fullquery>
@@ -38,7 +39,8 @@
                     from acs_objects
                     where acs_objects.object_id = site_nodes.object_id) as object_type,
                    apm_packages.package_key,
-                   apm_packages.package_id
+                   apm_packages.package_id,
+                   apm_packages.instance_name
             from site_nodes left join apm_packages on site_nodes.object_id = apm_packages.package_id
             where site_nodes.node_id = :node_id
         </querytext>
Index: openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl	10 Sep 2002 22:22:14 -0000	1.15
+++ openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl	14 Sep 2002 20:20:47 -0000	1.16
@@ -66,19 +66,9 @@
         nsv_array reset site_nodes [list]
         nsv_array reset site_node_urls [list]
 
-        db_foreach select_site_nodes {} {
-            set node(url) $url
-            set node(node_id) $node_id
-            set node(parent_id) $parent_id
-            set node(directory_p) $directory_p
-            set node(pattern_p) $pattern_p
-            set node(object_id) $object_id
-            set node(object_type) $object_type
-            set node(package_key) $package_key
-            set node(package_id) $package_id
-
-            nsv_set site_nodes $url [array get node]
-            nsv_set site_node_urls $node_id $url
+        db_foreach select_site_nodes {} -column_array node {
+            nsv_set site_nodes $node(url) [array get node]
+            nsv_set site_node_urls $node(node_id) $node(url)
         }
 
         ns_eval {
@@ -92,24 +82,14 @@
     ad_proc -private update_cache {
         {-node_id:required}
     } {
-        if {[db_0or1row select_site_node {}]} {
-            set node(url) $url
-            set node(node_id) $node_id
-            set node(parent_id) $parent_id
-            set node(directory_p) $directory_p
-            set node(pattern_p) $pattern_p
-            set node(object_id) $object_id
-            set node(object_type) $object_type
-            set node(package_key) $package_key
-            set node(package_id) $package_id
+        if { [db_0or1row select_site_node {} -column_array node] } {
+            nsv_set site_nodes $node(url) [array get node]
+            nsv_set site_node_urls $node(node_id) $node(url)
 
-            nsv_set site_nodes $url [array get node]
-            nsv_set site_node_urls $node_id $url
-
             ns_eval {
                 global tcl_site_nodes
-                if {[info exists tcl_site_nodes]} {
-                    array unset tcl_site_nodes "${url}*"
+                if { [info exists tcl_site_nodes] } {
+                    array unset tcl_site_nodes "${node(url)}*"
                 }
             }
         } else {