Index: openacs-4/packages/acs-content-repository/tcl/search-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/search-procs.tcl,v
diff -u -r1.14.2.2 -r1.14.2.3
--- openacs-4/packages/acs-content-repository/tcl/search-procs.tcl	13 Dec 2019 14:26:17 -0000	1.14.2.2
+++ openacs-4/packages/acs-content-repository/tcl/search-procs.tcl	13 Dec 2019 14:31:20 -0000	1.14.2.3
@@ -11,12 +11,13 @@
     Provides data source for search interface.  Used to access content items
     after search.
 } {
-    db_0or1row revisions_datasource "
+    set cr_fs_path [cr_fs_path]
+    db_0or1row revisions_datasource {
 	select r.revision_id as object_id,
 	       r.title,
                case i.storage_type
-                    when 'lob' then r.lob::text
-                    when 'file' then '[cr_fs_path]' || r.content
+                    when 'lob' then cast(r.lob as text)
+                    when 'file' then :cr_fs_path || r.content
                     else r.content
                end as content,
 	       r.mime_type as mime,
@@ -25,7 +26,7 @@
 	from cr_revisions r, cr_items i
 	where revision_id = :object_id
         and i.item_id = r.item_id
-    " -column_array datasource
+    } -column_array datasource
 
     return [array get datasource]
 }
@@ -89,12 +90,13 @@
     Provides data source for search interface.  Used to access content items
     after search.
 } {
-    db_0or1row revisions_datasource "
+    set cr_fs_path [cr_fs_path]
+    db_0or1row revisions_datasource {
 	select r.revision_id as object_id,
 	       r.title as title,
                case i.storage_type
-                    when 'lob' then r.lob::text
-                    when 'file' then '[cr_fs_path]' || r.content
+                    when 'lob' then cast(r.lob as text)
+                    when 'file' then :cr_fs_path || r.content
                     when 'text' then r.content
                     else r.content
                end as content,
@@ -104,7 +106,7 @@
 	from cr_revisions r, cr_items i
 	where revision_id = :object_id
         and i.item_id = r.item_id
-    " -column_array datasource
+    } -column_array datasource
 
     return [array get datasource]
 }