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

Minor bug in archiveServer install fixed.

Browse source
This commit is contained in:
tomas 2005-03-09 03:17:15 +00:00
parent a4ed38989d
commit fa3c45edc1
2 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

23
livesupport/modules/storageServer/var/BasicStor.php
View file

@ -23,7 +23,7 @@
Author : $Author: tomas $ Author : $Author: tomas $
Version : $Revision: 1.43 $ Version : $Revision: 1.44 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/BasicStor.php,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/BasicStor.php,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -53,7 +53,7 @@ require_once "Transport.php";
* Core of LiveSupport file storage module * Core of LiveSupport file storage module
* *
* @author $Author: tomas $ * @author $Author: tomas $
* @version $Revision: 1.43 $ * @version $Revision: 1.44 $
* @see Alib * @see Alib
*/ */
class BasicStor extends Alib{ class BasicStor extends Alib{
@ -1309,7 +1309,8 @@ class BasicStor extends Alib{
// if($this->dbc->isError($p = parent::test())) return $p; // if($this->dbc->isError($p = parent::test())) return $p;
$this->deleteData(); $this->deleteData();
$this->testData(); $this->testData();
$this->test_correct = " StorageRoot if(!$this->config['isArchive']){
$this->test_correct = " StorageRoot
root root
test1 test1
file1.mp3 file1.mp3
@ -1327,6 +1328,22 @@ class BasicStor extends Alib{
test4 test4
public public
"; ";
}else{
$this->test_correct = " StorageRoot
root
test1
file1.mp3
test1_folder1
test1_folder1_1
test1_folder1_2
file2.wav
test1_folder2
test2
test2_folder1
test3
test4
";
}
$this->test_dump = $this->dumpTree($this->storId, ' ', ' ', '{name}'); $this->test_dump = $this->dumpTree($this->storId, ' ', ' ', '{name}');
if($this->test_dump==$this->test_correct) if($this->test_dump==$this->test_correct)
{ $this->test_log.="# BasicStor::test: OK\n"; return true; } { $this->test_log.="# BasicStor::test: OK\n"; return true; }

5
livesupport/modules/storageServer/var/install/install.php
View file

@ -23,7 +23,7 @@
Author : $Author: tomas $ Author : $Author: tomas $
Version : $Revision: 1.13 $ Version : $Revision: 1.14 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/install/install.php,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/install/install.php,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -85,7 +85,8 @@ $r = $gb->install();
if(PEAR::isError($r)){ echo $r->getUserInfo()."\n"; exit; } if(PEAR::isError($r)){ echo $r->getUserInfo()."\n"; exit; }
echo "# Testing ...\n"; echo "# Testing ...\n";
$gb->test(); $r = $gb->test();
if(PEAR::isError($r)){ echo $r->getUserInfo()."\n"; exit; }
$log = $gb->test_log; $log = $gb->test_log;
if($log) echo "# testlog:\n{$log}"; if($log) echo "# testlog:\n{$log}";