Index: openacs-4/packages/acs-api-browser/tcl/acs-api-documentation-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/tcl/acs-api-documentation-procs.tcl,v diff -u -N -r1.72.2.27 -r1.72.2.28 --- openacs-4/packages/acs-api-browser/tcl/acs-api-documentation-procs.tcl 19 Feb 2021 18:07:22 -0000 1.72.2.27 +++ openacs-4/packages/acs-api-browser/tcl/acs-api-documentation-procs.tcl 22 Feb 2021 16:56:53 -0000 1.72.2.28 @@ -1194,7 +1194,7 @@ set content [template::util::read_file $::acs::rootdir/$xql_file] # make parsable XML, replace "partialquery" by "fullquery" - set prepared_content [db_qd_internal_prepare_queryfile_content $content] + set prepared_content [db_qd_prepare_queryfile_content $content] dom parse -simple $prepared_content doc $doc documentElement root Index: openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl,v diff -u -N -r1.49.2.6 -r1.49.2.7 --- openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl 22 Feb 2021 14:14:59 -0000 1.49.2.6 +++ openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl 22 Feb 2021 16:56:53 -0000 1.49.2.7 @@ -509,7 +509,7 @@ set whole_file [read $file_pointer] # PREPARE THE FILE (ben - this is in case the file needs massaging before parsing) - set whole_file [db_qd_internal_prepare_queryfile_content $whole_file] + set whole_file [db_qd_prepare_queryfile_content $whole_file] # Iterate and parse out each query set parsing_state [db_qd_internal_parse_init $whole_file $file_tag] @@ -825,11 +825,10 @@ } -## -## Extra Utilities to Massage the system and Rub it in all the right ways -## -ad_proc -public db_qd_internal_prepare_queryfile_content {file_content} { - Prepare raw .xql-file content form xml-parsing via quoting +ad_proc -public db_qd_prepare_queryfile_content {file_content} { + Prepare raw .xql-file content form xml-parsing via quoting. The + result is parsable XML, where "partialquery" is replaced by + "fullquery". } { set new_file_content "" Index: openacs-4/packages/acs-tcl/tcl/test/file-test-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/test/file-test-procs.tcl,v diff -u -N -r1.21.2.6 -r1.21.2.7 --- openacs-4/packages/acs-tcl/tcl/test/file-test-procs.tcl 16 Feb 2021 17:17:42 -0000 1.21.2.6 +++ openacs-4/packages/acs-tcl/tcl/test/file-test-procs.tcl 22 Feb 2021 16:56:53 -0000 1.21.2.7 @@ -223,7 +223,7 @@ -procs { apm_get_installed_versions apm_get_package_files - db_qd_internal_prepare_queryfile_content + db_qd_prepare_queryfile_content xml_parse ad_file } \ @@ -258,7 +258,7 @@ set data [read $fp] close $fp ns_log debug "acs_tcl__check_xql_files: read $file" - set data [db_qd_internal_prepare_queryfile_content $data] + set data [db_qd_prepare_queryfile_content $data] set parse_failed_p [catch {set parse [xml_parse $data]} errMsg] aa_false "xql $file correctly parsed" $parse_failed_p