Author: david
Date: Fri Feb 10 11:36:49 2012
New Revision: 10845

Log:
Add repository info

Modified:
   trunk/lib/QubitSearchPdo.class.php

Modified: trunk/lib/QubitSearchPdo.class.php
==============================================================================
--- trunk/lib/QubitSearchPdo.class.php  Fri Feb 10 10:28:19 2012        (r10844)
+++ trunk/lib/QubitSearchPdo.class.php  Fri Feb 10 11:36:49 2012        (r10845)
@@ -20,7 +20,8 @@
 class QubitSearchPdo extends QubitSearch
 {
   protected static
-    $collectionRoot;
+    $collectionRoot,
+    $repository;
 
   public function qubitPopulate($options)
   {
@@ -184,10 +185,31 @@
       throw new sfException('No collection root for "'.$resource->title.'"');
     }
 
-    // Digital object information
+    // Set repository
+    if (null != $resource->repository_id &&
+      (!isset(self::$repository) || self::$repository->id != 
$resource->repository_id))
+    {
+      self::$repository = QubitRepository::getById($resource->repository_id);
+    }
+
+    // Repository
+    if (isset(self::$repository))
+    {
+      $doc->addField(Zend_Search_Lucene_Field::Keyword('repositoryId', 
self::$repository->id));
+      $doc->addField(Zend_Search_Lucene_Field::Keyword('repositorySlug', 
self::$repository->slug));
+      $doc->addField(Zend_Search_Lucene_Field::Text('repositoryName', 
self::$repository->getAuthorizedFormOfName(array('culture' => $language))));
+    }
+    else
+    {
+      $doc->addField(Zend_Search_Lucene_Field::UnIndexed('repositoryId', 
null));
+      $doc->addField(Zend_Search_Lucene_Field::UnIndexed('repositorySlug', 
null));
+      $doc->addField(Zend_Search_Lucene_Field::UnIndexed('repositoryName', 
null));
+      var_dump('no repo');
+    }
 
     return;
 
+    // Digital object information
     if ($resource->getDigitalObject())
     {
       $doc->addField(Zend_Search_Lucene_Field::Keyword('hasDigitalObject', 
'true'));
@@ -265,21 +287,6 @@
       $doc->addField(Zend_Search_Lucene_Field::UnIndexed('levelOfDescription', 
null));
     }
 
-    // Repository
-    $repository = $resource->getRepository(array('inherit' => true));
-    if (null !== $repository)
-    {
-      $doc->addField(Zend_Search_Lucene_Field::Keyword('repositoryId', 
$repository->id));
-      $doc->addField(Zend_Search_Lucene_Field::Keyword('repositorySlug', 
$repository->slug));
-      $doc->addField(Zend_Search_Lucene_Field::Text('repositoryName', 
$repository->getAuthorizedFormOfName(array('culture' => $language))));
-    }
-    else
-    {
-      $doc->addField(Zend_Search_Lucene_Field::UnIndexed('repositoryId', 
null));
-      $doc->addField(Zend_Search_Lucene_Field::UnIndexed('repositorySlug', 
null));
-      $doc->addField(Zend_Search_Lucene_Field::UnIndexed('repositoryName', 
null));
-    }
-
     // Identifier
     $identifierField = Zend_Search_Lucene_Field::Text('identifier', 
$resource->getIdentifier());
     $identifierField->boost = 5;

-- 
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.com/group/qubit-commits?hl=en.

Reply via email to