Author: jablko
Date: Thu Aug 27 14:20:41 2009
New Revision: 3103

Log:
Replace search index informationObjectId and objectId fields with id field, for 
consistency

Modified:
   trunk/apps/qubit/lib/SearchIndex.class.php
   trunk/apps/qubit/modules/informationobject/actions/listAction.class.php
   trunk/apps/qubit/modules/search/actions/searchAction.class.php

Modified: trunk/apps/qubit/lib/SearchIndex.class.php
==============================================================================
--- trunk/apps/qubit/lib/SearchIndex.class.php  Thu Aug 27 14:16:20 2009        
(r3102)
+++ trunk/apps/qubit/lib/SearchIndex.class.php  Thu Aug 27 14:20:41 2009        
(r3103)
@@ -211,15 +211,13 @@
 
     $doc = new Zend_Search_Lucene_Document;
 
+    $doc->addField(Zend_Search_Lucene_Field::Keyword('id', 
$informationObject->id));
+
     if (isset($informationObject->parent))
     {
       $doc->addField(Zend_Search_Lucene_Field::Keyword('parentId', 
$informationObject->parent->id));
     }
 
-    // ID
-    $doc->addField(Zend_Search_Lucene_Field::Keyword('objectId', 
$informationObject->getId()));
-    $doc->addField(Zend_Search_Lucene_Field::Keyword('informationObjectId', 
$informationObject->getId()));
-
     $doc->addField(Zend_Search_Lucene_Field::Keyword('culture', $language));
 
     // Note: text fields have to be converted to lower-case for use with utf-8 
analyzer

Modified: 
trunk/apps/qubit/modules/informationobject/actions/listAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/actions/listAction.class.php     
Thu Aug 27 14:16:20 2009        (r3102)
+++ trunk/apps/qubit/modules/informationobject/actions/listAction.class.php     
Thu Aug 27 14:20:41 2009        (r3103)
@@ -84,7 +84,7 @@
     $ids = array();
     foreach ($this->pager->getHits() as $hit)
     {
-      $ids[] = $hit->informationObjectId;
+      $ids[] = $hit->getDocument()->id;
     }
 
     $criteria = new Criteria;

Modified: trunk/apps/qubit/modules/search/actions/searchAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/search/actions/searchAction.class.php      Thu Aug 
27 14:16:20 2009        (r3102)
+++ trunk/apps/qubit/modules/search/actions/searchAction.class.php      Thu Aug 
27 14:20:41 2009        (r3103)
@@ -41,7 +41,7 @@
     $ids = array();
     foreach ($this->pager->getHits() as $hit)
     {
-      $ids[] = $hit->informationObjectId;
+      $ids[] = $hit->getDocument()->id;
     }
 
     $criteria = new Criteria;

--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to 
[email protected]
For more options, visit this group at 
http://groups.google.ca/group/qubit-commits?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to