Author: sevein
Date: Tue Dec 1 12:20:44 2009
New Revision: 4015
Log:
Cosmetic change. The merit is for Jack.
Modified:
trunk/lib/model/QubitInformationObject.php
Modified: trunk/lib/model/QubitInformationObject.php
==============================================================================
--- trunk/lib/model/QubitInformationObject.php Tue Dec 1 11:42:48 2009
(r4014)
+++ trunk/lib/model/QubitInformationObject.php Tue Dec 1 12:20:44 2009
(r4015)
@@ -1446,31 +1446,27 @@
}
}
- public function setTermRelationByName($term, $options)
+ public function setTermRelationByName($name, $options)
{
// see if subject term already exists
$criteria = new Criteria;
$criteria->addJoin(QubitTerm::ID, QubitTermI18n::ID);
$criteria->add(QubitTerm::TAXONOMY_ID, $options['taxonomyId']);
- $criteria->add(QubitTermI18n::NAME, $term);
- if ($existingTerm = QubitTerm::getOne($criteria))
+ $criteria->add(QubitTermI18n::NAME, $name);
+ if (null === $term = QubitTerm::getOne($criteria))
{
- $this->addTermRelation($existingTerm->getId());
- }
- else
- {
- $newTerm = new QubitTerm;
- $newTerm->setTaxonomyId($options['taxonomyId']);
- $newTerm->setName($term);
- $newTerm->setRoot();
- $newTerm->save();
+ $term = new QubitTerm;
+ $term->setTaxonomyId($options['taxonomyId']);
+ $term->setName($name);
+ $term->setRoot();
+ $term->save();
if (isset($options['source']))
{
$newTerm->setNote(array('note' => $options['source'], 'noteTypeId' =>
QubitTerm::SOURCE_NOTE_ID, 'userId' =>
sfContext::getInstance()->user->getAttribute('user_id')));
}
- // associate this new subject term with this information object
- $this->addTermRelation($newTerm->getId());
}
+
+ $this->terms[] = $term;
}
public function setPhysicalObjectByName($physicalObjectName, $options)
--
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.
