Author: sevein
Date: Thu Feb 9 22:34:32 2012
New Revision: 10840
Log:
Add levelOfDescriptionId to the index, fixes issue 2248. Cosmetic changes.
Modified:
trunk/apps/qubit/modules/search/actions/advancedAction.class.php
trunk/lib/QubitSearch.class.php
Modified: trunk/apps/qubit/modules/search/actions/advancedAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/search/actions/advancedAction.class.php Thu Feb
9 22:28:20 2012 (r10839)
+++ trunk/apps/qubit/modules/search/actions/advancedAction.class.php Thu Feb
9 22:34:32 2012 (r10840)
@@ -128,7 +128,7 @@
$choices[null] = null;
foreach
(QubitTaxonomy::getTaxonomyTerms(QubitTaxonomy::LEVEL_OF_DESCRIPTION_ID) as
$item)
{
- $choices[$item->getName()] = $item;
+ $choices[$item->id] = $item;
}
$this->form->setValidator('levelOfDescription', new sfValidatorString);
@@ -239,7 +239,7 @@
if (!empty($this->request->levelOfDescription))
{
-
$query->addSubquery(QubitSearch::getInstance()->addTerm($this->request->levelOfDescription,
'levelOfDescription'), true);
+
$query->addSubquery(QubitSearch::getInstance()->addTerm($this->request->levelOfDescription,
'levelOfDescriptionId'), true);
$this->queryTerms[] = array('term' =>
$this->getContext()->i18n->__('Level of description').':
'.$this->request->levelOfDescription, 'operator' => 'and');
}
Modified: trunk/lib/QubitSearch.class.php
==============================================================================
--- trunk/lib/QubitSearch.class.php Thu Feb 9 22:28:20 2012 (r10839)
+++ trunk/lib/QubitSearch.class.php Thu Feb 9 22:34:32 2012 (r10840)
@@ -556,18 +556,19 @@
$doc->addField(Zend_Search_Lucene_Field::Unstored('creatorhistory',
$informationObject->getCreatorsHistoryString(array('culture' => $language))));
// Level of Description
- if (null !== $informationObject->getLevelOfDescription())
+ if (null !== $levelOfDescription =
$informationObject->getLevelOfDescription())
{
- $doc->addField(Zend_Search_Lucene_Field::Text('levelOfDescription',
$informationObject->getLevelOfDescription()->getName(array('culture' =>
$language))));
+ $doc->addField(Zend_Search_Lucene_Field::Text('levelOfDescription',
$levelOfDescription->getName(array('culture' => $language))));
+ $doc->addField(Zend_Search_Lucene_Field::Keyword('levelOfDescriptionId',
$levelOfDescription->id));
}
else
{
$doc->addField(Zend_Search_Lucene_Field::UnIndexed('levelOfDescription',
null));
+ $doc->addField(Zend_Search_Lucene_Field::Keyword('levelOfDescriptionId',
null));
}
// Repository
- $repository = $informationObject->getRepository(array('inherit' => true));
- if (null !== $repository)
+ if (null !== $repository =
$informationObject->getRepository(array('inherit' => true)))
{
$doc->addField(Zend_Search_Lucene_Field::Keyword('repositoryId',
$repository->id));
$doc->addField(Zend_Search_Lucene_Field::Keyword('repositorySlug',
$repository->slug));
--
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.
