minor
This commit is contained in:
parent
bda8edd856
commit
744c9619fc
23 changed files with 111 additions and 103 deletions
|
@ -23,7 +23,7 @@
|
|||
|
||||
|
||||
Author : $Author: tomas $
|
||||
Version : $Revision: 1.12 $
|
||||
Version : $Revision: 1.13 $
|
||||
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/xmlrpc/XR_LocStor.php,v $
|
||||
|
||||
------------------------------------------------------------------------------*/
|
||||
|
@ -1317,7 +1317,7 @@ class XR_LocStor extends LocStor{
|
|||
list($ok, $r) = $this->_xr_getPars($input);
|
||||
if(!$ok) return $r;
|
||||
require_once '../../../storageServer/var/Prefs.php';
|
||||
$pr =& new Prefs(&$this);
|
||||
$pr =& new Prefs($this);
|
||||
$res = $pr->loadPref($r['sessid'], $r['key']);
|
||||
if(PEAR::isError($res)){
|
||||
$ec0 = intval($res->getCode());
|
||||
|
@ -1368,7 +1368,7 @@ class XR_LocStor extends LocStor{
|
|||
list($ok, $r) = $this->_xr_getPars($input);
|
||||
if(!$ok) return $r;
|
||||
require_once '../../../storageServer/var/Prefs.php';
|
||||
$pr =& new Prefs(&$this);
|
||||
$pr =& new Prefs($this);
|
||||
$res = $pr->savePref($r['sessid'], $r['key'], $r['value']);
|
||||
if(PEAR::isError($res)){
|
||||
$ec0 = intval($res->getCode());
|
||||
|
@ -1418,7 +1418,7 @@ class XR_LocStor extends LocStor{
|
|||
list($ok, $r) = $this->_xr_getPars($input);
|
||||
if(!$ok) return $r;
|
||||
require_once '../../../storageServer/var/Prefs.php';
|
||||
$pr =& new Prefs(&$this);
|
||||
$pr =& new Prefs($this);
|
||||
$res = $pr->delPref($r['sessid'], $r['key']);
|
||||
if(PEAR::isError($res)){
|
||||
$ec0 = intval($res->getCode());
|
||||
|
@ -1470,7 +1470,7 @@ class XR_LocStor extends LocStor{
|
|||
list($ok, $r) = $this->_xr_getPars($input);
|
||||
if(!$ok) return $r;
|
||||
require_once '../../../storageServer/var/Prefs.php';
|
||||
$pr =& new Prefs(&$this);
|
||||
$pr =& new Prefs($this);
|
||||
$res = $pr->loadGroupPref($r['sessid'], $r['group'], $r['key']);
|
||||
if(PEAR::isError($res)){
|
||||
$ec0 = intval($res->getCode());
|
||||
|
@ -1526,7 +1526,7 @@ class XR_LocStor extends LocStor{
|
|||
list($ok, $r) = $this->_xr_getPars($input);
|
||||
if(!$ok) return $r;
|
||||
require_once '../../../storageServer/var/Prefs.php';
|
||||
$pr =& new Prefs(&$this);
|
||||
$pr =& new Prefs($this);
|
||||
$res = $pr->saveGroupPref($r['sessid'], $r['group'], $r['key'], $r['value']);
|
||||
if(PEAR::isError($res)){
|
||||
$ec0 = intval($res->getCode());
|
||||
|
@ -1576,7 +1576,7 @@ class XR_LocStor extends LocStor{
|
|||
list($ok, $r) = $this->_xr_getPars($input);
|
||||
if(!$ok) return $r;
|
||||
require_once '../../../storageServer/var/Transport.php';
|
||||
$tr =& new Transport(&$this->dbc, &$this, $this->config);
|
||||
$tr =& new Transport($this->dbc, $this, $this->config);
|
||||
$res = $tr->uploadToArchive($r['gunid'], $r['sessid']);
|
||||
if(PEAR::isError($res)){
|
||||
$ec0 = intval($res->getCode());
|
||||
|
@ -1625,7 +1625,7 @@ class XR_LocStor extends LocStor{
|
|||
list($ok, $r) = $this->_xr_getPars($input);
|
||||
if(!$ok) return $r;
|
||||
require_once '../../../storageServer/var/Transport.php';
|
||||
$tr =& new Transport(&$this->dbc, &$this, $this->config);
|
||||
$tr =& new Transport($this->dbc, $this, $this->config);
|
||||
$res = $tr->downloadFromArchive($r['gunid'], $r['sessid']);
|
||||
if(PEAR::isError($res)){
|
||||
$ec0 = intval($res->getCode());
|
||||
|
@ -1682,7 +1682,7 @@ class XR_LocStor extends LocStor{
|
|||
list($ok, $r) = $this->_xr_getPars($input);
|
||||
if(!$ok) return $r;
|
||||
require_once '../../../storageServer/var/Transport.php';
|
||||
$tr =& new Transport(&$this->dbc, &$this, $this->config);
|
||||
$tr =& new Transport($this->dbc, $this, $this->config);
|
||||
$res = $tr->getTransportInfo($r['trtok'], $r['sessid']);
|
||||
if(PEAR::isError($res)){
|
||||
$ec0 = intval($res->getCode());
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
|
||||
Author : $Author: tomas $
|
||||
Version : $Revision: 1.5 $
|
||||
Version : $Revision: 1.6 $
|
||||
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/xmlrpc/put.php,v $
|
||||
|
||||
------------------------------------------------------------------------------*/
|
||||
|
@ -62,7 +62,7 @@ require_once '../LocStor.php';
|
|||
PEAR::setErrorHandling(PEAR_ERROR_RETURN);
|
||||
$dbc = DB::connect($config['dsn'], TRUE);
|
||||
$dbc->setFetchMode(DB_FETCHMODE_ASSOC);
|
||||
$gb = &new LocStor(&$dbc, $config);
|
||||
$gb = &new LocStor($dbc, $config);
|
||||
|
||||
function http_error($code, $err){
|
||||
header("HTTP/1.1 $code");
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
|
||||
Author : $Author: tomas $
|
||||
Version : $Revision: 1.7 $
|
||||
Version : $Revision: 1.8 $
|
||||
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/xmlrpc/simpleGet.php,v $
|
||||
|
||||
------------------------------------------------------------------------------*/
|
||||
|
@ -62,7 +62,7 @@ PEAR::setErrorHandling(PEAR_ERROR_RETURN);
|
|||
$dbc = DB::connect($config['dsn'], TRUE);
|
||||
$dbc->setFetchMode(DB_FETCHMODE_ASSOC);
|
||||
|
||||
$locStor = &new LocStor(&$dbc, $config);
|
||||
$locStor = &new LocStor($dbc, $config);
|
||||
|
||||
function http_error($code, $err){
|
||||
header("HTTP/1.1 $code");
|
||||
|
@ -95,7 +95,7 @@ if(PEAR::isError($ex_pl)){
|
|||
}else{ http_error(500, $ex_pl->getMessage()); }
|
||||
}
|
||||
if(!$ex_ac && !$ex_pl){ http_error(404, "404 File not found"); }
|
||||
$ac =& StoredFile::recallByGunid(&$locStor, $gunid);
|
||||
$ac =& StoredFile::recallByGunid($locStor, $gunid);
|
||||
if(PEAR::isError($ac)){ http_error(500, $ac->getMessage()); }
|
||||
if($ex_ac){
|
||||
$realFname = $ac->_getRealRADFname();
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#
|
||||
#
|
||||
# Author : $Author: tomas $
|
||||
# Version : $Revision: 1.19 $
|
||||
# Version : $Revision: 1.20 $
|
||||
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/xmlrpc/testRunner.sh,v $
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
|
@ -293,6 +293,7 @@ logout() {
|
|||
}
|
||||
|
||||
searchTest() {
|
||||
echo "#XMLRPC search test"
|
||||
login
|
||||
storeAudioClip
|
||||
GUNID=$RGUNID
|
||||
|
@ -310,6 +311,8 @@ searchTest() {
|
|||
fi
|
||||
deleteAudioClip
|
||||
logout
|
||||
echo "#XMLRPC: search: OK."
|
||||
echo ""
|
||||
}
|
||||
|
||||
preferenceTest(){
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
|
||||
Author : $Author: tomas $
|
||||
Version : $Revision: 1.20 $
|
||||
Version : $Revision: 1.21 $
|
||||
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/xmlrpc/xrLocStor.php,v $
|
||||
|
||||
------------------------------------------------------------------------------*/
|
||||
|
@ -73,7 +73,7 @@ PEAR::setErrorHandling(PEAR_ERROR_RETURN);
|
|||
$dbc = DB::connect($config['dsn'], TRUE);
|
||||
$dbc->setFetchMode(DB_FETCHMODE_ASSOC);
|
||||
|
||||
$locStor = &new XR_LocStor(&$dbc, $config);
|
||||
$locStor = &new XR_LocStor($dbc, $config);
|
||||
|
||||
$methods = array(
|
||||
'test' => 'Tests toupper and checks sessid, params: '.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue