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.11.2.3 -r1.11.2.4
--- openacs-4/packages/acs-tcl/tcl/site-nodes-procs-oracle.xql	24 Mar 2003 10:28:46 -0000	1.11.2.3
+++ openacs-4/packages/acs-tcl/tcl/site-nodes-procs-oracle.xql	2 Jul 2003 19:39:56 -0000	1.11.2.4
@@ -23,10 +23,13 @@
                     where acs_objects.object_id = site_nodes.object_id) as object_type,
                    apm_packages.package_key,
                    apm_packages.package_id,
-                   apm_packages.instance_name
+                   apm_packages.instance_name,
+                   apm_package_types.package_type
             from site_nodes,
-                 apm_packages
+                 apm_packages,
+                 apm_package_types
             where site_nodes.object_id = apm_packages.package_id(+)
+            and apm_package_types.package_key = apm_packages.package_key
         </querytext>
     </fullquery>
 
@@ -44,11 +47,14 @@
                     where acs_objects.object_id = site_nodes.object_id) as object_type,
                    apm_packages.package_key,
                    apm_packages.package_id,
-                   apm_packages.instance_name
+                   apm_packages.instance_name,
+                   apm_package_types.package_type
             from site_nodes,
-                 apm_packages
+                 apm_packages,
+                 apm_package_types
             where site_nodes.node_id = :node_id
             and site_nodes.object_id = apm_packages.package_id(+)
+            and apm_package_types.package_key = apm_packages.package_key
         </querytext>
     </fullquery>
 
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.15.2.2 -r1.15.2.3
--- openacs-4/packages/acs-tcl/tcl/site-nodes-procs-postgresql.xql	20 Mar 2003 12:48:11 -0000	1.15.2.2
+++ openacs-4/packages/acs-tcl/tcl/site-nodes-procs-postgresql.xql	2 Jul 2003 19:39:56 -0000	1.15.2.3
@@ -23,8 +23,11 @@
                     where acs_objects.object_id = site_nodes.object_id) as object_type,
                    apm_packages.package_key,
                    apm_packages.package_id,
-                   apm_packages.instance_name
-            from site_nodes left join apm_packages on site_nodes.object_id = apm_packages.package_id
+                   apm_packages.instance_name,
+                   apm_package_types.package_type
+            from site_nodes left join 
+                 apm_packages on site_nodes.object_id = apm_packages.package_id left join
+                 apm_package_types using (package_key)
         </querytext>
     </fullquery>
 
@@ -42,8 +45,11 @@
                     where acs_objects.object_id = site_nodes.object_id) as object_type,
                    apm_packages.package_key,
                    apm_packages.package_id,
-                   apm_packages.instance_name
-            from site_nodes left join apm_packages on site_nodes.object_id = apm_packages.package_id
+                   apm_packages.instance_name,
+                   apm_package_types.package_type
+            from site_nodes left join 
+                 apm_packages on site_nodes.object_id = apm_packages.package_id left join
+                 apm_package_types using (package_key)
             where site_nodes.node_id = :node_id
         </querytext>
     </fullquery>