Author: david
Date: 2008-11-26 16:04:21 -0800 (Wed, 26 Nov 2008)
New Revision: 1625
Modified:
trunk/qubit/lib/model/QubitDigitalObject.php
trunk/qubit/lib/model/QubitTerm.php
Log:
Update custom queries to use PDO syntax for symfony 1.2
Modified: trunk/qubit/lib/model/QubitDigitalObject.php
===================================================================
--- trunk/qubit/lib/model/QubitDigitalObject.php 2008-11-26 23:45:17 UTC
(rev 1624)
+++ trunk/qubit/lib/model/QubitDigitalObject.php 2008-11-27 00:04:21 UTC
(rev 1625)
@@ -318,10 +318,10 @@
$conn = Propel::getConnection();
$stmt = $conn->prepare($sql);
- $rs = $stmt->executeQuery(ResultSet::FETCHMODE_NUM);
- $rs->next();
+ $stmt->execute();
+ $rs = $stmt->fetch();
- return $rs->getInt(1);
+ return $rs['hits'];
}
/**
Modified: trunk/qubit/lib/model/QubitTerm.php
===================================================================
--- trunk/qubit/lib/model/QubitTerm.php 2008-11-26 23:45:17 UTC (rev 1624)
+++ trunk/qubit/lib/model/QubitTerm.php 2008-11-27 00:04:21 UTC (rev 1625)
@@ -71,46 +71,46 @@
{
//The following terms cannot be edited by users because their values are
used in application logic
return $this->getId() == QubitTerm::CREATION_ID ||
- $this->getId() == QubitTerm::SUBJECT_ID ||
- $this->getId() == QubitTerm::CUSTODY_ID ||
- $this->getId() == QubitTerm::PUBLICATION_ID ||
- $this->getId() == QubitTerm::CONTRIBUTION_ID ||
- $this->getId() == QubitTerm::COLLECTION_ID ||
- $this->getId() == QubitTerm::ACCUMULATION_ID ||
- $this->getId() == QubitTerm::TITLE_NOTE_ID ||
- $this->getId() == QubitTerm::PUBLICATION_NOTE_ID ||
- $this->getId() == QubitTerm::SOURCE_NOTE_ID ||
- $this->getId() == QubitTerm::SCOPE_NOTE_ID ||
- $this->getId() == QubitTerm::DISPLAY_NOTE_ID ||
- $this->getId() == QubitTerm::ARCHIVAL_MATERIAL_ID ||
- $this->getId() == QubitTerm::FINDING_AIDS_ID ||
- $this->getId() == QubitTerm::PUBLISHED_MATERIAL_ID ||
- $this->getId() == QubitTerm::ARTEFACT_MATERIAL_ID ||
- $this->getId() == QubitTerm::CORPORATE_BODY_ID ||
- $this->getId() == QubitTerm::PERSON_ID ||
- $this->getId() == QubitTerm::FAMILY_ID ||
- $this->getId() == QubitTerm::FAMILY_NAME_FIRST_NAME_ID ||
- $this->getId() == QubitTerm::AUDIO_ID ||
- $this->getId() == QubitTerm::IMAGE_ID ||
- $this->getId() == QubitTerm::TEXT_ID ||
- $this->getId() == QubitTerm::VIDEO_ID ||
- $this->getId() == QubitTerm::OTHER_ID ||
- $this->getId() == QubitTerm::MASTER_ID ||
- $this->getId() == QubitTerm::REFERENCE_ID ||
- $this->getId() == QubitTerm::THUMBNAIL_ID ||
- $this->getId() == QubitTerm::LOCATION_ID ||
- $this->getId() == QubitTerm::CONTAINER_ID ||
- $this->getId() == QubitTerm::ARTEFACT_ID ||
- $this->getId() == QubitTerm::HAS_PHYSICAL_OBJECT_ID;
+ $this->getId() == QubitTerm::SUBJECT_ID ||
+ $this->getId() == QubitTerm::CUSTODY_ID ||
+ $this->getId() == QubitTerm::PUBLICATION_ID ||
+ $this->getId() == QubitTerm::CONTRIBUTION_ID ||
+ $this->getId() == QubitTerm::COLLECTION_ID ||
+ $this->getId() == QubitTerm::ACCUMULATION_ID ||
+ $this->getId() == QubitTerm::TITLE_NOTE_ID ||
+ $this->getId() == QubitTerm::PUBLICATION_NOTE_ID ||
+ $this->getId() == QubitTerm::SOURCE_NOTE_ID ||
+ $this->getId() == QubitTerm::SCOPE_NOTE_ID ||
+ $this->getId() == QubitTerm::DISPLAY_NOTE_ID ||
+ $this->getId() == QubitTerm::ARCHIVAL_MATERIAL_ID ||
+ $this->getId() == QubitTerm::FINDING_AIDS_ID ||
+ $this->getId() == QubitTerm::PUBLISHED_MATERIAL_ID ||
+ $this->getId() == QubitTerm::ARTEFACT_MATERIAL_ID ||
+ $this->getId() == QubitTerm::CORPORATE_BODY_ID ||
+ $this->getId() == QubitTerm::PERSON_ID ||
+ $this->getId() == QubitTerm::FAMILY_ID ||
+ $this->getId() == QubitTerm::FAMILY_NAME_FIRST_NAME_ID ||
+ $this->getId() == QubitTerm::AUDIO_ID ||
+ $this->getId() == QubitTerm::IMAGE_ID ||
+ $this->getId() == QubitTerm::TEXT_ID ||
+ $this->getId() == QubitTerm::VIDEO_ID ||
+ $this->getId() == QubitTerm::OTHER_ID ||
+ $this->getId() == QubitTerm::MASTER_ID ||
+ $this->getId() == QubitTerm::REFERENCE_ID ||
+ $this->getId() == QubitTerm::THUMBNAIL_ID ||
+ $this->getId() == QubitTerm::LOCATION_ID ||
+ $this->getId() == QubitTerm::CONTAINER_ID ||
+ $this->getId() == QubitTerm::ARTEFACT_ID ||
+ $this->getId() == QubitTerm::HAS_PHYSICAL_OBJECT_ID;
}
public function __toString()
{
if (!$this->getName())
- {
+ {
return (string) $this->getName(array('sourceCulture' => true));
- }
+ }
return (string) $this->getName();
}
@@ -133,13 +133,13 @@
$criteria->addJoin(QubitNote::TYPE_ID, QubitTerm::ID);
$criteria->add(QubitNote::OBJECT_ID, $this->getId());
if ($noteTypeId)
- {
+ {
$criteria->add(QubitNote::TYPE_ID, $noteTypeId);
- }
+ }
if ($excludeNoteTypeId)
- {
+ {
$criteria->add(QubitNote::TYPE_ID, $excludeNoteTypeId,
Criteria::NOT_EQUAL);
- }
+ }
return QubitNote::get($criteria);
}
@@ -408,10 +408,12 @@
$conn = Propel::getConnection();
$stmt = $conn->prepare($sql);
- $rs = $stmt->executeQuery(ResultSet::FETCHMODE_NUM);
- $rs->next();
+ $stmt->execute();
+ if (count($row = $stmt->fetch()))
+ {
- return $rs->getInt(1);
+ return $row[0];
+ }
}
/** Get a basic key['id']/value['name'] array for use as options in form
select lists
--~--~---------~--~----~------------~-------~--~----~
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.ca/group/qubit-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
