Author: david
Date: Fri Feb 24 21:41:50 2012
New Revision: 10978
Log:
Fix more typos
Modified:
trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
trunk/lib/QubitSearchInformationObject.class.php
Modified:
trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
Fri Feb 24 20:12:51 2012 (r10977)
+++ trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
Fri Feb 24 21:41:50 2012 (r10978)
@@ -570,7 +570,7 @@
$this->resource->save();
- $this->redirect(array($this->resource, 'module' =>
'informationobject'));
+ //$this->redirect(array($this->resource, 'module' =>
'informationobject'));
}
}
Modified: trunk/lib/QubitSearchInformationObject.class.php
==============================================================================
--- trunk/lib/QubitSearchInformationObject.class.php Fri Feb 24 20:12:51
2012 (r10977)
+++ trunk/lib/QubitSearchInformationObject.class.php Fri Feb 24 21:41:50
2012 (r10978)
@@ -147,9 +147,9 @@
io.*,
i18n.*,
slug.slug,
- pubs.status_id as publication_status_id,
- do.id as digi_id,
- do.media_type_id as digi_type_id
+ pubs.status_id as publicationStatusId,
+ do.id as digitalObjectId,
+ do.media_type_id as do_media_type_id
FROM '.QubitInformationObject::TABLE_NAME.' io
JOIN '.QubitInformationObjectI18n::TABLE_NAME.' i18n
ON io.id = i18n.id
@@ -186,7 +186,7 @@
$indexer = new QubitSearchInformationObject($resourceId, $culture,
$options);
// Add fields
- foreach ($indexer->fields as $field)
+ foreach (self::$fields as $field)
{
$indexer->addField($field);
}
@@ -204,6 +204,8 @@
protected function addField($name)
{
+ $field = null;
+
switch ($name)
{
case 'className':
@@ -225,7 +227,7 @@
if (isset($this->resource->digitalObjectId))
{
$criteria = new Criteria;
- $criteria->add(DigitalObject::PARENT_ID, $resource->digi_id);
+ $criteria->add(DigitalObject::PARENT_ID,
$this->resource->digitalObjectId);
$criteria->add(DigitalObject::USAGE_ID, QubitTerm::THUMBNAIL_ID);
if (null !== $thumbnail = QubitDigitalObject::getOne())
@@ -242,7 +244,7 @@
break;
case 'identifier':
- $field = Zend_Search_Lucene_Field::Text('identifier',
$resource->identifier);
+ $field = Zend_Search_Lucene_Field::Text('identifier',
$this->resource->identifier);
$field->boost = 5;
break;
@@ -353,7 +355,10 @@
$field = Zend_Search_Lucene_Field::Unstored($name,
$this->resource->$name);
}
- $this->doc->addField($field);
+ if (isset($field))
+ {
+ $this->doc->addField($field);
+ }
}
protected static function getFallbackTitle($id, $options = array())
@@ -396,19 +401,19 @@
protected function getLevelOfDescription()
{
- if (0 == count(QubitSearchInformationObject::$levelsOfDescription))
+ if (0 == count(self::$lookups['levelsOfDescription']))
{
$criteria = new Criteria;
$criteria->add(QubitTerm::TAXONOMY_ID,
QubitTaxonomy::LEVEL_OF_DESCRIPTION_ID);
foreach (QubitTerm::get($criteria) as $item)
{
- self::$levelsOfDescription[$item->id] = $item;
+ self::$lookups['levelOfDescription'][$item->id] = $item;
}
}
- if (isset(self::$levelsOfDescription[$this->resource->id]))
+ if (isset(self::$lookups['levelOfDescription'][$this->resource->id]))
{
- return
self::$levelsOfDescription[$this->resource->id]->getName(array('culture' =>
$this->resource->culture));
+ return
self::$lookups['levelOfDescription'][$this->resource->id]->getName(array('culture'
=> $this->resource->culture));
}
}
--
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.
