From: Wolfram Schneider <wosch@indexdata.dk>
Date: Thu, 15 Apr 2010 12:26:22 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/irspy
X-Git-Tag: CPAN-v1.02~129^2~9
X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=commitdiff_plain;h=6f2183a513dde47602e2ad39c5002d92619b2a30;hp=d933bd032df9e515f3de0401d1111d9f2cf3a4cc

Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/irspy
---

diff --git a/web/conf/apache2.0/irspy-test.conf b/web/conf/apache2.0/irspy-test.conf
index 8bdd0df..bc53345 100644
--- a/web/conf/apache2.0/irspy-test.conf
+++ b/web/conf/apache2.0/irspy-test.conf
@@ -26,7 +26,7 @@
     PerlAddVar MasonCompRoot "private => /usr/local/src/git/irspy-test/web/htdocs"
     PerlSetVar MasonDataDir              /usr/local/src/git/irspy-test/web/data
     PerlSetVar IRSpyLibDir               /usr/local/src/git/irspy-test/lib
-    PerlSetEnv IRSpyDbName 	localhost:8019/IR-Explain---2
+    PerlSetEnv IRSpyDbName 	localhost:8019/IR-Explain---1
 
     PerlSetEnv PERL5LIB /usr/local/src/git/irspy/lib
 
diff --git a/zebra/Makefile b/zebra/Makefile
index d34a46b..0d94a1f 100644
--- a/zebra/Makefile
+++ b/zebra/Makefile
@@ -36,7 +36,7 @@ newdb-test:
 	${ZEBRAIDX_TEST} update ${IRSPY_ARCHIVE}
 	${ZEBRAIDX_TEST} commit
 
-# note: the test database use localhost:8019/IR-Explain---2
+# note: the test database use localhost:8019/IR-Explain---1
 dump:
 	rm -rf records-${DATE}.old
 	-test -e records-${DATE} && mv records-${DATE} records-${DATE}.old
diff --git a/zebra/init-script-test b/zebra/init-script-test
index dedf4af..68e4f66 100755
--- a/zebra/init-script-test
+++ b/zebra/init-script-test
@@ -18,7 +18,7 @@ logfile=/var/log/irspy-test-zebra.log
 pidfile=/var/run/irspy-test-zebra.pid
 
 case "`hostname`" in
-    nigiri | xeno | rafa | test) IRSPYDIR=/usr/local/src/git/irspy-test/;;
+    nigiri | donut | xeno | rafa | test) IRSPYDIR=/usr/local/src/git/irspy-test/;;
     shawarma|kafta) IRSPYDIR=/home/mike/cvs/irspy/;;
     your-development-machine ) 
 	IRSPYDIR=/home/foobar/indexdata/irspy/
diff --git a/zebra/yazserver-test.xml b/zebra/yazserver-test.xml
index a642390..92b64cf 100644
--- a/zebra/yazserver-test.xml
+++ b/zebra/yazserver-test.xml
@@ -12,7 +12,7 @@
      <serverInfo>
       <host>localhost</host>
       <port>8019</port>
-      <database>IR-Explain---2</database>
+      <database>IR-Explain---1</database>
      </serverInfo>
     </explain>
    </xi:fallback>
diff --git a/zebra/zebra-test.cfg b/zebra/zebra-test.cfg
index 6169c28..864f6d5 100644
--- a/zebra/zebra-test.cfg
+++ b/zebra/zebra-test.cfg
@@ -16,7 +16,7 @@ storeKeys: 1
 # Use the "alvis" filter with config file "filterconf.xml"
 recordtype: alvis.filterconf.xml
 
-database: IR-Explain---2
+database: IR-Explain---1
 #database: Default
 
 # where to put registers, and other var content, and how large they may be
diff --git a/zebra/zeerex-test.xml b/zebra/zeerex-test.xml
index 95a25c1..aba40eb 100644
--- a/zebra/zeerex-test.xml
+++ b/zebra/zeerex-test.xml
@@ -5,7 +5,7 @@
  <serverInfo protocol="SRW/SRU/Z39.50" version="1.1" method="GET/POST">
   <host>localhost</host>
   <port>8019</port>
-  <database>IR-Explain---2</database>
+  <database>IR-Explain---1</database>
  </serverInfo>
 
  <databaseInfo>