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.31 -r1.32
--- openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl	27 Oct 2014 16:40:06 -0000	1.31
+++ openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl	7 Aug 2017 23:47:59 -0000	1.32
@@ -23,10 +23,9 @@
 }
 
 ad_proc -private apm_attribute_value {
-    {
-	-default ""
-    }
-    element attribute } {
+    {-default ""}
+    element attribute
+} {
 
     Parses the XML element to return the value for the specified attribute.
 
@@ -67,44 +66,44 @@
     append spec "<?xml version=\"1.0\"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key=\"[ad_quotehtml $package_key]\" url=\"[ad_quotehtml $package_uri]\" type=\"$package_type\">
-    <package-name>[ad_quotehtml $pretty_name]</package-name>
-    <pretty-plural>[ad_quotehtml $pretty_plural]</pretty-plural>
+<package key=\"[ns_quotehtml $package_key]\" url=\"[ns_quotehtml $package_uri]\" type=\"$package_type\">
+    <package-name>[ns_quotehtml $pretty_name]</package-name>
+    <pretty-plural>[ns_quotehtml $pretty_plural]</pretty-plural>
     <initial-install-p>$initial_install_p</initial-install-p>
     <singleton-p>$singleton_p</singleton-p>
     <implements-subsite-p>$implements_subsite_p</implements-subsite-p>
     <inherit-templates-p>$inherit_templates_p</inherit-templates-p>
     ${auto_mount_tag}
-    <version name=\"$version_name\" url=\"[ad_quotehtml $version_uri]\">\n"
+    <version name=\"$version_name\" url=\"[ns_quotehtml $version_uri]\">\n"
 
     db_foreach owner_info {} {
         append spec "        <owner"
         if { $owner_uri ne "" } {
-    	append spec " url=\"[ad_quotehtml $owner_uri]\""
+    	append spec " url=\"[ns_quotehtml $owner_uri]\""
         }
-        append spec ">[ad_quotehtml $owner_name]</owner>\n"
+        append spec ">[ns_quotehtml $owner_name]</owner>\n"
     }
 
     apm_log APMDebug "APM: Writing Version summary and description"
     if { $summary ne "" } {
-        append spec "        <summary>[ad_quotehtml $summary]</summary>\n"
+        append spec "        <summary>[ns_quotehtml $summary]</summary>\n"
     }
     if { $release_date ne "" } {
-        append spec "        <release-date>[ad_quotehtml [string range $release_date 0 9]]</release-date>\n"
+        append spec "        <release-date>[ns_quotehtml [string range $release_date 0 9]]</release-date>\n"
     }
     if { $vendor ne "" || $vendor_uri ne "" } {
         append spec "        <vendor"
         if { $vendor_uri ne "" } {
-    	append spec " url=\"[ad_quotehtml $vendor_uri]\""
+    	append spec " url=\"[ns_quotehtml $vendor_uri]\""
         }
-        append spec ">[ad_quotehtml $vendor]</vendor>\n"
+        append spec ">[ns_quotehtml $vendor]</vendor>\n"
     }
     if { $description ne "" } {
         append spec "        <description"
         if { $description_format ne "" } {
-	    append spec " format=\"[ad_quotehtml $description_format]\""
+	    append spec " format=\"[ns_quotehtml $description_format]\""
         }
-        append spec ">[ad_quotehtml $description]</description>\n"
+        append spec ">[ns_quotehtml $description]</description>\n"
     }
 
     append spec [apm::package_version::attributes::generate_xml \
@@ -115,16 +114,16 @@
     
     apm_log APMDebug "APM: Writing Dependencies."
     db_foreach dependency_info {} {
-        append spec "        <$dependency_type url=\"[ad_quotehtml $service_uri]\" version=\"[ad_quotehtml $service_version]\"/>\n"
+        append spec "        <$dependency_type url=\"[ns_quotehtml $service_uri]\" version=\"[ns_quotehtml $service_version]\"/>\n"
     } else {
         append spec "        <!-- No dependency information -->\n"
     }
 
     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 "            <callback type=\"[ns_quotehtml $type]\" \
+                                           proc=\"[ns_quotehtml $proc]\"/>\n"
     }
     append spec "        </callbacks>"
     append spec "\n        <parameters>\n"
@@ -133,20 +132,20 @@
     set parent_package_keys [lrange [apm_one_package_inherit_order $package_key] 0 end-1]
 
     db_foreach parameter_info {} {
-	append spec "            <parameter scope=\"[ad_quotehtml $scope]\" datatype=\"[ad_quotehtml $datatype]\" \
-		min_n_values=\"[ad_quotehtml $min_n_values]\" \
-		max_n_values=\"[ad_quotehtml $max_n_values]\" \
-		name=\"[ad_quotehtml $parameter_name]\" "
+	append spec "            <parameter scope=\"[ns_quotehtml $scope]\" datatype=\"[ns_quotehtml $datatype]\" \
+		min_n_values=\"[ns_quotehtml $min_n_values]\" \
+		max_n_values=\"[ns_quotehtml $max_n_values]\" \
+		name=\"[ns_quotehtml $parameter_name]\" "
 	if { $default_value ne "" } {
-	    append spec " default=\"[ad_quotehtml $default_value]\""
+	    append spec " default=\"[ns_quotehtml $default_value]\""
 	}
 
 	if { $description ne "" } {
-	    append spec " description=\"[ad_quotehtml $description]\""
+	    append spec " description=\"[ns_quotehtml $description]\""
 	}
 	
 	if { $section_name ne "" } {
-	    append spec " section_name=\"[ad_quotehtml $section_name]\""
+	    append spec " section_name=\"[ns_quotehtml $section_name]\""
 	}
 
 	append spec "/>\n"
@@ -202,7 +201,9 @@
     <code>vendor</code>,
     <code>group</code>,
     <code>vendor.url</code>, and
-    <code>description.format</code>.
+    <code>description.format</code>,
+    <code>maturity</code>,
+    <code>maturity_text</code>.
 
     </ul>
     
@@ -236,7 +237,11 @@
     set xml_data [read $file]
     close $file
 
-    set tree [xml_parse -persist $xml_data]
+    if {[catch {set tree [xml_parse -persist $xml_data]} errorMsg]} {
+        ns_log error "parsing XML file $path lead to error: $errorMsg"
+        return -code error "file: $path\n$errorMsg"
+    }
+
     set root_node [xml_doc_get_first_node $tree]
     apm_log APMDebug "XML: root node is [xml_node_get_name $root_node]"
     set package $root_node
@@ -276,9 +281,11 @@
     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(maturity) ""
+    foreach property_name { summary description release-date vendor maturity } {
 	set properties($property_name) [apm_tag_value $version $property_name]
     }
+    set properties(maturity_text) [apm::package_version::attributes::maturity_int_to_text $properties(maturity)]
 
     apm::package_version::attributes::parse_xml \
         -parent_node $version \
@@ -420,3 +427,9 @@
 
     return $return_value
 }
+
+# Local variables:
+#    mode: tcl
+#    tcl-indent-level: 4
+#    indent-tabs-mode: nil
+# End: