Index: openacs-4/packages/acs-tcl/tcl/apm-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-tcl/tcl/apm-procs.tcl 27 Mar 2001 23:12:27 -0000 1.2 +++ openacs-4/packages/acs-tcl/tcl/apm-procs.tcl 5 Apr 2001 18:23:38 -0000 1.3 @@ -308,16 +308,21 @@ set base_len [string length $base] # For now we expect the SQL files to be in parallel with the Tcl files - set dirs [list ${base}www] + + # DRB: without the quotes ${base}www turns into the two element list + # {${base} www}, not what was wanted... + set dirs [list "${base}www"] set paths [list] - + + # DRB: For now just slurp all .sql files foreach dir $dirs { - set paths [concat $paths [glob -nocomplain "$dir/*.tcl"]] + set paths [concat $paths [glob -nocomplain "$dir/*.sql"]] } foreach path [lsort $paths] { set rel_path [string range $path $base_len end] - lappend files [list $package $rel_path] + # DRB: db_fullquery_internal_load_cache expects the full pathname... + lappend files "$base/$rel_path" } } @@ -342,6 +347,19 @@ " -default "Unknown" -bind [list type $type]]] } +ad_proc -private apm_pretty_name_for_db_type { db_type } { + + Returns the pretty name corresponding to a particular file type key + (memoizing to save a database hit here and there). + +} { + return [util_memoize [list db_string pretty_db_name_select " + select pretty_db_name + from apm_package_db_types + where db_type_key = :db_type + " -default "all" -bind [list db_type $db_type]]] +} + ad_proc -public apm_load_any_changed_libraries {} { In the running interpreter, reloads files marked for reload by