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.5 -r1.6
--- openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl	23 Apr 2001 19:43:04 -0000	1.5
+++ openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl	26 Apr 2001 05:38:54 -0000	1.6
@@ -39,7 +39,7 @@
     ns_log Notice "QD/COMPATIBILITY = The RDBMS_PATTERN is [db_rdbms_get_type $rdbms_pattern] - [db_rdbms_get_version $rdbms_pattern]"
 
     # If the pattern is for all RDBMS, then yeah, compatible
-    if {[empty_string_p [db_rdbms_get_type $rdbms_pattern]]} {
+    if {[empty_string_p [db_rdbms_get_type $rdbms_test]]} {
 	return 1
     }
 
@@ -406,7 +406,7 @@
 
     set name [db_fullquery_get_name $fullquery]
 
-    ns_log Notice "QD = Query $name is compatible!"
+    ns_log Notice "QD = Query $name is compatible! fullquery = $fullquery, name = $name"
 
     # If we already have a query for that name, we need to
     # figure out which one is *most* compatible.
@@ -416,7 +416,6 @@
 	set fullquery [db_qd_pick_most_specific_query [db_current_rdbms] $old_fullquery $fullquery]
     }
 
-
     nsv_set OACS_FULLQUERIES $name $fullquery
 }
 
@@ -445,7 +444,8 @@
     # remove the last chunk of the file name, since we're just looking for the root path
     # NOTE: THIS MAY NEED BETTER ABSTRACTION, since this assumes a naming scheme
     # of -rdbms.XXX (ben)
-    regsub {\-[^/-]*$} $relative_path {} relative_path
+    regsub {\.xql} $relative_path {} relative_path
+    regsub {\-(postgresql|oracle)$} $relative_path {} relative_path
 
     # Change all . to :
     regsub -all {\.} $relative_path {:} relative_path    
@@ -671,4 +671,4 @@
     # ns_log Notice "QD=TEMP= new massaged file content: \n $new_file_content \n"
 
     return $new_file_content
-}
\ No newline at end of file
+}