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 -N -r1.30.4.2 -r1.30.4.3
--- openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl	12 Oct 2013 13:55:18 -0000	1.30.4.2
+++ openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl	12 Aug 2014 17:37:29 -0000	1.30.4.3
@@ -183,18 +183,18 @@
     $type]</code> NOTE: Files are no longer stored in info files but are always retrieved
     directly from the file system. This element in the array will always be the empty list.
     <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 ...] 
+    on the form <code>[list callback_type1 proc_name1 callback_type2 proc_name2 ...]</code> 
     <li>Element and attribute values directly from the XML specification:
     <code>package.key</code>,
     <code>package.url</code>,
     <code>package.type</code>
+    <code>package-name</code>,
     <code>pretty-plural</code>
     <code>initial-install-p</code>
     <code>singleton-p</code>
     <code>auto-mount</code>
-    <code>name</code> (the version name, e.g., <code>3.3a1</code>,
+    <code>name</code> (the version name, e.g., <code>3.3a1</code>),
     <code>url</code> (the version URL),
-    <code>package-name</code>,
     <code>option</code>,
     <code>summary</code>,
     <code>description</code>,
@@ -216,8 +216,6 @@
     descriptive error.
 
 } {
-    global ad_conn
-
     # If the .info file hasn't changed since last read (i.e., has the same
     # mtime), return the cached info list.
     set mtime [file mtime $path]
@@ -257,18 +255,17 @@
 	apm_log APMDebug "XML: the root name is $root_name"
 	error "Expected <package> as root node"
     }
-    set properties(package.key) [apm_required_attribute_value $package key]
-    set properties(package.url) [apm_required_attribute_value $package url]
-    set properties(package.type) [apm_attribute_value -default "apm_application" $package type]
-    set properties(package-name) [apm_tag_value $package package-name]
-    set properties(initial-install-p) [apm_tag_value -default "f" $package initial-install-p]
-    set properties(auto-mount) [apm_tag_value -default "" $package auto-mount]
-    set properties(singleton-p) [apm_tag_value -default "f" $package singleton-p]
+    set properties(package.key)          [apm_required_attribute_value $package key]
+    set properties(package.url)          [apm_required_attribute_value $package url]
+    set properties(package.type)         [apm_attribute_value -default "apm_application" $package type]
+    set properties(package-name)         [apm_tag_value $package package-name]
+    set properties(initial-install-p)    [apm_tag_value -default "f" $package initial-install-p]
+    set properties(auto-mount)           [apm_tag_value -default "" $package auto-mount]
+    set properties(singleton-p)          [apm_tag_value -default "f" $package singleton-p]
     set properties(implements-subsite-p) [apm_tag_value -default "f" $package implements-subsite-p]
-    set properties(inherit-templates-p) [apm_tag_value -default "t" $package inherit-templates-p]
-    set properties(pretty-plural) [apm_tag_value -default "$properties(package-name)s" $package pretty-plural]
+    set properties(inherit-templates-p)  [apm_tag_value -default "t" $package inherit-templates-p]
+    set properties(pretty-plural)        [apm_tag_value -default "$properties(package-name)s" $package pretty-plural]
 
-
     set versions [xml_node_get_children_by_name $package version]
 
     if { [llength $versions] != 1 } {
@@ -277,9 +274,8 @@
     set version [lindex $versions 0]
     
     set properties(name) [apm_required_attribute_value $version name]
-    set properties(url) [apm_required_attribute_value $version url]
+    set properties(url)  [apm_required_attribute_value $version url]
 
-
     # Set an entry in the properties array for each of these tags.
     foreach property_name { summary description release-date vendor } {
 	set properties($property_name) [apm_tag_value $version $property_name]
@@ -296,6 +292,7 @@
 
     foreach { property_name attribute_name } {
 	vendor url
+	license url
 	description format
     } {
 	set node [xml_node_get_first_child_by_name $version $property_name]