Index: openacs-4/packages/search/search.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/search.info,v
diff -u -r1.49 -r1.50
--- openacs-4/packages/search/search.info	21 Nov 2024 14:51:39 -0000	1.49
+++ openacs-4/packages/search/search.info	17 Dec 2024 17:32:51 -0000	1.50
@@ -9,7 +9,7 @@
     <implements-subsite-p>f</implements-subsite-p>
     <inherit-templates-p>t</inherit-templates-p>
 
-    <version name="6.0.0d2" url="http://openacs.org/repository/download/apm/search-6.0.0d2.apm">
+    <version name="6.0.0d3" url="http://openacs.org/repository/download/apm/search-6.0.0d3.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>Site wide search</summary>
         <release-date>2024-09-02</release-date>
@@ -18,7 +18,7 @@
         <license>GPL version 2</license>
         <maturity>3</maturity>
 
-        <provides url="search" version="6.0.0d2"/>
+        <provides url="search" version="6.0.0d3"/>
         <requires url="acs-service-contract" version="5.10.1"/>
         <requires url="acs-tcl" version="5.10.1"/>
         <requires url="acs-templating" version="5.10.1"/>
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.63 -r1.64
--- openacs-4/packages/search/tcl/search-procs.tcl	25 Nov 2024 14:28:57 -0000	1.63
+++ openacs-4/packages/search/tcl/search-procs.tcl	17 Dec 2024 17:32:51 -0000	1.64
@@ -26,11 +26,6 @@
 
     @return datasource as dict
 } {
-    set driver [search::driver_name]
-    if {$driver eq ""} {
-        return
-    }
-
     set object_type [acs_object_type $object_id]
     if {![search::searchable_type_p -object_type $object_type]} {
         return
@@ -71,6 +66,11 @@
 
     @return datasource as dict
 } {
+    set driver [search::driver_name]
+    if {$driver eq ""} {
+        return
+    }
+
     array set d [search::object_datasource -object_id $object_id]
     if {[array size d] == 0} {
         return
@@ -82,8 +82,6 @@
         $d(storage_type) \
         $object_id
 
-    set driver [search::driver_name]
-
     if {[callback::impl_exists -callback search::index -impl $driver]} {
         callback -impl $driver search::index \
             -object_id $object_id \