Author: david
Date: Mon Feb 13 13:32:09 2012
New Revision: 10870
Log:
Use static for
Modified:
trunk/lib/task/archivematicaDipImportTask.class.php
Modified: trunk/lib/task/archivematicaDipImportTask.class.php
==============================================================================
--- trunk/lib/task/archivematicaDipImportTask.class.php Mon Feb 13 12:58:34
2012 (r10869)
+++ trunk/lib/task/archivematicaDipImportTask.class.php Mon Feb 13 13:32:09
2012 (r10870)
@@ -29,6 +29,7 @@
class archivematicaDipImportTask extends sfBaseTask
{
protected static
+ $conn,
$count = 0;
/**
@@ -71,9 +72,9 @@
public function execute($arguments = array(), $options = array())
{
$databaseManager = new sfDatabaseManager($this->configuration);
- $conn = $databaseManager->getDatabase('propel')->getConnection();
+ self::$conn = $databaseManager->getDatabase('propel')->getConnection();
- sfConfig::set('app_upload_dir', self::getUploadDir($conn));
+ sfConfig::set('app_upload_dir', self::getUploadDir());
if (!is_dir($arguments['dip']))
{
@@ -157,7 +158,7 @@
if (!is_array($item))
{
- self::addDigitalObject($informationObject, $item, $conn);
+ self::addDigitalObject($informationObject, $item);
$informationObject->addProperty('dipUUID', $dipUUID);
if (null !== $objectUUID = $this->getUUID(basename($item)))
@@ -183,9 +184,9 @@
$informationObject->addProperty('objectUUID', $objectUUID);
}
- $informationObject->save($conn);
+ $informationObject->save(self::$conn);
- self::addDigitalObject($informationObject, $item[$i], $conn);
+ self::addDigitalObject($informationObject, $item[$i]);
}
}
}
@@ -193,7 +194,7 @@
$this->logSection('Successfully loaded '.self::$count.' digital objects.');
}
- protected function addDigitalObject($informationObject, $filepath, $conn)
+ protected function addDigitalObject($informationObject, $filepath)
{
if (null !== $informationObject->getDigitalObject())
{
@@ -217,12 +218,12 @@
$do->informationObject = $informationObject;
$do->usageId = QubitTerm::MASTER_ID;
$do->assets[] = new QubitAsset($filepath);
- $do->save($conn);
+ $do->save(self::$conn);
self::$count++;
}
- protected function getUploadDir($conn)
+ protected function getUploadDir()
{
$uploadDir = 'uploads'; // Default value
@@ -231,7 +232,7 @@
WHERE stg.source_culture = i18n.culture
AND stg.name = \'upload_dir\';';
- if ($sth = $conn->query($sql))
+ if ($sth = self::$conn->query($sql))
{
list($uploadDir) = $sth->fetch();
}
--
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.
