Index: openacs-4/packages/openfts-driver/tcl/openfts-driver-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openfts-driver/tcl/openfts-driver-procs.tcl,v
diff -u -N -r1.4 -r1.4.2.1
--- openacs-4/packages/openfts-driver/tcl/openfts-driver-procs.tcl	13 Sep 2002 11:10:34 -0000	1.4
+++ openacs-4/packages/openfts-driver/tcl/openfts-driver-procs.tcl	10 Oct 2002 16:52:29 -0000	1.4.2.1
@@ -28,12 +28,8 @@
 
     set opt(rejected) [list]
 
-    if { ![info exists opt(txttid)] || [string equal $opt(txttid) ""] } {
-        set opt(txttid) $self(TXTTID)
-    }
+    foreach {out condition order} [Search::OpenFTS::get_sql self $query opt] break
 
-    foreach {out tables condition order} [Search::OpenFTS::get_sql self $query opt] break
-
     if { ![string length $condition] } {
         return [array get result]
     }
@@ -42,17 +38,12 @@
     } else {
         set order ""
     }
-    if { ![info exists tables] } {
-        set tables ""
-    }
     if { [info exists out] && [string length $out] > 0 } {
         set out ",\n $out"
     } else {
         set out ""
     }
-    set txttbl [split $opt(txttid) .]
 
-
     set date_range_condition ""
     if { $df != "" } {
 	append date_range_condition "'$df' <= last_modified and"
@@ -64,20 +55,20 @@
     set permission_check_enabled_p [ad_parameter -package_id [apm_package_id_from_key openfts-driver] permission_check_enabled_p]
     set permission_check_condition ""
     if { $permission_check_enabled_p } {
-	append permission_check_condition "and acs_permission__permission_p( $opt(txttid), $user_id, 'read') = 't'"
+	append permission_check_condition "and acs_permission__permission_p( $self(TXTID), $user_id, 'read') = 't'"
     }
 
     set sql_count "
         select count(*)
-        from [lindex $txttbl 0]$tables
+        from $self(TABLE)
         where 
             $date_range_condition
             $condition
             $permission_check_condition"
 
     set sql_sort "
-        select $opt(txttid) as object_id$out 
-        from [lindex $txttbl 0]$tables 
+        select $self(TXTID) as object_id$out 
+        from $self(TABLE)
         where 
             $date_range_condition
             $condition