Index: openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/Attic/00-database-procs.tcl,v diff -u -r1.23 -r1.24 --- openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl 20 Jan 2003 21:04:47 -0000 1.23 +++ openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl 10 Mar 2003 19:19:14 -0000 1.24 @@ -20,10 +20,12 @@ return [expr { [empty_string_p $db_type] || [string equal [db_type] $db_type] }] } -ad_proc db_package_supports_rdbms_p { db_type_list } { +ad_proc -deprecated db_package_supports_rdbms_p { db_type_list } { Returns 1 if db_type_list contains the current RDMBS type. A package intended to run with a given RDBMS must note this in it's package info file regardless of whether or not it actually uses the database. + + @see apm_package_supports_rdbms_p } { if { [lsearch $db_type_list [db_type]] != -1 } { return 1 Index: openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl,v diff -u -r1.16 -r1.17 --- openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl 25 Feb 2003 16:42:12 -0000 1.16 +++ openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl 10 Mar 2003 19:19:14 -0000 1.17 @@ -386,45 +386,27 @@ return "/packages/$package_key" } -ad_proc -public apm_version_file_list { +ad_proc -public -deprecated -warn apm_version_file_list { {-type ""} {-db_type ""} - {-path_prefix ""} version_id } { - Returns a list of paths to files of a given type (or all files, if $type is not specified) which support a given database (if specified) in a version. + Use the proc apm_get_package_files instead. + @param type Optionally specifiy what type of files to check, for instance "tcl_procs" - @param db_type Optionally specifiy what type of database support to check, for instance - "postgresql". All files of the given type that are used by the given database version are - returned (i.e. all database-agnostic as well as the proper database-specific files). + @param db_type This argument is ignored for now. @param version_id The version to retrieve the file list from. @param path_prefix A prefix that will be used for all the returned paths. By default the prefix will be the empty string which means that the returned paths will be relative to the package root. + @see apm_get_package_files } { - if { ![empty_string_p $type] } { - set type_sql "and file_type = :type" - } else { - set type_sql "" - } - if { ![empty_string_p $db_type] } { - set db_type_sql "and (db_type = :db_type or db_type is null)" - } else { - set db_type_sql "" - } - set path_list [list] - db_foreach path_select " - select path from apm_package_files - where version_id = :version_id - $type_sql $db_type_sql order by path - " { - lappend path_list "${path_prefix}${path}" - } + set package_key [apm_package_key_from_version_id $version_id] - return $path_list + return [apm_get_package_files -package_key $package_key -file_types $type] } ad_proc -private apm_ignore_file_p { path } { Index: openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl,v diff -u -r1.35 -r1.36 --- openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl 25 Feb 2003 16:42:12 -0000 1.35 +++ openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl 10 Mar 2003 19:19:14 -0000 1.36 @@ -225,7 +225,7 @@ if { [catch { array set package [apm_read_package_info_file $spec_file] if { ([string equal $package(initial-install-p) "t"] || !$initial_install_p) && \ - [db_package_supports_rdbms_p $package(database_support)] } { + [apm_package_supports_rdbms_p -package_key $package(package.key)] } { lappend install_pend [pkg_info_new $package(package.key) $spec_file $package(provides) $package(requires) ""] } @@ -1242,7 +1242,7 @@ } set file_list [concat [apm_order_upgrade_scripts $upgrade_file_list] $data_model_list] apm_log APMDebug "APM: Data model scripts for $package_key: $file_list" - ns_log Notice "pm debug APM: Data model scripts for $package_key: $file_list" + return $file_list } 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.14 -r1.15 --- openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl 17 Feb 2003 23:55:13 -0000 1.14 +++ openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl 10 Mar 2003 19:19:14 -0000 1.15 @@ -9,7 +9,7 @@ @cvs-id $Id$ } -ad_proc -private -deprecated apm_load_xml_packages {} { +ad_proc -private -deprecated -warn apm_load_xml_packages {} {

NOTE: This proc doesn't do anything anymore. @@ -22,17 +22,6 @@

} { - global ad_conn - if { ![info exists ad_conn(xml_loaded_p)] } { - # ns_xml needs to be loaded - -# foreach file [glob "[acs_package_root_dir acs-tcl]/tcl/xml-*-procs.tcl"] { -# apm_source $file -# } - set ad_conn(xml_loaded_p) 1 - } - -# package require xml 1.9 } ad_proc -private apm_required_attribute_value { element attribute } { @@ -514,4 +503,3 @@ return $return_value } - Index: openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl 23 Sep 2002 11:25:02 -0000 1.6 +++ openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl 10 Mar 2003 19:19:14 -0000 1.7 @@ -944,6 +944,7 @@ } } + #################### # # Step 3: Pass over each formal argument to make sure all the required