From cb921c1b0291de7757bc5db73e53b4b5403d3e6f Mon Sep 17 00:00:00 2001
From: paul <paul@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Thu, 23 Nov 2006 06:57:22 +0000
Subject: [PATCH] Changing various function names to be more obvious and
consistent. Get rid of unneeded data copying ( = = someFunction()).
---
.../modules/storageServer/var/StoredFile.php | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/campcaster/src/modules/storageServer/var/StoredFile.php b/campcaster/src/modules/storageServer/var/StoredFile.php
index 18e2f40c0..dda3d0f21 100644
--- a/campcaster/src/modules/storageServer/var/StoredFile.php
+++ b/campcaster/src/modules/storageServer/var/StoredFile.php
@@ -311,7 +311,7 @@ class StoredFile {
if (PEAR::isError($ac)) {
return $ac;
}
- $ac->md->replace($src->md->getMetaData(), 'string');
+ $ac->md->replace($src->md->getMetadata(), 'string');
return $ac;
}
@@ -450,19 +450,19 @@ class StoredFile {
function replaceMetaData($metadata, $mdataLoc='file', $format=NULL)
{
$this->dbc->query("BEGIN");
- $res = $r = $this->md->replace($metadata, $mdataLoc, $format);
- if (PEAR::isError($r)) {
+ $res = $this->md->replace($metadata, $mdataLoc, $format);
+ if (PEAR::isError($res)) {
$this->dbc->query("ROLLBACK");
- return $r;
+ return $res;
}
$r = $this->md->regenerateXmlFile();
if (PEAR::isError($r)) {
$this->dbc->query("ROLLBACK");
return $r;
}
- $res = $r = $this->dbc->query("COMMIT");
- if (PEAR::isError($r)) {
- return $r;
+ $res = $this->dbc->query("COMMIT");
+ if (PEAR::isError($res)) {
+ return $res;
}
return TRUE;
}
@@ -474,9 +474,9 @@ class StoredFile {
* @return XML string
* @see MetaData
*/
- function getMetaData()
+ function getMetadata()
{
- return $this->md->getMetaData();
+ return $this->md->getMetadata();
}