Author: sevein
Date: Mon Jun 6 10:43:39 2011
New Revision: 9134
Log:
Cosmetic changes.
Modified:
trunk/lib/search/QubitSearch.class.php
Modified: trunk/lib/search/QubitSearch.class.php
==============================================================================
--- trunk/lib/search/QubitSearch.class.php Sun Jun 5 00:02:36 2011
(r9133)
+++ trunk/lib/search/QubitSearch.class.php Mon Jun 6 10:43:39 2011
(r9134)
@@ -22,7 +22,7 @@
// allow disabling search index via boolean flag
public $disabled = false;
-
+
/*
* Enable singleton creation via getInstance()
*/
@@ -48,12 +48,12 @@
return $query;
}
-
+
public function addTerm($text, $field)
{
return new Zend_Search_Lucene_Search_Query_Term(new
Zend_Search_Lucene_Index_Term($text, $field));
}
-
+
/**
* @see xfIndex
*/
@@ -86,7 +86,7 @@
// set buffering and updates to be batched for better performance
// NB: not sure why this doesn't work in object scope
self::getInstance()->getEngine()->enableBatchMode();
-
+
$actorOffset = intval($options['actorOffset']);
$ioOffset = intval($options['ioOffset']);
@@ -355,7 +355,7 @@
{
return;
}
-
+
self::deleteByIdLanguage($informationObject->id, $language);
self::addInformationObjectIndex($informationObject, $language, $options);
}
@@ -385,16 +385,19 @@
$doc->addField(Zend_Search_Lucene_Field::UnIndexed('collectionRootTitle',
$informationObject->getCollectionRoot()->getTitle()));
// Digital object information
- if ($digitalObject = $informationObject->getDigitalObject()) {
+ if ($digitalObject = $informationObject->getDigitalObject())
+ {
$doc->addField(Zend_Search_Lucene_Field::UnIndexed('digitalObject',
true));
$doc->addField(Zend_Search_Lucene_Field::UnIndexed('do_mediaTypeId',
$digitalObject->mediaTypeId));
$doc->addField(Zend_Search_Lucene_Field::UnIndexed('do_thumbnail_FullPath',
$digitalObject->thumbnail->getFullPath()));
-// $doc->addField(Zend_Search_Lucene_Field::Unstored('mediatype',
$digitalObject->getMediaType()->getName(array('culture' => $language))));
-// $doc->addField(Zend_Search_Lucene_Field::Unstored('filename',
$digitalObject->getName()));
-// $doc->addField(Zend_Search_Lucene_Field::Unstored('mimetype',
$digitalObject->mimeType));
- } else {
+ // $doc->addField(Zend_Search_Lucene_Field::Unstored('mediatype',
$digitalObject->getMediaType()->getName(array('culture' => $language))));
+ // $doc->addField(Zend_Search_Lucene_Field::Unstored('filename',
$digitalObject->getName()));
+ // $doc->addField(Zend_Search_Lucene_Field::Unstored('mimetype',
$digitalObject->mimeType));
+ }
+ else
+ {
$doc->addField(Zend_Search_Lucene_Field::UnIndexed('digitalObject',
null));
}
@@ -403,11 +406,13 @@
if (0 < strlen($informationObject->getTitle(array('culture' =>
$language))))
{
$titleField = Zend_Search_Lucene_Field::Text('title',
$informationObject->getTitle(array('culture' => $language)));
- } else {
+ }
+ else
+ {
$titleField = Zend_Search_Lucene_Field::Text('title',
$informationObject->getTitle(array('sourceCulture' => true)));
}
-
- //boost the hit relevance for the title field
+
+ // Boost the hit relevance for the title field
$titleField->boost = 10;
$doc->addField($titleField);
@@ -417,40 +422,46 @@
// Explicitly set publication status when ancestor object has not been
// saved yet (from informationobject/editAction)
$doc->addField(Zend_Search_Lucene_Field::UnIndexed('publicationStatusId',
$options['statusId']));
- } else {
+ }
+ else
+ {
$doc->addField(Zend_Search_Lucene_Field::UnIndexed('publicationStatusId',
$informationObject->getPublicationStatus()->status->id));
}
-
+
$doc->addField(Zend_Search_Lucene_Field::Text('scopeAndContent',
$informationObject->getScopeAndContent(array('culture' => $language))));
$isad = new sfIsadPlugin($informationObject);
$doc->addField(Zend_Search_Lucene_Field::Text('referenceCode',
$isad->referenceCode));
// Store dates as serialized array
- foreach ($informationObject->getDates() as $date) {
- $save_date['id'] = $date->id;
- $save_date['rendered'] =
Qubit::renderDateStartEnd($date->getDate(array('cultureFallback' => true)),
$date->startDate, $date->endDate);
- $save_date['type'] = $date->getType(array('cultureFallback' =>
true))->__toString();
- $save_date['actor'] = $date->actor->__toString();
-
- $dates[] = $save_date;
+ foreach ($informationObject->getDates() as $date)
+ {
+ $save_date['id'] = $date->id;
+ $save_date['rendered'] =
Qubit::renderDateStartEnd($date->getDate(array('cultureFallback' => true)),
$date->startDate, $date->endDate);
+ $save_date['type'] = $date->getType(array('cultureFallback' =>
true))->__toString();
+ $save_date['actor'] = $date->actor->__toString();
+
+ $dates[] = $save_date;
}
+
$doc->addField(Zend_Search_Lucene_Field::UnIndexed('dates',
serialize($dates)));
-/*
+ /*
// CREATOR
$creatorField = Zend_Search_Lucene_Field::Unstored('creator',
$informationObject->getCreatorsNameString(array('culture' => $language)));
- //boost the hit relevance for the creator field
+ // Boost the hit relevance for the creator field
$creatorField->boost = 8;
$doc->addField($creatorField);
$doc->addField(Zend_Search_Lucene_Field::Unstored('creatorhistory',
$informationObject->getCreatorsHistoryString(array('culture' => $language))));
-*/
+ */
// Level of Description
if (null !== $informationObject->getLevelOfDescription())
{
- $doc->addField(Zend_Search_Lucene_Field::Text('levelOfDescription',
$informationObject->getLevelOfDescription()->getName(array('culture' =>
$language))));
- } else {
+ $doc->addField(Zend_Search_Lucene_Field::Text('levelOfDescription',
$informationObject->getLevelOfDescription()->getName(array('culture' =>
$language))));
+ }
+ else
+ {
$doc->addField(Zend_Search_Lucene_Field::UnIndexed('levelOfDescription',
null));
}
@@ -474,7 +485,7 @@
$identifierField->boost = 5;
$doc->addField($identifierField);
- // I18N FIELDS
+ // I18n fields
$doc->addField(Zend_Search_Lucene_Field::Unstored('alternatetitle',
$informationObject->getAlternateTitle(array('culture' => $language))));
$doc->addField(Zend_Search_Lucene_Field::Unstored('edition',
$informationObject->getEdition(array('culture' => $language))));
$doc->addField(Zend_Search_Lucene_Field::Unstored('extentandmedium',
$informationObject->getExtentAndMedium(array('culture' => $language))));
@@ -491,21 +502,21 @@
$doc->addField(Zend_Search_Lucene_Field::Unstored('locationofcopies',
$informationObject->getLocationOfCopies(array('culture' => $language))));
$doc->addField(Zend_Search_Lucene_Field::Unstored('relatedunitsofdescription',
$informationObject->getRelatedUnitsOfDescription(array('culture' =>
$language))));
- // SUBJECTS
+ // Subjects
$subjectField = Zend_Search_Lucene_Field::Unstored('subject',
$informationObject->getAccessPointsString(QubitTaxonomy::SUBJECT_ID,
array('culture' => $language)));
- //boost the hit relevance for the subject field
+ // Boost the hit relevance for the subject field
$subjectField->boost = 5;
$doc->addField($subjectField);
- // PLACE
+ // Place
$placeField = Zend_Search_Lucene_Field::Unstored('place',
$informationObject->getAccessPointsString(QubitTaxonomy::PLACE_ID,
array('culture' => $language)));
- //boost the hit relevance for the place field
+ // Boost the hit relevance for the place field
$placeField->boost = 3;
$doc->addField($placeField);
- // NAMES
+ // Names
$nameField = Zend_Search_Lucene_Field::Unstored('name',
$informationObject->getNameAccessPointsString(array('culture' => $language)));
- //boost the hit relevance for the place field
+ // Boost the hit relevance for the place field
$nameField->boost = 3;
$doc->addField($nameField);
@@ -513,7 +524,7 @@
$languages = $cultureInfo->getLanguages();
$scripts = $cultureInfo->getScripts();
- // LANGUAGES
+ // Languages
if (0 < count($properties = $informationObject->getProperties($name =
'language')))
{
$languageCodes =
unserialize($properties->offsetGet(0)->getValue(array('sourceCulture' =>
true)));
@@ -529,7 +540,7 @@
}
}
- // SCRIPTS
+ // Scripts
if (0 < count($properties = $informationObject->getProperties($name =
'script')))
{
$scriptCodes =
unserialize($properties->offsetGet(0)->getValue(array('sourceCulture' =>
true)));
@@ -545,7 +556,7 @@
}
}
- // NOTES
+ // Notes
if (0 < count($notes = $informationObject->getNotes()))
{
$noteString = '';
@@ -556,11 +567,11 @@
$doc->addField(Zend_Search_Lucene_Field::Unstored('notes', $noteString));
}
- // exclude control area fields for now, maybe add a seperate index for
administrative data?
+ // Exclude control area fields for now, maybe add a seperate index for
administrative data?
// (institution_responsible_identifier, rules, sources, revision_history)
- //TO COME:
- //add all dynamic metadata fields to index
+ // To come:
+ // Add all dynamic metadata fields to index
self::getInstance()->getEngine()->getIndex()->addDocument($doc);
}
}
--
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.
