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.11.2.3 -r1.11.2.4 --- openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl 5 Mar 2003 14:40:42 -0000 1.11.2.3 +++ openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl 10 Mar 2003 19:32:51 -0000 1.11.2.4 @@ -109,14 +109,8 @@ $initial_install_p $singleton_p ${auto_mount_tag} - - \n" + \n" - db_foreach supported_databases {} { - append spec " $db_type\n" - } - append spec " \n" - db_foreach owner_info {} { append spec " [list $url $name]
  • files: a list of files in the package, containing elements of the form [list $path - $type] + $type] 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.
  • callbacks: an array list of callbacks of the package on the form [list callback_type1 proc_name1 callback_type2 proc_name2 ...]
  • Element and attribute values directly from the XML specification: @@ -369,47 +364,8 @@ } } - # Build a list of the files contained in the package. - - #DRB: we accept info files with no database-support section for legacy reasons. They - # should work with Oracle, Postgres users load them at their peril but the installer won't - # try to load the datamodel anyway. - - set database_support_sections [xml_node_get_children_by_name $version "database-support"] - set properties(database_support) [list] - if { [llength $database_support_sections] > 1 } { - error "Package must contain exactly one node" - } elseif { [llength $database_support_sections] != 0 } { - foreach database [xml_node_get_children_by_name [lindex $database_support_sections 0] "database"] { - lappend properties(database_support) [xml_node_get_content [lindex $database 0]] - } - } - set properties(files) [list] - set files [xml_node_get_children_by_name $version files] - - foreach node $files { - 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] - set type [apm_attribute_value $file_node type] - set db_type [apm_attribute_value $file_node db_type] - # Validate the file type: it must be null (unknown type) or - # some value in [apm_file_type_keys]. - if { ![empty_string_p $type] && [lsearch -exact [apm_file_type_keys] $type] < 0 } { - ns_log Warning "Unrecognized file type \"$type\" of file $file_path" - } - # Validate the database type: it must be null (unknown type) or - # some value in [apm_db_type_keys]. - if { ![empty_string_p $db_type] && [lsearch -exact [apm_db_type_keys] $db_type] < 0 } { - error "Invalid database type \"$db_type\"" - } - lappend properties(files) [list $file_path $type $db_type] - } - } - # Build a list of package callbacks array set callback_array {} Index: openacs-4/packages/acs-tcl/tcl/apm-xml-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-xml-procs.xql,v diff -u -N -r1.3.4.1 -r1.3.4.2 --- openacs-4/packages/acs-tcl/tcl/apm-xml-procs.xql 7 Mar 2003 12:53:04 -0000 1.3.4.1 +++ openacs-4/packages/acs-tcl/tcl/apm-xml-procs.xql 10 Mar 2003 19:32:51 -0000 1.3.4.2 @@ -13,18 +13,6 @@ - - - - - select distinct db_type - from apm_package_files - where db_type is not null - - - - -