Index: openacs-4/packages/acs-tcl/tcl/apm-install-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-install-procs-postgresql.xql,v
diff -u -r1.9 -r1.9.2.1
--- openacs-4/packages/acs-tcl/tcl/apm-install-procs-postgresql.xql	30 Aug 2002 11:48:47 -0000	1.9
+++ openacs-4/packages/acs-tcl/tcl/apm-install-procs-postgresql.xql	5 Mar 2003 14:40:42 -0000	1.9.2.1
@@ -3,24 +3,6 @@
 <queryset>
    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
-<fullquery name="apm_package_install.package_instantiate_mount">      
-      <querytext>
-
-	        select apm_package__new(
-                                  null,
-	                          :package_name,
-			  	  :package_key,
-                                  'apm_package',
-                                  now(),
-                                  null,
-                                  null,
-				  acs__magic_object_id('default_context')
-				  );
-	    
-      </querytext>
-</fullquery>
-
- 
 <fullquery name="apm_package_install_version.version_insert">      
       <querytext>
 		select apm_package_version__new(
@@ -34,6 +16,7 @@
 			:release_date,
 			:vendor,
 			:vendor_uri,
+                        :auto_mount,
 			't',
 			't'
 	              );
@@ -134,6 +117,7 @@
 				 :release_date,
 				 :vendor,
 				 :vendor_uri,
+                                 :auto_mount,
 				 't',
 				 't'				 
 				 );
@@ -142,45 +126,6 @@
 </fullquery>
 
  
-<fullquery name="apm_package_instantiate_and_mount.package_instantiate_and_mount">      
-      <querytext>
-
-	    declare
-	            main_site_id  site_nodes.node_id%TYPE;
-  	            instance_id   apm_packages.package_id%TYPE;
-	            node_id       site_nodes.node_id%TYPE;
-	    begin
-	            main_site_id := site_node__node_id('/',null);
-	        
-	            instance_id := apm_package__new(
-                                  null,
-                                  null,
-			  	  :package_key,
-                                  'apm_package',
-                                  now(),
-                                  null,
-                                  null,
-				  main_site_id
-				  );
-
-		    node_id := site_node__new(
-                             null
-			     main_site_id,
-			     :package_key,
-			     instance_id,
-			     't',
-			     't',
-                             null,
-                             null
-			  );
-
-                    return null;
-	    end;
-	    
-      </querytext>
-</fullquery>
-
- 
 <fullquery name="apm_version_upgrade.apm_version_upgrade">      
       <querytext>
 
@@ -234,6 +179,12 @@
       </querytext>
 </fullquery>
 
+ <fullquery name="apm_dependency_provided_p.version_greater_p">      
+      <querytext>
+        select apm_package_version__version_name_greater(:provided_version, :dependency_version)
+      </querytext>
+</fullquery>
+
 <fullquery name="apm_package_install.version_exists_p">      
       <querytext>
       
@@ -266,4 +217,24 @@
       </querytext>
 </fullquery>
 
+<fullquery name="apm_package_upgrade_from.apm_package_upgrade_from">      
+      <querytext>
+      
+	    select version_name from apm_package_versions
+	    where package_key = :package_key
+	    and version_id = apm_package__highest_version(:package_key)
+	
+      </querytext>
+</fullquery>
+
+<fullquery name="apm_version_names_compare.select_sortable_versions">      
+      <querytext>
+      
+	    select apm_package_version__sortable_version_name(:version_name_1) as sortable_version_1,
+                   apm_package_version__sortable_version_name(:version_name_2) as sortable_version_2
+            from   dual
+
+      </querytext>
+</fullquery>
+
 </queryset>