Author: jablko
Date: Sun Oct 24 12:25:13 2010
New Revision: 8420
Log:
Cosmetic change, for consistency
Modified:
trunk/apps/qubit/modules/digitalobject/actions/browseAction.class.php
trunk/apps/qubit/modules/digitalobject/actions/imageflowComponent.class.php
trunk/apps/qubit/modules/digitalobject/actions/listAction.class.php
trunk/apps/qubit/modules/function/actions/autocompleteAction.class.php
trunk/apps/qubit/modules/function/actions/listAction.class.php
trunk/apps/qubit/modules/physicalobject/actions/autocompleteAction.class.php
trunk/apps/qubit/modules/repository/actions/contextMenuComponent.class.php
trunk/apps/qubit/modules/term/actions/autocompleteAction.class.php
trunk/apps/qubit/modules/term/actions/browseTermAction.class.php
trunk/apps/qubit/modules/term/actions/editAction.class.php
trunk/apps/qubit/modules/term/actions/indexAction.class.php
trunk/lib/model/QubitActor.php
trunk/lib/model/QubitDigitalObject.php
trunk/lib/model/QubitInformationObject.php
trunk/lib/model/QubitRepository.php
trunk/lib/model/QubitTerm.php
trunk/plugins/sfSkosPlugin/lib/sfSkosPlugin.class.php
Modified: trunk/apps/qubit/modules/digitalobject/actions/browseAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/digitalobject/actions/browseAction.class.php
Sun Oct 24 12:12:01 2010 (r8419)
+++ trunk/apps/qubit/modules/digitalobject/actions/browseAction.class.php
Sun Oct 24 12:25:13 2010 (r8420)
@@ -39,7 +39,7 @@
$criteria = new Criteria;
$criteria->add(QubitDigitalObject::MEDIA_TYPE_ID, $this->mediaType->id);
$criteria->add(QubitDigitalObject::SEQUENCE, null, Criteria::ISNULL);
- $criteria->addJoin(QubitDigitalObject::ID, QubitObject::ID,
Criteria::INNER_JOIN);
+ $criteria->addJoin(QubitDigitalObject::ID, QubitObject::ID);
$criteria->addJoin(QubitDigitalObject::INFORMATION_OBJECT_ID,
QubitInformationObject::ID);
// Sort by name ascending
Modified:
trunk/apps/qubit/modules/digitalobject/actions/imageflowComponent.class.php
==============================================================================
--- trunk/apps/qubit/modules/digitalobject/actions/imageflowComponent.class.php
Sun Oct 24 12:12:01 2010 (r8419)
+++ trunk/apps/qubit/modules/digitalobject/actions/imageflowComponent.class.php
Sun Oct 24 12:25:13 2010 (r8420)
@@ -64,7 +64,7 @@
if (isset($this->informationObject->id))
{
$criteria = new Criteria;
- $criteria->addJoin(QubitInformationObject::ID,
QubitDigitalObject::INFORMATION_OBJECT_ID, Criteria::INNER_JOIN);
+ $criteria->addJoin(QubitInformationObject::ID,
QubitDigitalObject::INFORMATION_OBJECT_ID);
$criteria->add(QubitInformationObject::LFT,
$this->informationObject->lft, Criteria::GREATER_THAN);
$criteria->add(QubitInformationObject::RGT,
$this->informationObject->rgt, Criteria::LESS_THAN);
Modified: trunk/apps/qubit/modules/digitalobject/actions/listAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/digitalobject/actions/listAction.class.php Sun Oct
24 12:12:01 2010 (r8419)
+++ trunk/apps/qubit/modules/digitalobject/actions/listAction.class.php Sun Oct
24 12:25:13 2010 (r8420)
@@ -45,7 +45,7 @@
$criteria = QubitCultureFallback::addFallbackCriteria($criteria,
'QubitTerm');
// Filter drafts
- $criteria->addJoin(QubitDigitalObject::INFORMATION_OBJECT_ID,
QubitInformationObject::ID, Criteria::INNER_JOIN);
+ $criteria->addJoin(QubitDigitalObject::INFORMATION_OBJECT_ID,
QubitInformationObject::ID);
$criteria = QubitAcl::addFilterDraftsCriteria($criteria);
$this->terms = QubitTerm::get($criteria);
Modified: trunk/apps/qubit/modules/function/actions/autocompleteAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/function/actions/autocompleteAction.class.php
Sun Oct 24 12:12:01 2010 (r8419)
+++ trunk/apps/qubit/modules/function/actions/autocompleteAction.class.php
Sun Oct 24 12:25:13 2010 (r8420)
@@ -35,7 +35,7 @@
}
$criteria = new Criteria;
- $criteria->addJoin(QubitFunction::ID, QubitFunctionI18n::ID,
Criteria::INNER_JOIN);
+ $criteria->addJoin(QubitFunction::ID, QubitFunctionI18n::ID);
$criteria->add(QubitFunction::ID, null, Criteria::ISNOTNULL);
if (isset($request->query))
Modified: trunk/apps/qubit/modules/function/actions/listAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/function/actions/listAction.class.php Sun Oct
24 12:12:01 2010 (r8419)
+++ trunk/apps/qubit/modules/function/actions/listAction.class.php Sun Oct
24 12:25:13 2010 (r8420)
@@ -40,7 +40,7 @@
if (isset($request->subquery))
{
- $criteria->addJoin(QubitFunction::ID, QubitFunctionI18n::ID,
Criteria::INNER_JOIN);
+ $criteria->addJoin(QubitFunction::ID, QubitFunctionI18n::ID);
$criteria->add(QubitFunctionI18n::AUTHORIZED_FORM_OF_NAME,
'%'.$request->subquery.'%', Criteria::LIKE);
$criteria->add(QubitFunctionI18n::CULTURE,
$this->context->user->getCulture());
}
Modified:
trunk/apps/qubit/modules/physicalobject/actions/autocompleteAction.class.php
==============================================================================
---
trunk/apps/qubit/modules/physicalobject/actions/autocompleteAction.class.php
Sun Oct 24 12:12:01 2010 (r8419)
+++
trunk/apps/qubit/modules/physicalobject/actions/autocompleteAction.class.php
Sun Oct 24 12:25:13 2010 (r8420)
@@ -33,7 +33,7 @@
}
$criteria = new Criteria;
- $criteria->addJoin(QubitPhysicalObject::ID, QubitPhysicalObjectI18n::ID,
Criteria::INNER_JOIN);
+ $criteria->addJoin(QubitPhysicalObject::ID, QubitPhysicalObjectI18n::ID);
$criteria->add(QubitPhysicalObjectI18n::CULTURE,
$this->context->user->getCulture());
$criteria->add(QubitPhysicalObjectI18n::NAME, $request->query.'%',
Criteria::LIKE);
$criteria->addAscendingOrderByColumn(QubitPhysicalObjectI18n::NAME);
Modified:
trunk/apps/qubit/modules/repository/actions/contextMenuComponent.class.php
==============================================================================
--- trunk/apps/qubit/modules/repository/actions/contextMenuComponent.class.php
Sun Oct 24 12:12:01 2010 (r8419)
+++ trunk/apps/qubit/modules/repository/actions/contextMenuComponent.class.php
Sun Oct 24 12:25:13 2010 (r8420)
@@ -33,7 +33,7 @@
}
$criteria = new Criteria;
- $criteria->addJoin(QubitInformationObject::ID, QubitObject::ID,
Criteria::INNER_JOIN);
+ $criteria->addJoin(QubitInformationObject::ID, QubitObject::ID);
$criteria->add(QubitInformationObject::REPOSITORY_ID, $this->resource->id);
$criteria->addAscendingOrderByColumn('title');
Modified: trunk/apps/qubit/modules/term/actions/autocompleteAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/term/actions/autocompleteAction.class.php Sun Oct
24 12:12:01 2010 (r8419)
+++ trunk/apps/qubit/modules/term/actions/autocompleteAction.class.php Sun Oct
24 12:25:13 2010 (r8420)
@@ -33,7 +33,7 @@
$criteria = new Criteria;
$criteria->add(QubitTerm::TAXONOMY_ID, $request->taxonomyId);
- $criteria->addJoin(QubitTerm::ID, QubitTermI18n::ID, Criteria::INNER_JOIN);
+ $criteria->addJoin(QubitTerm::ID, QubitTermI18n::ID);
$criteria->add(QubitTermI18n::CULTURE, $this->context->user->getCulture());
// For term module show only preferred term
Modified: trunk/apps/qubit/modules/term/actions/browseTermAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/term/actions/browseTermAction.class.php Sun Oct
24 12:12:01 2010 (r8419)
+++ trunk/apps/qubit/modules/term/actions/browseTermAction.class.php Sun Oct
24 12:25:13 2010 (r8420)
@@ -35,8 +35,8 @@
$criteria = new Criteria;
$criteria->add(QubitObjectTermRelation::TERM_ID, $this->term->id);
- $criteria->addJoin(QubitObjectTermRelation::OBJECT_ID,
QubitInformationObject::ID, Criteria::INNER_JOIN);
- $criteria->addJoin(QubitInformationObject::ID, QubitObject::ID,
Criteria::INNER_JOIN);
+ $criteria->addJoin(QubitObjectTermRelation::OBJECT_ID,
QubitInformationObject::ID);
+ $criteria->addJoin(QubitInformationObject::ID, QubitObject::ID);
$criteria = QubitAcl::addFilterDraftsCriteria($criteria);
Modified: trunk/apps/qubit/modules/term/actions/editAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/term/actions/editAction.class.php Sun Oct 24
12:12:01 2010 (r8419)
+++ trunk/apps/qubit/modules/term/actions/editAction.class.php Sun Oct 24
12:25:13 2010 (r8420)
@@ -307,7 +307,7 @@
{
// Test to make sure term doesn't already exist
$criteria = new Criteria;
- $criteria->addJoin(QubitTerm::ID, QubitTermI18n::ID,
Criteria::INNER_JOIN);
+ $criteria->addJoin(QubitTerm::ID, QubitTermI18n::ID);
$criteria->add(QubitTerm::TAXONOMY_ID, $this->term->taxonomyId);
$criteria->add(QubitTermI18n::NAME, $thisName);
$criteria->add(QubitTermI18n::CULTURE,
$this->context->user->getCulture());
Modified: trunk/apps/qubit/modules/term/actions/indexAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/term/actions/indexAction.class.php Sun Oct 24
12:12:01 2010 (r8419)
+++ trunk/apps/qubit/modules/term/actions/indexAction.class.php Sun Oct 24
12:25:13 2010 (r8420)
@@ -60,7 +60,7 @@
public function checkForRepeatedNames($validator, $value)
{
$criteria = new Criteria;
- $criteria->addJoin(QubitTerm::ID, QubitTermI18n::ID, Criteria::INNER_JOIN);
+ $criteria->addJoin(QubitTerm::ID, QubitTermI18n::ID);
$criteria->add(QubitTerm::ID, $this->term->id, Criteria::NOT_EQUAL);
$criteria->add(QubitTerm::TAXONOMY_ID, $this->term->taxonomyId);
$criteria->add(QubitTermI18n::CULTURE, $this->context->user->getCulture());
Modified: trunk/lib/model/QubitActor.php
==============================================================================
--- trunk/lib/model/QubitActor.php Sun Oct 24 12:12:01 2010 (r8419)
+++ trunk/lib/model/QubitActor.php Sun Oct 24 12:25:13 2010 (r8420)
@@ -446,7 +446,7 @@
{
$criteria = new Criteria;
- $criteria->addJoin(QubitRelation::TYPE_ID, QubitTerm::ID,
Criteria::INNER_JOIN);
+ $criteria->addJoin(QubitRelation::TYPE_ID, QubitTerm::ID);
$criterion1 = $criteria->getNewCriterion(QubitRelation::OBJECT_ID,
$this->getId());
$criterion2 = $criteria->getNewCriterion(QubitRelation::SUBJECT_ID,
$this->getId());
@@ -471,7 +471,7 @@
public static function getByAuthorizedFormOfName($name, $options = array())
{
$criteria = new Criteria();
- $criteria->addJoin(QubitActor::ID, QubitActorI18n::ID,
Criteria::INNER_JOIN);
+ $criteria->addJoin(QubitActor::ID, QubitActorI18n::ID);
$criteria->add(QubitActorI18n::AUTHORIZED_FORM_OF_NAME, $name);
if (isset($options['culture']))
Modified: trunk/lib/model/QubitDigitalObject.php
==============================================================================
--- trunk/lib/model/QubitDigitalObject.php Sun Oct 24 12:12:01 2010
(r8419)
+++ trunk/lib/model/QubitDigitalObject.php Sun Oct 24 12:25:13 2010
(r8420)
@@ -1883,7 +1883,7 @@
// Return false if this object has no children with digital objects
$criteria = new Criteria;
- $criteria->addJoin(QubitInformationObject::ID,
QubitDigitalObject::INFORMATION_OBJECT_ID, Criteria::INNER_JOIN);
+ $criteria->addJoin(QubitInformationObject::ID,
QubitDigitalObject::INFORMATION_OBJECT_ID);
$criteria->add(QubitInformationObject::PARENT_ID,
$this->informationObjectId);
if (0 === count(QubitDigitalObject::get($criteria)))
Modified: trunk/lib/model/QubitInformationObject.php
==============================================================================
--- trunk/lib/model/QubitInformationObject.php Sun Oct 24 12:12:01 2010
(r8419)
+++ trunk/lib/model/QubitInformationObject.php Sun Oct 24 12:25:13 2010
(r8420)
@@ -507,7 +507,7 @@
public function getDates(array $options = array())
{
$criteria = new Criteria;
- $criteria->addJoin(QubitEvent::ID, QubitEventI18n::ID,
Criteria::INNER_JOIN);
+ $criteria->addJoin(QubitEvent::ID, QubitEventI18n::ID);
$criteria->add(QubitEvent::INFORMATION_OBJECT_ID, $this->getId());
$criteria->add(QubitEventI18n::DATE_DISPLAY, null, Criteria::ISNOTNULL);
@@ -1495,7 +1495,7 @@
public static function getByCulture($culture, $options = array())
{
$criteria = new Criteria;
- $criteria->addJoin(QubitInformationObject::ID,
QubitInformationObjectI18n::ID, Criteria::INNER_JOIN);
+ $criteria->addJoin(QubitInformationObject::ID,
QubitInformationObjectI18n::ID);
$criteria->add(QubitInformationObjectI18n::CULTURE, $culture);
return QubitInformationObject::get($criteria, $options);
Modified: trunk/lib/model/QubitRepository.php
==============================================================================
--- trunk/lib/model/QubitRepository.php Sun Oct 24 12:12:01 2010 (r8419)
+++ trunk/lib/model/QubitRepository.php Sun Oct 24 12:25:13 2010 (r8420)
@@ -151,7 +151,7 @@
{
if ($countryCode !== null)
{
- $criteria->addJoin(QubitRepository::ID,
QubitContactInformation::ACTOR_ID, Criteria::INNER_JOIN);
+ $criteria->addJoin(QubitRepository::ID,
QubitContactInformation::ACTOR_ID);
$criteria->add(QubitContactInformation::PRIMARY_CONTACT, true);
$criteria->add(QubitContactInformation::COUNTRY_CODE, $countryCode);
}
Modified: trunk/lib/model/QubitTerm.php
==============================================================================
--- trunk/lib/model/QubitTerm.php Sun Oct 24 12:12:01 2010 (r8419)
+++ trunk/lib/model/QubitTerm.php Sun Oct 24 12:25:13 2010 (r8420)
@@ -670,9 +670,9 @@
$criteria = new Criteria;
$criteria->add(QubitTerm::ID, $this->id);
- $criteria->addJoin(QubitTerm::ID, QubitObject::ID, Criteria::INNER_JOIN);
- $criteria->addJoin(QubitTerm::ID, QubitObjectTermRelation::TERM_ID,
Criteria::INNER_JOIN);
- $criteria->addJoin(QubitObjectTermRelation::OBJECT_ID,
QubitInformationObject::ID, Criteria::INNER_JOIN);
+ $criteria->addJoin(QubitTerm::ID, QubitObject::ID);
+ $criteria->addJoin(QubitTerm::ID, QubitObjectTermRelation::TERM_ID);
+ $criteria->addJoin(QubitObjectTermRelation::OBJECT_ID,
QubitInformationObject::ID);
// Only get published info objects
$criteria = QubitAcl::addFilterDraftsCriteria($criteria);
Modified: trunk/plugins/sfSkosPlugin/lib/sfSkosPlugin.class.php
==============================================================================
--- trunk/plugins/sfSkosPlugin/lib/sfSkosPlugin.class.php Sun Oct 24
12:12:01 2010 (r8419)
+++ trunk/plugins/sfSkosPlugin/lib/sfSkosPlugin.class.php Sun Oct 24
12:25:13 2010 (r8420)
@@ -219,8 +219,8 @@
protected static function getTermBySourceNote($sourceNote)
{
$criteria = new Criteria;
- $criteria->addJoin(QubitTerm::ID, QubitNote::OBJECT_ID,
Criteria::INNER_JOIN);
- $criteria->addJoin(QubitNote::ID, QubitNoteI18n::ID, Criteria::INNER_JOIN);
+ $criteria->addJoin(QubitTerm::ID, QubitNote::OBJECT_ID);
+ $criteria->addJoin(QubitNote::ID, QubitNoteI18n::ID);
$criteria->add(QubitNoteI18n::CONTENT, $sourceNote);
return QubitTerm::getOne($criteria);
--
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.
