diff --git a/livesupport/modules/storageServer/Makefile b/livesupport/modules/storageServer/Makefile index dea69fcd2..487b837c6 100644 --- a/livesupport/modules/storageServer/Makefile +++ b/livesupport/modules/storageServer/Makefile @@ -20,7 +20,7 @@ # # # Author : $Author: tomas $ -# Version : $Revision: 1.9 $ +# Version : $Revision: 1.10 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/Attic/Makefile,v $ # # @configure_input@ @@ -93,7 +93,7 @@ TEST_RUNNER = ${PHP_DIR}/xmlrpc/testRunner.sh db_init db_clean testonly transtest all: dir_setup db_init -# $(MAKE) -C ../archiveServer all + $(MAKE) -C ../archiveServer all dir_setup: ${DOXYGEN_DIR} bin/setupDirs.sh ${STOR_DIR} ${ACCESS_DIR} ${TRANS_DIR} ${BUFF_DIR} @@ -110,7 +110,7 @@ docclean: ${RMDIR} ${DOXYGEN_DIR}/html depclean: clean -# $(MAKE) -C ../archiveServer clean + $(MAKE) -C ../archiveServer clean dist: ${TAR_C} ${MODULE_NAME}${DATE}${DIST_EXT} * @@ -129,7 +129,8 @@ recheck: clean check # Specific targets #------------------------------------------------------------------------------- transtest: - cd var/tests; php -q transTest.php + cdvar/tests/transTest.sh +# cd var/tests; php -q transTest.php db_init: cd var/install; php -q install.php diff --git a/livesupport/modules/storageServer/var/install/install.php b/livesupport/modules/storageServer/var/install/install.php index 9d4380701..eeb3b51e3 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.9 $ + Version : $Revision: 1.10 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/install/install.php,v $ ------------------------------------------------------------------------------*/ @@ -60,7 +60,7 @@ if(PEAR::isError($dbc)){ $dbc->setFetchMode(DB_FETCHMODE_ASSOC); $gb =& new GreenBox(&$dbc, $config); -$tr =& new Transport(&$dbc, $config); +$tr =& new Transport(&$dbc, &$gb, $config); $pr =& new Prefs(&$gb); echo "#StorageServer step 2:\n# trying uninstall ...\n"; diff --git a/livesupport/modules/storageServer/var/install/uninstall.php b/livesupport/modules/storageServer/var/install/uninstall.php index 5713df01f..40c3b701d 100644 --- a/livesupport/modules/storageServer/var/install/uninstall.php +++ b/livesupport/modules/storageServer/var/install/uninstall.php @@ -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/install/uninstall.php,v $ ------------------------------------------------------------------------------*/ @@ -57,7 +57,7 @@ if(PEAR::isError($dbc)){ echo "#StorageServer uninstall:\n"; $dbc->setFetchMode(DB_FETCHMODE_ASSOC); $gb = &new GreenBox(&$dbc, $config); -$tr =& new Transport(&$dbc, $config); +$tr =& new Transport(&$dbc, &$gb, $config); $pr =& new Prefs(&$gb); $dbc->setErrorHandling(PEAR_ERROR_RETURN); diff --git a/livesupport/modules/storageServer/var/xmlrpc/testRunner.sh b/livesupport/modules/storageServer/var/xmlrpc/testRunner.sh index 637b01a5c..09ebb5409 100755 --- a/livesupport/modules/storageServer/var/xmlrpc/testRunner.sh +++ b/livesupport/modules/storageServer/var/xmlrpc/testRunner.sh @@ -23,7 +23,7 @@ # # # Author : $Author: tomas $ -# Version : $Revision: 1.16 $ +# Version : $Revision: 1.17 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/xmlrpc/testRunner.sh,v $ #------------------------------------------------------------------------------- @@ -113,7 +113,7 @@ downloadRAD() { if [ $DEBUG_I ]; then echo $URL; fi if [ $DEBUG_I ]; then echo -n "Press enter ..."; read KEY; fi echo -n "# curl: " - curl -Ifs $URL > /dev/null || { ERN=$?; echo $RES; exit $ERN; } + curl -Ifs $URL > /dev/null || { ERN=$?; echo $URL; exit $ERN; } echo "status: $?" echo -n "# downloadRawAudioDataClose: " $XR_CLI downloadRawAudioDataClose $SESSID $TOKEN || exit $?