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 -r1.4 -r1.5 --- openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl 20 Apr 2001 20:40:31 -0000 1.4 +++ openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl 23 Apr 2001 19:43:04 -0000 1.5 @@ -161,6 +161,12 @@ # Get the proc name being executed. set proc_name [info level [expr "-1 - $added_stack_num"]] + # If util_memoize, we have to go back up one in the stack + if {[lindex $proc_name 0] == "util_memoize"} { + ns_log Notice "QD= util_memoize! going up one level" + set proc_name [info level [expr "-2 - $added_stack_num"]] + } + set list_of_source_procs {ns_sourceproc apm_source template::adp_parse} # We check if we're running the special ns_ proc that tells us @@ -315,6 +321,9 @@ # Read entire contents 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] + # Iterate and parse out each query set parsing_state [db_qd_internal_parse_init $whole_file] @@ -613,4 +622,53 @@ # Make a path absolute proc db_qd_make_absolute_path {relative_root suffix} { return "[db_qd_root_path]${relative_root}$suffix" +} + + +## +## Extra Utilities to Massage the system and Rub it in all the right ways +## +proc db_qd_internal_prepare_queryfile_content {file_content} { + + set new_file_content "" + set rest_of_file_content $file_content + + set querytext_open "" + set querytext_close "" + + set querytext_open_len [string length $querytext_open] + set querytext_close_len [string length $querytext_close] + + # We're going to ns_quotehtml the querytext, + # because ns_xml will choke otherwise + while {1} { + # ns_log Notice "QD=temp=rest_of_file \n $rest_of_file_content \n" + + set first_querytext_open [string first $querytext_open $rest_of_file_content] + set first_querytext_close [string first $querytext_close $rest_of_file_content] + + # ns_log Notice "QD=TEMP=massage= $first_querytext_open,$first_querytext_close" + + # We have no more querytext to process + if {$first_querytext_open == -1} { + append new_file_content $rest_of_file_content + break + } + + # append first chunk before the querytext including "" + append new_file_content [string range $rest_of_file_content 0 [expr "$first_querytext_open + $querytext_open_len - 1"]] + + # append quoted querytext + append new_file_content [ns_quotehtml [string range $rest_of_file_content [expr "$first_querytext_open + $querytext_open_len"] [expr "$first_querytext_close - 1"]]] + + # append close querytext + append new_file_content $querytext_close + + # Set up the rest + set rest_of_file_content [string range $rest_of_file_content [expr "$first_querytext_close + $querytext_close_len"] end] + } + + # ns_log Notice "QD=TEMP= new massaged file content: \n $new_file_content \n" + + return $new_file_content } \ No newline at end of file Index: openacs-4/packages/acs-developer-support/acs-developer-support.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/acs-developer-support.info,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-developer-support/acs-developer-support.info 20 Apr 2001 20:51:09 -0000 1.1 +++ openacs-4/packages/acs-developer-support/acs-developer-support.info 23 Apr 2001 19:43:04 -0000 1.2 @@ -23,6 +23,7 @@ + Index: openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/tcl/Attic/acs-developer-support-procs-postgresql.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs-postgresql.xql 23 Apr 2001 19:43:04 -0000 1.1 @@ -0,0 +1,13 @@ + + +postgresql7.1 + + + + select package_id from apm_packages + where package_key = 'acs-developer-support' + limit 1 + + + + Index: openacs-4/packages/acs-subsite/acs-subsite.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/acs-subsite.info,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-subsite/acs-subsite.info 18 Apr 2001 21:36:24 -0000 1.3 +++ openacs-4/packages/acs-subsite/acs-subsite.info 23 Apr 2001 19:43:04 -0000 1.4 @@ -259,6 +259,7 @@ +