Author: david
Date: Fri Feb 24 13:18:37 2012
New Revision: 10971
Log:
Adjust field types
Modified:
trunk/lib/QubitSearch.class.php
trunk/lib/QubitSearchPdo.class.php
Modified: trunk/lib/QubitSearch.class.php
==============================================================================
--- trunk/lib/QubitSearch.class.php Fri Feb 24 12:41:25 2012 (r10970)
+++ trunk/lib/QubitSearch.class.php Fri Feb 24 13:18:37 2012 (r10971)
@@ -390,7 +390,7 @@
$doc->addField(Zend_Search_Lucene_Field::Keyword('className',
$actor->className));
$doc->addField(Zend_Search_Lucene_Field::Keyword('culture',
$actorI18n->culture));
- $doc->addField(Zend_Search_Lucene_Field::Keyword('identifier',
$actor->descriptionIdentifier));
+ $doc->addField(Zend_Search_Lucene_Field::UnStored('identifier',
$actor->descriptionIdentifier));
$doc->addField(Zend_Search_Lucene_Field::UnStored('authorizedFormOfName',
$actorI18n->authorizedFormOfName));
$doc->addField(Zend_Search_Lucene_Field::UnStored('datesOfExistence',
$actorI18n->datesOfExistence));
@@ -500,18 +500,16 @@
$doc->addField(Zend_Search_Lucene_Field::Keyword('slug',
$informationObject->slug));
$doc->addField(Zend_Search_Lucene_Field::Keyword('culture', $language));
$doc->addField(Zend_Search_Lucene_Field::Keyword('className',
'QubitInformationObject'));
-
- $doc->addField(Zend_Search_Lucene_Field::UnIndexed('parentId',
$informationObject->parentId));
$doc->addField(Zend_Search_Lucene_Field::Keyword('parent',
$informationObject->parent->slug));
$collectionRoot = $informationObject->getCollectionRoot();
$doc->addField(Zend_Search_Lucene_Field::Keyword('collectionRootSlug',
$collectionRoot->slug));
- $doc->addField(Zend_Search_Lucene_Field::Keyword('partOf',
$collectionRoot->getTitle()));
+ $doc->addField(Zend_Search_Lucene_Field::Text('partOf',
$collectionRoot->getTitle()));
// Digital object information
if ($digitalObject = $informationObject->getDigitalObject())
{
- $doc->addField(Zend_Search_Lucene_Field::Keyword('hasDigitalObject',
'true'));
+ $doc->addField(Zend_Search_Lucene_Field::Text('hasDigitalObject',
'true'));
$doc->addField(Zend_Search_Lucene_Field::Keyword('do_mediaTypeId',
$digitalObject->mediaTypeId));
@@ -526,7 +524,7 @@
}
else
{
- $doc->addField(Zend_Search_Lucene_Field::Keyword('hasDigitalObject',
'false'));
+ $doc->addField(Zend_Search_Lucene_Field::Text('hasDigitalObject',
'false'));
}
// Title
@@ -545,7 +543,7 @@
$doc->addField($titleField);
// Publication status
- $doc->addField(Zend_Search_Lucene_Field::Text('publicationStatusId',
$informationObject->getPublicationStatus()->status->id));
+ $doc->addField(Zend_Search_Lucene_Field::Keyword('publicationStatusId',
$informationObject->getPublicationStatus()->status->id));
$doc->addField(Zend_Search_Lucene_Field::Text('scopeAndContent',
$informationObject->getScopeAndContent(array('culture' => $language))));
Modified: trunk/lib/QubitSearchPdo.class.php
==============================================================================
--- trunk/lib/QubitSearchPdo.class.php Fri Feb 24 12:41:25 2012 (r10970)
+++ trunk/lib/QubitSearchPdo.class.php Fri Feb 24 13:18:37 2012 (r10971)
@@ -199,12 +199,10 @@
{
$doc = new Zend_Search_Lucene_Document;
- // Reference elements
+ // Internal elements
$doc->addField(Zend_Search_Lucene_Field::Keyword('slug', $resource->slug));
$doc->addField(Zend_Search_Lucene_Field::Keyword('culture',
$resource->culture));
$doc->addField(Zend_Search_Lucene_Field::Keyword('className',
'QubitInformationObject'));
-
- $doc->addField(Zend_Search_Lucene_Field::UnIndexed('parent_id',
$resource->parent_id));
$doc->addField(Zend_Search_Lucene_Field::Keyword('parent',
$resource->parent->slug));
// Identifier
@@ -292,7 +290,7 @@
{
$crTitle = self::getFallbackTitle($collectionRoot->id, array('culture'
=> $resource->culture));
}
- $doc->addField(Zend_Search_Lucene_Field::Keyword('partOf', $crTitle));
+ $doc->addField(Zend_Search_Lucene_Field::Text('partOf', $crTitle));
// Add repository
if (isset($options['repository']))
@@ -311,7 +309,7 @@
// Level of description
if (null !== $resource->level_of_description_id)
{
- $doc->addField(Zend_Search_Lucene_Field::Keyword('levelOfDescription',
self::getLevelOfDescription($resource->level_of_description_id, $language)));
+ $doc->addField(Zend_Search_Lucene_Field::Text('levelOfDescription',
self::getLevelOfDescription($resource->level_of_description_id, $language)));
$doc->addField(Zend_Search_Lucene_Field::Keyword('levelOfDescriptionId',
$resource->level_of_description_id));
}
else
@@ -323,7 +321,7 @@
// Digital object information
if (isset($resource->digi_id))
{
- $doc->addField(Zend_Search_Lucene_Field::Keyword('hasDigitalObject',
'true'));
+ $doc->addField(Zend_Search_Lucene_Field::Text('hasDigitalObject',
'true'));
$doc->addField(Zend_Search_Lucene_Field::Keyword('do_mediaTypeId',
$digi_type_id));
@@ -338,7 +336,7 @@
}
else
{
- $doc->addField(Zend_Search_Lucene_Field::Keyword('hasDigitalObject',
'false'));
+ $doc->addField(Zend_Search_Lucene_Field::Text('hasDigitalObject',
'false'));
}
// CREATION DATES AND CREATORS
--
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.
