Changeset 2107 for plugins/apostrophePlugin/trunk/lib/toolkit/aZendSearch.class.php

Timestamp:

09/01/10 11:59:43 (21 months ago)

Author:

wjohnald

Message:

this commit resolves tickets: #144 and #347

Location:

plugins/apostrophePlugin/trunk

Files:

• . (modified) (1 prop)
• lib/toolkit/aZendSearch.class.php (modified) (4 diffs)

plugins/apostrophePlugin/trunk/lib/toolkit/aZendSearch.class.php

@@ -252 +252 @@
   // use unStoredFields. For things that need not be indexed at all, like summaries, use unIndexedFields
 
-  static public function updateLuceneIndex(Doctrine_Record $object, $unStoredFields = array(), $culture = null, $unIndexedFields = array(), $storedAndIndexedFields = array())
+  static public function updateLuceneIndex(Doctrine_Record $object, $fields = array(), $culture = null, $storedFields = array(), $boostsByField = array())
   {
     self::deleteFromLuceneIndex($object, $culture);
@@ -264 +264 @@
       $doc->addField(Zend_Search_Lucene_Field::Keyword('culture', $culture, 'UTF-8'));
     }
-    // index the UnStored fields
-    foreach ($unStoredFields as $key => $value)
+    // index the search fields
+    foreach ($fields as $key => $value)
     {
       // Ugh: UTF8 Lucene is case sensitive work around this
@@ -276 +276 @@
         $value = strtolower($value);
       }
-      $doc->addField(Zend_Search_Lucene_Field::UnStored($key, $value, 'UTF-8'));
+      
+      $field = Zend_Search_Lucene_Field::UnStored($key, $value, 'UTF-8');
+      if (isset($boostsByField[$key]))
+      {
+        $field->boost = $boostsByField[$key];
+      }
+      $doc->addField($field);
     }
 
     // store the data fields (a big performance win over hydrating things with Doctrine)
-    foreach ($unIndexedFields as $key => $value)
+    foreach ($storedFields as $key => $value)
     {
       $doc->addField(Zend_Search_Lucene_Field::UnIndexed($key, $value, 'UTF-8'));
-    }
-
-    // index and store the storedAndIndexed fields
-    foreach ($storedAndIndexedFields as $key => $value)
-    {
-      // Ugh: UTF8 Lucene is case sensitive work around this
-      if (function_exists('mb_strtolower'))
-      {
-        $value = mb_strtolower($value);
-      }
-      else
-      {
-        $value = strtolower($value);
-      }
-      $doc->addField(Zend_Search_Lucene_Field::Text($key, $value, 'UTF-8'));
     }
    
@@ -304 +295 @@
     $index->commit();
   }
-
+  
   // This does a clean job of saving the object in both doctrine and zend
   // without a lot of duplicated code, reducing the potential for