[bugfix]

nibsirahsieu · Jan 8, 2011 · 3b8a800 · 3b8a800
1 parent 5a2922f
commit 3b8a800
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 47 deletions.
diff --git a/lib/behavior/LuceneableBehavior.php b/lib/behavior/LuceneableBehavior.php
@@ -37,7 +37,7 @@ public function addStaticStoredIndex()
     {
       $table = $this->getTable();
       foreach ($table->getColumns() as $col) {
-        $clo = strtolower($col->getName());
+        $clo = $col->getPhpName();
         if ($col->isPrimaryKey())
         {
           $clo = 'pk';
@@ -55,7 +55,7 @@ public function addStaticStoredIndex()
       foreach ($columns as $c => $type)
       {
         $col = $this->getTable()->getColumn($c);
-        $clo = strtolower($col->getName());
+        $clo = $col->getPhpName();
         $fieldMethod = $this->getLuceneFieldMethod($type);
         if (strtolower($type) == 'keyword')
         {
@@ -67,7 +67,7 @@ public function addStaticStoredIndex()
       {
         $pks = $this->getTable()->getPrimaryKey();
         if (count($pks) > 0) $pks = $pks[0];
-        $data[strtolower($pks->getName())] = $this->getLuceneFieldMethod($type);
+        $data[$pks->getPhpName()] = $this->getLuceneFieldMethod($type);
       }
     }
     return $this->renderTemplate('staticStoredIndex', array(

diff --git a/lib/sfLuceneModelResults.class.php b/lib/sfLuceneModelResults.class.php
@@ -4,17 +4,20 @@ class sfLuceneModelResults implements Iterator, Countable, ArrayAccess
   protected $model;
   protected $results;
   protected $pointer = 0;
-  protected $indexedColums = array();
-  protected $query = null;
-
-  public function __construct($model, $results, $query)
+
+  public function __construct($model, $pks)
   {
     $this->model = $model;
-    $this->results = $results;
-    $this->query = $query;
-    $this->indexedColumns = call_user_func(array($model.'Peer', 'getIndexedColumns'));
+    $this->results = $this->collectResults($model, $pks);
   }
 
+  protected function collectResults($model, $pks)
+  {
+    $indexedColumns = call_user_func(array($model.'Peer', 'getIndexedColumns'));
+    $columns = array_keys($indexedColumns);
+    return PropelQuery::from($model)->select($columns)->findPks($pks);
+  }
+
   public function current()
   {
     return $this->hydrate($this->results[$this->pointer]);
@@ -67,37 +70,10 @@ public function offsetUnset($offset)
 
   protected function hydrate($result)
   {
-    $tmp = array();
-    foreach ($this->indexedColumns as $col => $type)
-    {
-      if (strtolower($type) == 'text')
-      {
-        $tmp[$col] = $this->query->htmlFragmentHighlightMatches($result->$col);
-      }
-      elseif (strtolower($type) == 'keyword')
-      {
-        $tmp[$col] = $result->pk;
-      }
-      else
-      {
-        $tmp[$col] = $result->$col;
-      }
-    }
     $object = new $this->model;
-    $object->fromArray($tmp, BasePeer::TYPE_FIELDNAME);
+    $object->fromArray($result, BasePeer::TYPE_PHPNAME);
     $object->setNew(false);
     $object->resetModified();
     return $object;
   }
-
-  public function toArray()
-  {
-    $retvals = array();
-    foreach ($this->results as $result)
-    {
-      $object = $this->hydrate($result);
-      $retvals[] = $object;
-    }
-    return $retvals;
-  }
 }
diff --git a/lib/sfLuceneModelSearch.class.php b/lib/sfLuceneModelSearch.class.php
@@ -6,10 +6,6 @@ class sfLuceneModelSearch
 
   public function __construct($model, $sSearch = null)
   {
-    if (!($sSearch instanceof Zend_Search_Lucene_Search_Query))
-    {
-      $sSearch = Zend_Search_Lucene_Search_QueryParser::parse($sSearch);
-    }
     $this->_queryString = $sSearch;
     $this->_model = $model;
   }
@@ -22,7 +18,7 @@ public static function create($model, $sSearch = null)
   public function find($limit = 10)
   {
     $hits = sfLuceneableToolkit::getHits($this->_model, $this->_queryString);
-    return new sfLuceneModelResults($model, $hits, $this->_queryString);
+    return new sfLuceneModelResults($model, $hits);
   }
 
   public function paginate($page, $limit = 10)
@@ -32,4 +28,4 @@ public function paginate($page, $limit = 10)
 		$pager->init();
     return $pager;
   }
-}
+}
diff --git a/lib/sfLucenePager.class.php b/lib/sfLucenePager.class.php
@@ -102,7 +102,7 @@ public function getResults()
       $results = $this->results;
     }
     $results = array_slice($this->results, $offset, $limit);
-    return new sfLuceneModelResults($this->model, $results, $this->search);
+    return new sfLuceneModelResults($this->model, $results);
   }
 
   public function getFirstPage()

diff --git a/lib/sfLuceneableToolkit.class.php b/lib/sfLuceneableToolkit.class.php
@@ -87,7 +87,7 @@ static public function getHits($model, $query)
       $hits = $index->find($query);
       foreach ($hits as $hit)
       {
-        $results[] = $hit;
+        $results[$hit->score] = $hit->pk;
       }
     }
     catch (Exception $e)
@@ -96,4 +96,4 @@ static public function getHits($model, $query)
     }
     return $results;
   }
-}
+}