From fa3c45edc1f3035032af5ec2842bf1e9b34db06e Mon Sep 17 00:00:00 2001
From: tomas <tomas@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Wed, 9 Mar 2005 03:17:15 +0000
Subject: [PATCH] Minor bug in archiveServer install fixed.

---
 .../modules/storageServer/var/BasicStor.php   | 23 ++++++++++++++++---
 .../storageServer/var/install/install.php     |  5 ++--
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/livesupport/modules/storageServer/var/BasicStor.php b/livesupport/modules/storageServer/var/BasicStor.php
index 6fdf2aced..74117f462 100644
--- a/livesupport/modules/storageServer/var/BasicStor.php
+++ b/livesupport/modules/storageServer/var/BasicStor.php
@@ -23,7 +23,7 @@
  
  
     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 $
 
 ------------------------------------------------------------------------------*/
@@ -53,7 +53,7 @@ require_once "Transport.php";
  *  Core of LiveSupport file storage module
  *
  *  @author  $Author: tomas $
- *  @version $Revision: 1.43 $
+ *  @version $Revision: 1.44 $
  *  @see Alib
  */
 class BasicStor extends Alib{
@@ -1309,7 +1309,8 @@ class BasicStor extends Alib{
 //        if($this->dbc->isError($p = parent::test())) return $p;
         $this->deleteData();
         $this->testData();
-        $this->test_correct = "    StorageRoot
+        if(!$this->config['isArchive']){
+            $this->test_correct = "    StorageRoot
         root
         test1
             file1.mp3
@@ -1327,6 +1328,22 @@ class BasicStor extends Alib{
         test4
             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}');
         if($this->test_dump==$this->test_correct)
             { $this->test_log.="# BasicStor::test: OK\n"; return true; }
diff --git a/livesupport/modules/storageServer/var/install/install.php b/livesupport/modules/storageServer/var/install/install.php
index dff91eca5..1396c4eaf 100644
--- a/livesupport/modules/storageServer/var/install/install.php
+++ b/livesupport/modules/storageServer/var/install/install.php
@@ -23,7 +23,7 @@
  
  
     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 $
 
 ------------------------------------------------------------------------------*/
@@ -85,7 +85,8 @@ $r = $gb->install();
 if(PEAR::isError($r)){ echo $r->getUserInfo()."\n"; exit; }
 
 echo "# Testing ...\n";
-$gb->test();
+$r = $gb->test();
+if(PEAR::isError($r)){ echo $r->getUserInfo()."\n"; exit; }
 $log = $gb->test_log;
 if($log) echo "# testlog:\n{$log}";