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.14 -r1.15
--- openacs-4/packages/acs-tcl/tcl/site-nodes-procs-oracle.xql	29 Aug 2003 13:29:48 -0000	1.14
+++ openacs-4/packages/acs-tcl/tcl/site-nodes-procs-oracle.xql	29 Sep 2003 11:52:31 -0000	1.15
@@ -53,8 +53,8 @@
                  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
+            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.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl,v
diff -u -r1.40 -r1.41
--- openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl	22 Sep 2003 13:45:20 -0000	1.40
+++ openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl	29 Sep 2003 11:52:31 -0000	1.41
@@ -130,15 +130,16 @@
     }
 
     # Default context id to the closest ancestor package_id
-    if {[empty_string_p $context_id]} {
+    if { [empty_string_p $context_id] } {
         set context_id [site_node::closest_ancestor_package -node_id $node_id]
     }
 
     # Instantiate the package
-    set package_id [apm_package_instance_new -package_id $package_id \
-                                             -package_key $package_key \
-                                             -instance_name $package_name \
-                                             -context_id $context_id]
+    set package_id [apm_package_instance_new \
+                        -package_id $package_id \
+                        -package_key $package_key \
+                        -instance_name $package_name \
+                        -context_id $context_id]
 
     # Mount the package
     site_node::mount -node_id $node_id -object_id $package_id