Fix for the bug where you could not upload files (the first part of bug #2114). Converted StoredFile into a real class that mapped the database table properly. Renamed some functions to be consistent with each other and with coding standards.

This commit is contained in:
paul 2007-01-11 19:24:45 +00:00
parent c59a73f506
commit 623be37d8a
13 changed files with 392 additions and 322 deletions

View file

@ -287,12 +287,12 @@ class Transport
switch ($ftype = BasicStor::GetType($gunid)) {
case "audioclip":
case "webstream":
$ac = StoredFile::recallByGunid($gunid);
if (PEAR::isError($ac)) {
return $ac;
$storedFile = StoredFile::RecallByGunid($gunid);
if (PEAR::isError($storedFile)) {
return $storedFile;
}
// handle metadata:
$mdfpath = $ac->getRealMetadataFileName();
$mdfpath = $storedFile->getRealMetadataFileName();
if (PEAR::isError($mdfpath)) {
return $mdfpath;
}
@ -303,11 +303,11 @@ class Transport
return $mdtrec;
}
// handle raw media file:
$fpath = $ac->getRealFileName();
$fpath = $storedFile->getRealFileName();
if (PEAR::isError($fpath)) {
return $fpath;
}
$fname = $ac->getFileName();
$fname = $storedFile->getName();
if (PEAR::isError($fname)) {
return $fname;
}
@ -325,11 +325,11 @@ class Transport
case "playlist":
$plid = $gunid;
require_once("Playlist.php");
$pl = Playlist::recallByGunid($plid);
$pl = Playlist::RecallByGunid($plid);
if (PEAR::isError($pl)) {
return $pl;
}
$fname = $pl->getFileName();
$fname = $pl->getName();
if (PEAR::isError($fname)) {
return $fname;
}