Author: jablko
Date: Thu Oct 28 02:33:59 2010
New Revision: 8621
Log:
Cosmetic change
Modified:
trunk/apps/qubit/modules/digitalobject/actions/multiFileUploadAction.class.php
trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
trunk/lib/QubitXmlImport.class.php
trunk/lib/model/QubitDigitalObject.php
trunk/lib/model/QubitInformationObject.php
trunk/lib/model/QubitTerm.php
Modified:
trunk/apps/qubit/modules/digitalobject/actions/multiFileUploadAction.class.php
==============================================================================
---
trunk/apps/qubit/modules/digitalobject/actions/multiFileUploadAction.class.php
Thu Oct 28 02:14:01 2010 (r8620)
+++
trunk/apps/qubit/modules/digitalobject/actions/multiFileUploadAction.class.php
Thu Oct 28 02:33:59 2010 (r8621)
@@ -100,7 +100,7 @@
// Create an information object for this digital object
$informationObject = new QubitInformationObject;
- $informationObject->setParentId($this->informationObject->id);
+ $informationObject->parentId = $this->informationObject->id;
if (0 < strlen($title = $file['infoObjectTitle']))
{
@@ -109,7 +109,7 @@
if (0 != intval($levelOfDescriptionId =
$this->form->getValue('level_of_description_id')))
{
- $informationObject->setLevelOfDescriptionId($levelOfDescriptionId);
+ $informationObject->levelOfDescriptionId = $levelOfDescriptionId;
}
// Set publication status to 'draft'
@@ -124,7 +124,7 @@
{
// Upload asset and create digital object
$digitalObject = new QubitDigitalObject;
- $digitalObject->setInformationObject($informationObject);
+ $digitalObject->informationObject = $informationObject;
$digitalObject->usageId = QubitTerm::MASTER_ID;
$digitalObject->assets[] = new QubitAsset($file['name'],
file_get_contents("$tmpPath/$file[tmpName]"));
Modified:
trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
Thu Oct 28 02:14:01 2010 (r8620)
+++ trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
Thu Oct 28 02:33:59 2010 (r8621)
@@ -525,7 +525,7 @@
if (0 < $childLevelFormData['levelOfDescription'] && (null !==
QubitTerm::getById($childLevelFormData['levelOfDescription'])))
{
-
$childLevel->setLevelOfDescriptionId($childLevelFormData['levelOfDescription']);
+ $childLevel->levelOfDescriptionId =
$childLevelFormData['levelOfDescription'];
}
if (0 < $childLevelFormData['levelOfDescription']
Modified: trunk/lib/QubitXmlImport.class.php
==============================================================================
--- trunk/lib/QubitXmlImport.class.php Thu Oct 28 02:14:01 2010 (r8620)
+++ trunk/lib/QubitXmlImport.class.php Thu Oct 28 02:33:59 2010 (r8621)
@@ -282,7 +282,7 @@
if (!empty($parentId) && is_callable(array($currentObject,
'setParentId')))
{
- $currentObject->setParentId($parentId);
+ $currentObject->parentId = $parentId;
}
}
else
Modified: trunk/lib/model/QubitDigitalObject.php
==============================================================================
--- trunk/lib/model/QubitDigitalObject.php Thu Oct 28 02:14:01 2010
(r8620)
+++ trunk/lib/model/QubitDigitalObject.php Thu Oct 28 02:33:59 2010
(r8621)
@@ -1077,13 +1077,13 @@
{
// Create a new information object
$newInfoObject = new QubitInformationObject;
- $newInfoObject->setParentId($this->getInformationObject()->id);
+ $newInfoObject->parentId = $this->getInformationObject()->id;
$newInfoObject->setTitle($this->getInformationObject()->getTitle().'
('.($i + 1).')');
$newInfoObject->save();
// Create and link a new digital object
$newDigiObject = new QubitDigitalObject;
- $newDigiObject->setParentId($this->id);
+ $newDigiObject->parentId = $this->id;
$newDigiObject->setInformationObjectId($newInfoObject->id);
$newDigiObject->save();
@@ -1248,7 +1248,7 @@
if (0 < strlen($resizedImage))
{
$derivative = new QubitDigitalObject;
- $derivative->setParentId($this->id);
+ $derivative->parentId = $this->id;
$derivative->usageId = $usageId;
$derivative->createDerivatives = false;
$derivative->indexOnSave = false;
@@ -1528,7 +1528,7 @@
if (file_exists($derivativeFullPath) && 0 < ($byteSize =
filesize($derivativeFullPath)))
{
$derivative = new QubitDigitalObject;
- $derivative->setParentId($this->id);
+ $derivative->parentId = $this->id;
$derivative->usageId = $usageId;
$derivative->assets[] = new QubitAsset($derivativeName,
file_get_contents($derivativeFullPath));
$derivative->createDerivatives = false;
@@ -1552,7 +1552,7 @@
$derivative = new QubitDigitalObject;
$derivative->setPath($this->getPath());
$derivative->setName($derivativeName);
- $derivative->setParentId($this->id);
+ $derivative->parentId = $this->id;
$derivative->setByteSize($byteSize);
$derivative->usageId = $usageId;
$derivative->setMimeAndMediaType();
@@ -1634,7 +1634,7 @@
$derivative = new QubitDigitalObject;
$derivative->setPath($this->getPath());
$derivative->setName($derivativeName);
- $derivative->setParentId($this->id);
+ $derivative->parentId = $this->id;
$derivative->setByteSize($byteSize);
$derivative->usageId = $usageId;
$derivative->setMimeAndMediaType();
Modified: trunk/lib/model/QubitInformationObject.php
==============================================================================
--- trunk/lib/model/QubitInformationObject.php Thu Oct 28 02:14:01 2010
(r8620)
+++ trunk/lib/model/QubitInformationObject.php Thu Oct 28 02:33:59 2010
(r8621)
@@ -424,7 +424,7 @@
$criteria = QubitInformationObject::addRootsCriteria($criteria);
$parentId = QubitInformationObject::getOne($criteria)->id;
- $this->setParentId($parentId);
+ $this->parentId = $parentId;
}
/***********************
@@ -1210,7 +1210,7 @@
$criteria->add(QubitTermI18n::NAME, $name);
if ($term = QubitTermI18n::getOne($criteria))
{
- $this->setLevelOfDescriptionId($term->id);
+ $this->levelOfDescriptionId = $term->id;
}
else
{
@@ -1220,7 +1220,7 @@
$term->setName($name);
$term->setRoot();
$term->save();
- $this->setLevelOfDescriptionId($term->id);
+ $this->levelOfDescriptionId = $term->id;
}
}
}
@@ -1419,7 +1419,7 @@
$newTerm = new QubitTerm;
$newTerm->setTaxonomyId(QubitTaxonomy::PHYSICAL_OBJECT_TYPE_ID);
$newTerm->setName($options['type']);
- $newTerm->setParentId(QubitTerm::CONTAINER_ID);
+ $newTerm->parentId = QubitTerm::CONTAINER_ID;
$newTerm->save();
$newPhysicalObject->setTypeId($newTerm->id);
}
Modified: trunk/lib/model/QubitTerm.php
==============================================================================
--- trunk/lib/model/QubitTerm.php Thu Oct 28 02:14:01 2010 (r8620)
+++ trunk/lib/model/QubitTerm.php Thu Oct 28 02:33:59 2010 (r8621)
@@ -212,7 +212,7 @@
foreach ($this->termsRelatedByparentId as $child)
{
$child->setIndexOnSave(false);
- $child->setParentId($this->id);
+ $child->parentId = $this->id;
try
{
@@ -231,7 +231,7 @@
public function setRoot()
{
- $this->setParentId(QubitTerm::ROOT_ID);
+ $this->parentId = QubitTerm::ROOT_ID;
}
public function delete($connection = null)
--
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.
