Index: openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl	14 Sep 2002 13:23:05 -0000	1.11
+++ openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl	23 Jan 2003 17:55:24 -0000	1.12
@@ -9,11 +9,17 @@
     @cvs-id $Id$
 } 
 
-ad_proc -private apm_load_xml_packages {} {
+ad_proc -private -deprecated apm_load_xml_packages {} {
 
+    <p>
+    NOTE: This proc doesn't do anything anymore.
+    </p>
+
+    <p>
     Loads XML packages into the running interpreter, if they're not
     already there. We need to load these packages once per connection,
     since AOLserver doesn't seem to deal with packages very well.
+    </p>
 
 } {
     global ad_conn
@@ -91,14 +97,10 @@
     Generates an XML-formatted specification for a version of a package.
 
 } {
-    set spec ""
-    db_1row package_version_select {
-        select t.package_key, t.package_uri, t.pretty_name, t.pretty_plural, t.package_type,
-	t.initial_install_p, t.singleton_p, v.*
-        from   apm_package_versions v, apm_package_types t
-        where  v.version_id = :version_id
-        and    v.package_key = t.package_key
-    }
+    set spec {}
+
+    db_1row package_version_select {}
+
     apm_log APMDebug "APM: Writing Package Specification for $pretty_name $version_name"
     append spec "<?xml version=\"1.0\"?>
 <!-- Generated by the OpenACS Package Manager -->
@@ -112,21 +114,12 @@
     <version name=\"$version_name\" url=\"[ad_quotehtml $version_uri]\">
     <database-support>\n"
 
-    db_foreach supported_databases {
-        select unique db_type
-        from apm_package_files
-        where db_type is not null
-    } {
+    db_foreach supported_databases {} {
         append spec "        <database>$db_type</database>\n"
     }
     append spec "    </database-support>\n"
 
-    db_foreach owner_info {
-        select owner_uri, owner_name
-        from   apm_package_owners
-        where  version_id = :version_id
-        order by sort_key
-    } {
+    db_foreach owner_info {} {
         append spec "        <owner"
         if { ![empty_string_p $owner_uri] } {
     	append spec " url=\"[ad_quotehtml $owner_uri]\""
@@ -159,12 +152,7 @@
     append spec "\n"
     
     apm_log APMDebug "APM: Writing Dependencies."
-    db_foreach dependency_info {
-        select dependency_type, service_uri, service_version
-        from   apm_package_dependencies
-        where  version_id = :version_id
-        order by dependency_type, service_uri
-    } {
+    db_foreach dependency_info {} {
         append spec "        <$dependency_type url=\"[ad_quotehtml $service_uri]\" version=\"[ad_quotehtml $service_version]\"/>\n"
     } else {
         append spec "        <!-- No dependency information -->\n"
@@ -173,7 +161,7 @@
 
     append spec "\n        <files>\n"
     apm_log APMDebug "APM: Writing Files." 
-    db_foreach version_path "select path, file_type, db_type from apm_package_files where version_id = :version_id order by path" {
+    db_foreach version_path {} {
         append spec "            <file"
         if { ![empty_string_p $file_type] } {
             append spec " type=\"$file_type\""
@@ -185,14 +173,17 @@
     } else {
         append spec "            <!-- No files -->\n"
     }
-    append spec "        </files>
-        <parameters>\n"
+    append spec "        </files>"
+    append spec "\n        <callbacks>\n"
+    apm_log APMDebug "APM: Writing callbacks"
+    db_foreach callback_info {} {
+        append spec "            <callback type=\"[ad_quotehtml $type]\" \
+                                           proc=\"[ad_quotehtml $proc]\"/>\n"
+    }
+    append spec "        </callbacks>"
+    append spec "\n        <parameters>\n"
     apm_log APMDebug "APM: Writing parameters"
-    db_foreach parameter_info {
-	select parameter_name, description, datatype, section_name, default_value, min_n_values, max_n_values
-	  from apm_parameters
-	 where package_key = :package_key
-    } {
+    db_foreach parameter_info {} {
 	append spec "            <parameter datatype=\"[ad_quotehtml $datatype]\" \
 		min_n_values=\"[ad_quotehtml $min_n_values]\" \
 		max_n_values=\"[ad_quotehtml $max_n_values]\" \
@@ -239,6 +230,8 @@
     <li><code>files</code>: a list of files in the package,
     containing elements of the form <code>[list $path
     $type]</code>
+    <li><code>callbacks</code>: an array list of callbacks of the package
+    on the form <code>[list callback_type1 proc_name1 callback_type2 proc_name2 ...] 
     <li>Element and attribute values directly from the XML specification:
     <code>package.key</code>,
     <code>package.url</code>,
@@ -430,6 +423,38 @@
 	}
     }
 
+    # Build a list of package callbacks
+    array set callback_array {}
+
+    set callbacks_node_list [xml_node_get_children_by_name $version callbacks]
+
+    foreach callbacks_node $callbacks_node_list {
+        
+        set callback_node_list [xml_node_get_children_by_name $callbacks_node callback]
+        foreach callback_node $callback_node_list {
+
+            set type [apm_attribute_value $callback_node type]
+            set proc [apm_attribute_value $callback_node proc]
+
+            if { [llength [array get callback_array $type]] != 0 } {
+                # A callback proc of this type already found in the xml file
+                ns_log Error "package info file $path contains more than one callback proc of type $type"
+                continue
+            }
+            
+            if { [lsearch -exact [apm_supported_callback_types] $type] < 0 } {
+                # The callback type is not supported
+                ns_log Error "package info file $path contains an unsupported callback type $type - ignoring. Valid values are [apm_supported_callback_types]"
+                continue
+            }
+
+            set callback_array($type) $proc
+        }
+    }
+
+    set properties(callbacks) [array get callback_array]
+
+
     # Build a list of the package's owners (if any).
 
     set properties(owners) [list]