Index: openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql	30 Mar 2001 05:44:47 -0000	1.4
+++ openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql	3 Apr 2001 04:28:59 -0000	1.5
@@ -242,9 +242,8 @@
                        constraint apm_package_vers_ver_uri_un unique,
     summary 	       varchar(3000) default '' not null,
     description_format varchar(100) 
-		       constraint apm_package_vers_desc_for_nn not null
 		       constraint apm_package_vers_desc_for_ck
-		         check (description_format in ('', 'text/html', 'text/plain')),
+		         check (description_format in ('text/html', 'text/plain')),
     description        text default '' not null,
     release_date       timestamp,
     vendor             varchar(500) default '' not null,
@@ -2086,7 +2085,7 @@
 	  new__creation_ip,
 	  new__context_id
 	 );
-       if instance_name is null then 
+       if new__instance_name is null then 
 	 v_instance_name := new__package_key || '' '' || v_package_id;
        else
 	 v_instance_name := new__instance_name;
@@ -2612,7 +2611,7 @@
   a_start                integer;       
   a_end                  integer;       
   a_order                varchar(1000); 
-  a_char                 boolean;       
+  a_char                 char(1);       
   a_seen_letter          boolean default ''f'';        
 begin
 	a_start := 1;
@@ -2648,7 +2647,7 @@
 	    -- what''s the next character? if a period, just skip it
 	    a_char := substr(version_name, a_end, 1);
 	    if a_char = ''.'' then
-		null;
+		return null;
 	    else
 		-- if the next character was a letter, append the appropriate characters
 		if a_char = ''d'' then
@@ -2683,7 +2682,9 @@
 returns integer as '
 declare
   version_name_one       alias for $1;  
-  version_name_two       alias for $2;  
+  version_name_two       alias for $2;
+  a_order_a		 varchar(250);
+  a_order_b		 varchar(250);  
 begin
 	a_order_a := apm_package_version__sortable_version_name(version_name_one);
 	a_order_b := apm_package_version__sortable_version_name(version_name_two);
Index: openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl	30 Mar 2001 05:44:47 -0000	1.3
+++ openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl	3 Apr 2001 04:28:59 -0000	1.4
@@ -41,6 +41,10 @@
 
 	# At this point, we should have a directory that is equivalent to a package_key.
 	if { [apm_package_installed_p $package_key] } {
+
+	    # Load up the queries (OpenACS Query Dispatcher - ben)
+	    apm_package_install_queries $package_key
+
 	    if {$new_p} {
 		continue
 	    }
@@ -295,6 +299,8 @@
     array set version [apm_read_package_info_file $spec_file_path]
     set package_key $version(package.key)
 
+    # Install Queries (OpenACS Query Dispatcher - ben)
+    apm_package_install_queries $package_key
 
     if { $copy_files_p } {
 	if { [empty_string_p $install_path] } {
@@ -745,7 +751,7 @@
     set files [glob -nocomplain ${path}/www/*.sql]
     set files [concat $files [glob -nocomplain ${path}/tcl/*.sql]]
 
-    ns_log Notice "APM/QD = loading up package query files"
+    ns_log Notice "APM/QD = loading up package query files for $package_key"
 
     foreach file $files {
 	ns_log Notice "APM/QD = one file $file"
Index: openacs-4/packages/acs-tcl/tcl/apm-procs.postgresql.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/Attic/apm-procs.postgresql.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-tcl/tcl/apm-procs.postgresql.sql	3 Apr 2001 02:41:34 -0000	1.2
+++ openacs-4/packages/acs-tcl/tcl/apm-procs.postgresql.sql	3 Apr 2001 04:28:59 -0000	1.3
@@ -47,4 +47,16 @@
 <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 </fullquery>
 
+<fullquery name="acs.acs-tcl.tcl.apm-procs.apm_dependency_add.dependency_add">
+<querytext>
+select apm_package_version__add_dependency(
+    :dependency_id,
+    :version_id,
+    :dependency_uri,
+    :dependency_version
+)
+</querytext>
+<rdbms><type>postgresql</type><version>7.1</version></rdbms>
+</fullquery>
+
 </queryset>