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.5 -r1.6
--- openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl	31 May 2001 21:18:07 -0000	1.5
+++ openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl	14 Jul 2001 23:03:25 -0000	1.6
@@ -70,7 +70,7 @@
     Parses the XML element and returns the associated property name if it exists.
 } {
     # set node [lindex [dom::element getElementsByTagName $root $property_name] 0]
-    set node [lindex [xml_find_child_nodes $root $property_name] 0]
+    set node [lindex [xml_node_get_children_by_name $root $property_name] 0]
 
     if { ![empty_string_p $node] } {
 	# return [dom::node cget [dom::node cget $node -firstChild] -nodeValue]
@@ -291,21 +291,21 @@
     set xml_data [xml_prepare_data $xml_data]
 
     # set tree [dom::DOMImplementation parse $xml_data]
-    set tree [ns_xml parse $xml_data]
+    set tree [xml_parse $xml_data]
     # set package [dom::node cget $tree -firstChild]
-    set root_node [ns_xml doc root $tree]
+    set root_node [xml_doc_get_first_node_by_name $tree package]
     ns_log Notice "XML: root node is [ns_xml node name $root_node]"
     set package $root_node
 
     # set root_name [dom::node cget $package -nodeName]
-    set root_name [ns_xml node name $package]
+    set root_name [xml_node_get_name $package]
 
     # Debugging Children
-    set root_children [ns_xml node children $root_node]
+    set root_children [xml_node_get_children $root_node]
 
     ns_log Notice "XML - there are [llength $root_children] child nodes"
     foreach child $root_children {
-	ns_log Notice "XML - one root child: [ns_xml node name $child]"
+	ns_log Notice "XML - one root child: [xml_node_get_name $child]"
     }
 
     if { ![string equal $root_name "package"] } {
@@ -322,7 +322,7 @@
 
 
     # set versions [dom::element getElementsByTagName $package version]
-    set versions [xml_find_child_nodes $package version]
+    set versions [xml_node_get_children_by_name $package version]
 
     if { [llength $versions] != 1 } {
 	error "Package must contain exactly one <version> node"
@@ -349,7 +349,7 @@
 	description format
     } {
 	# set node [lindex [dom::element getElementsByTagName $version $property_name] 0]
-	set node [lindex [xml_find_child_nodes $version $property_name] 0]
+	set node [lindex [xml_node_get_children_by_name $version $property_name] 0]
 	if { ![empty_string_p $node] } {
 	    # set properties($property_name.$attribute_name) [dom::element getAttribute $node $attribute_name]
 	    set properties($property_name.$attribute_name) [apm_attribute_value $node $attribute_name]
@@ -370,7 +370,7 @@
 
     foreach dependency_type { provides requires } {
 	# set dependency_types [dom::element getElementsByTagName $version $dependency_type]
-	set dependency_types [xml_find_child_nodes $version $dependency_type]
+	set dependency_types [xml_node_get_children_by_name $version $dependency_type]
 
 	foreach node $dependency_types {
 	    set service_uri [apm_required_attribute_value $node url]
@@ -384,11 +384,11 @@
     set properties(files) [list]
 
     # set nodes [dom::element getElementsByTagName $version "files"]
-    set files [xml_find_child_nodes $version files]
+    set files [xml_node_get_children_by_name $version files]
 
     foreach node $files {
 	# set file_nodes [dom::element getElementsByTagName $node "file"]
-	set file_nodes [xml_find_child_nodes $node file]
+	set file_nodes [xml_node_get_children_by_name $node file]
 	
 	foreach file_node $file_nodes {
 	    set file_path [apm_required_attribute_value $file_node path]
@@ -415,13 +415,13 @@
     set properties(owners) [list]
 
     # set owners [dom::element getElementsByTagName $version "owner"]
-    set owners [xml_find_child_nodes $version owner]
+    set owners [xml_node_get_children_by_name $version owner]
 
     foreach node $owners {
 	# set url [dom::element getAttribute $node url]
 	set url [apm_attribute_value $node url]
 	# set name [dom::node cget [dom::node cget $node -firstChild] -nodeValue]
-	set name [ns_xml node getcontent [lindex [ns_xml node children $node] 0]]
+	set name [xml_node_get_content [lindex [xml_node_get_children $node] 0]]
 	lappend properties(owners) [list $name $url]
     }
 
@@ -431,11 +431,11 @@
     ns_log Debug "APM: Reading Parameters"
 
     # set parameters [dom::element getElementsByTagName $version "parameters"]
-    set parameters [xml_find_child_nodes $version parameters]
+    set parameters [xml_node_get_children_by_name $version parameters]
 
     foreach node $parameters {
 	# set parameter_nodes [dom::element getElementsByTagName $node "parameter"]
-	set parameter_nodes [xml_find_child_nodes $node parameter]
+	set parameter_nodes [xml_node_get_children_by_name $node parameter]
 
 	foreach parameter_node $parameter_nodes {	  
 	    # set default_value [dom::element getAttribute $parameter_node default]