Index: openacs-4/packages/search/tcl/search-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/tcl/search-procs.tcl,v
diff -u -r1.35 -r1.36
--- openacs-4/packages/search/tcl/search-procs.tcl	10 Aug 2006 15:58:55 -0000	1.35
+++ openacs-4/packages/search/tcl/search-procs.tcl	21 Aug 2006 22:25:05 -0000	1.36
@@ -136,7 +136,7 @@
                             } else {
                                 array set datasource  [acs_sc_call FtsContentProvider datasource [list $object_id] $object_type]
                             }
-                            search::content_get txt $datasource(content) $datasource(mime) $datasource(storage_type)
+                            search::content_get txt $datasource(content) $datasource(mime) $datasource(storage_type) $object_id
 
 			    if {[callback::impl_exists -callback search::index -impl $driver]} {
 				if {![info exists datasource(package_id)]} {
@@ -206,6 +206,7 @@
     content
     mime
     storage_type
+    object_id
 } {
     @author Neophytos Demetriou
 
@@ -225,7 +226,7 @@
             set data $content
         }
         file {
-            set data [db_blob_get get_file_data {}]
+            set data [cr_fs_path][db_string get_filename "select content from cr_revisions where revision_id=:object_id"]
         }
         lob {
             set data [db_blob_get get_lob_data {}]
@@ -250,8 +251,7 @@
             set txt $data
         }
         default { 
-	    ns_log notice "\n-----\n DAVEB search::content_filter mime= '${mime}' \n ------ \n"
-            error "invalid mime type in search::content_filter: $mime"
+	    set txt [search::convert::binary_to_text -filename $data -mime_type $mime]
         }
     }
 }