Author: jablko
Date: Mon Oct 25 13:28:37 2010
New Revision: 8478
Log:
Cosmetic changes
Modified:
trunk/apps/qubit/modules/informationobject/actions/autocompleteAction.class.php
trunk/apps/qubit/modules/term/actions/autocompleteAction.class.php
Modified:
trunk/apps/qubit/modules/informationobject/actions/autocompleteAction.class.php
==============================================================================
---
trunk/apps/qubit/modules/informationobject/actions/autocompleteAction.class.php
Mon Oct 25 13:19:04 2010 (r8477)
+++
trunk/apps/qubit/modules/informationobject/actions/autocompleteAction.class.php
Mon Oct 25 13:28:37 2010 (r8478)
@@ -36,21 +36,20 @@
}
$criteria = new Criteria;
+
+ // Exclude root
+ $criteria->add(QubitInformationObject::ID,
QubitInformationObject::ROOT_ID, Criteria::NOT_EQUAL);
+
$criteria->addJoin(QubitInformationObject::ID,
QubitInformationObjectI18n::ID);
+ $criteria->add(QubitInformationObjectI18n::CULTURE,
$this->context->user->getCulture());
// Search for matching title or identifier
if (isset($request->query))
{
- $c1 = $criteria->getNewCriterion(QubitInformationObjectI18n::TITLE,
"$request->query%", Criteria::LIKE);
- $c2 = $criteria->getNewCriterion(QubitInformationObject::IDENTIFIER,
"$request->query%", Criteria::LIKE);
- $c1->addOr($c2);
- $criteria->add($c1);
+
$criteria->add($criteria->getNewCriterion(QubitInformationObjectI18n::IDENTIFIER,
"$request->query%", Criteria::LIKE)
+ ->addOr($criteria->getNewCriterion(QubitInformationObject::TITLE,
"$request->query%", Criteria::LIKE)));
}
- // Exclude root
- $criteria->add(QubitInformationObject::ID,
QubitInformationObject::ROOT_ID, Criteria::NOT_EQUAL);
-
- $criteria->add(QubitInformationObjectI18n::CULTURE,
$this->context->user->getCulture());
$criteria->addAscendingOrderByColumn(QubitInformationObject::LEVEL_OF_DESCRIPTION_ID);
$criteria->addAscendingOrderByColumn(QubitInformationObject::IDENTIFIER);
$criteria->addAscendingOrderByColumn(QubitInformationObjectI18n::TITLE);
Modified: trunk/apps/qubit/modules/term/actions/autocompleteAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/term/actions/autocompleteAction.class.php Mon Oct
25 13:19:04 2010 (r8477)
+++ trunk/apps/qubit/modules/term/actions/autocompleteAction.class.php Mon Oct
25 13:28:37 2010 (r8478)
@@ -21,43 +21,40 @@
{
public function execute($request)
{
- $this->taxonomy = QubitTaxonomy::getById($request->taxonomyId);
- $this->terms = array();
-
- if (!isset($this->taxonomy))
+ if (!isset($request->limit))
{
- $this->forward404();
+ $request->limit = sfConfig::get('app_hits_per_page');
}
- $params =
$this->context->routing->parse(Qubit::pathInfo($request->getReferer()));
-
- $criteria = new Criteria;
- $criteria->add(QubitTerm::TAXONOMY_ID, $request->taxonomyId);
- $criteria->addJoin(QubitTerm::ID, QubitTermI18n::ID);
- $criteria->add(QubitTermI18n::CULTURE, $this->context->user->getCulture());
-
// For term module show only preferred term
+ $params =
$this->context->routing->parse(Qubit::pathInfo($request->getReferer()));
if ('term' == $params['module'])
{
+ $criteria = new Criteria;
+
// Exclude the calling object and it's descendants from the list (prevent
// circular inheritance)
if (isset($params['id']))
{
- $thisTerm = QubitTerm::getById($params['id']);
+ $term = QubitTerm::getById($params['id']);
- if (isset($thisTerm))
+ if (isset($term))
{
- $c1 = $criteria->getNewCriterion(QubitTerm::LFT, $thisTerm->lft,
Criteria::LESS_THAN);
- $c2 = $criteria->getNewCriterion(QubitTerm::RGT, $thisTerm->rgt,
Criteria::GREATER_THAN);
- $c1->addOr($c2);
- $criteria->add($c1);
+ $criteria->add($criteria->getNewCriterion(QubitTerm::LFT,
$term->lft, Criteria::LESS_THAN)
+ ->addOr($criteria->getNewCriterion(QubitTerm::RGT, $term->rgt,
Criteria::GREATER_THAN)));
}
}
+ $params =
$this->context->routing->parse(Qubit::pathInfo($request->taxonomy));
+ $criteria->add(QubitTerm::TAXONOMY_ID, $params['id']);
+
+ $criteria->addJoin(QubitTerm::ID, QubitTermI18n::ID);
+ $criteria->add(QubitTermI18n::CULTURE,
$this->context->user->getCulture());
+
// Narrow results by query
if (isset($request->query))
{
- $criteria->add(QubitTermI18n::NAME, $request->query.'%',
Criteria::LIKE);
+ $criteria->add(QubitTermI18n::NAME, "$request->query%",
Criteria::LIKE);
}
// Sort by name
@@ -72,9 +69,20 @@
// If NOT calling from term page show preferred and alternative terms
else
{
- $s1 = 'SELECT qt.id, null, qti.name FROM '.QubitTerm::TABLE_NAME.' qt
LEFT JOIN '.QubitTermI18n::TABLE_NAME.' qti ON qt.id = qti.id WHERE qti.culture
= :p1 AND taxonomy_id = :p2';
-
- $s2 = 'SELECT qt.id, qon.id as altId, qoni.name FROM
'.QubitOtherName::TABLE_NAME.' qon INNER JOIN
'.QubitOtherNameI18n::TABLE_NAME.' qoni ON qon.id = qoni.id INNER JOIN
'.QubitTerm::TABLE_NAME.' qt ON qon.object_id = qt.id WHERE qoni.culture = :p1
AND qt.taxonomy_id = :p2';
+ $s1 = 'SELECT qt.id, null, qti.name
+ FROM '.QubitTerm::TABLE_NAME.' qt
+ LEFT JOIN '.QubitTermI18n::TABLE_NAME.' qti
+ ON qt.id = qti.id WHERE qti.culture = :p1
+ AND taxonomy_id = :p2';
+
+ $s2 = 'SELECT qt.id, qon.id as altId, qoni.name
+ FROM '.QubitOtherName::TABLE_NAME.' qon
+ INNER JOIN '.QubitOtherNameI18n::TABLE_NAME.' qoni
+ ON qon.id = qoni.id
+ INNER JOIN '.QubitTerm::TABLE_NAME.' qt
+ ON qon.object_id = qt.id
+ WHERE qoni.culture = :p1
+ AND qt.taxonomy_id = :p2';
// Narrow results by query
if (isset($request->query))
@@ -83,31 +91,32 @@
$s2 .= ' AND qoni.name LIKE :p3';
}
- $sql = '('.$s1.') UNION ALL ('.$s2.') ORDER BY name LIMIT 10;';
+ $connnection = Propel::getConnection();
+ $statement = $conn->prepare("($s1) UNION ALL ($s2) ORDER BY name LIMIT
10");
+ $statement->bindValue(':p1', $this->context->user->getCulture());
- $conn = Propel::getConnection();
- $stmt = $conn->prepare($sql);
- $stmt->bindValue(':p1', $this->context->user->getCulture());
- $stmt->bindValue(':p2', $this->taxonomy->id);
+ $params =
$this->context->routing->parse(Qubit::pathInfo($request->taxonomy));
+ $statement->bindValue(':p2', $params['id']);
if (isset($request->query))
{
- $stmt->bindValue(':p3', $request->query.'%');
+ $statement->bindValue(':p3', "$request->query%");
}
- $stmt->execute();
+ $statement->execute();
- while ($row = $stmt->fetch())
+ $this->terms = array();
+ while ($row = $statement->fetch())
{
- if (null == $row[1])
+ if (isset($row[1]))
{
- // preferred term
- $this->terms[] = QubitTerm::getById($row[0]);
+ // Alternative term
+ $this->terms[] = array(QubitTerm::getById($row[0]), $row[2]);
}
else
{
- // alternative term
- $this->terms[] = array(QubitTerm::getById($row[0]), $row[2]);
+ // Preferred term
+ $this->terms[] = QubitTerm::getById($row[0]);
}
}
}
--
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.
