Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changing various function names to be more obvious and consistent. Get rid of unneeded data copying ( = = someFunction()).

This commit is contained in:
paul 2006-11-23 07:07:08 +00:00
parent b4cecf725d
commit 714e853fae
1 changed files with 22 additions and 25 deletions
campcaster/src/modules/storageServer/var
LocStor.php

47
campcaster/src/modules/storageServer/var/LocStor.php
View File

@ -121,10 +121,10 @@ class LocStor extends BasicStor {
if (PEAR::isError($ac)) { if (PEAR::isError($ac)) {
return $ac; return $ac;
} }
$arr = $r = $this->bsClosePut($token); $arr = $this->bsClosePut($token);
if (PEAR::isError($r)) { if (PEAR::isError($arr)) {
$ac->delete(); $ac->delete();
return $r; return $arr;
} }
$fname = $arr['fname']; $fname = $arr['fname'];
//$owner = $arr['owner']; //$owner = $arr['owner'];
@ -427,12 +427,9 @@ class LocStor extends BasicStor {
*/ */
function localSearch($criteria, $sessid='') function localSearch($criteria, $sessid='')
{ {
$limit = intval(isset($criteria['limit']) ? $criteria['limit'] : 0); $limit = intval(isset($criteria['limit']) ? $criteria['limit'] : 0);
$offset = intval(isset($criteria['offset']) ? $criteria['offset'] : 0); $offset = intval(isset($criteria['offset']) ? $criteria['offset'] : 0);
$res = $r = $this->bsLocalSearch($criteria, $limit, $offset); $res = $this->bsLocalSearch($criteria, $limit, $offset);
if (PEAR::isError($r)) {
return $r;
}
return $res; return $res;
} }
@ -454,7 +451,7 @@ class LocStor extends BasicStor {
*/ */
function browseCategory($category, $criteria=NULL, $sessid='') function browseCategory($category, $criteria=NULL, $sessid='')
{ {
$limit = intval(isset($criteria['limit']) ? $criteria['limit'] : 0); $limit = intval(isset($criteria['limit']) ? $criteria['limit'] : 0);
$offset = intval(isset($criteria['offset']) ? $criteria['offset'] : 0); $offset = intval(isset($criteria['offset']) ? $criteria['offset'] : 0);
$res = $this->bsBrowseCategory($category, $limit, $offset, $criteria); $res = $this->bsBrowseCategory($category, $limit, $offset, $criteria);
return $res; return $res;
@ -730,7 +727,7 @@ class LocStor extends BasicStor {
return $ac; return $ac;
} }
$id = $ac->getId(); $id = $ac->getId();
$mdata = $ac->getMetaData(); $mdata = $ac->getMetadata();
if (PEAR::isError($mdata)) { if (PEAR::isError($mdata)) {
return $mdata; return $mdata;
} }
@ -878,9 +875,9 @@ class LocStor extends BasicStor {
*/ */
function exportPlaylistOpen($sessid, $plids, $type='lspl', $standalone=FALSE) function exportPlaylistOpen($sessid, $plids, $type='lspl', $standalone=FALSE)
{ {
$res = $r =$this->bsExportPlaylistOpen($plids, $type, !$standalone); $res = $this->bsExportPlaylistOpen($plids, $type, !$standalone);
if ($this->dbc->isError($r)) { if ($this->dbc->isError($res)) {
return $r; return $res;
} }
$url = $this->getUrlPart()."access/".basename($res['fname']); $url = $this->getUrlPart()."access/".basename($res['fname']);
$chsum = md5_file($res['fname']); $chsum = md5_file($res['fname']);
@ -919,9 +916,9 @@ class LocStor extends BasicStor {
*/ */
function importPlaylistOpen($sessid, $chsum) function importPlaylistOpen($sessid, $chsum)
{ {
$userid = $r =$this->getSessUserId($sessid); $userid = $this->getSessUserId($sessid);
if ($this->dbc->isError($r)) { if ($this->dbc->isError($userid)) {
return $r; return $userid;
} }
$r = $this->bsOpenPut($chsum, NULL, $userid); $r = $this->bsOpenPut($chsum, NULL, $userid);
if (PEAR::isError($r)) { if (PEAR::isError($r)) {
@ -941,25 +938,25 @@ class LocStor extends BasicStor {
*/ */
function importPlaylistClose($token) function importPlaylistClose($token)
{ {
$arr = $r = $this->bsClosePut($token); $arr = $this->bsClosePut($token);
if (PEAR::isError($r)) { if (PEAR::isError($arr)) {
return $r; return $arr;
} }
$fname = $arr['fname']; $fname = $arr['fname'];
$owner = $arr['owner']; $owner = $arr['owner'];
$parid = $r= $this->_getHomeDirId($owner); $parid = $this->_getHomeDirId($owner);
if (PEAR::isError($r)) { if (PEAR::isError($parid)) {
if (file_exists($fname)) { if (file_exists($fname)) {
@unlink($fname); @unlink($fname);
} }
return $r; return $parid;
} }
$res = $r = $this->bsImportPlaylist($parid, $fname); $res = $this->bsImportPlaylist($parid, $fname);
if (file_exists($fname)) { if (file_exists($fname)) {
@unlink($fname); @unlink($fname);
} }
if (PEAR::isError($r)) { if (PEAR::isError($res)) {
return $r; return $res;
} }
return $this->gunidFromId($res); return $this->gunidFromId($res);
} }