Move Zebra for port 3313 to 8018 (which is visible on test through its firewall)

diff --git a/README b/README
index 2227d8f..de0b6f5 100644 (file)
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-$Id: README,v 1.3 2006-09-20 13:19:52 mike Exp $
+$Id: README,v 1.4 2007-01-24 09:28:02 mike Exp $
 
 Net-Z3950-IRSpy
 ===============
@@ -34,5 +34,5 @@ at your option, any later version of Perl 5 you may have available.
 --
 
 Note to self: everyone else please ignore this.
-$ cd /usr/local/src/cvs/irspy && YAZ_LOG=irspy,irspy_test,irspy_debug,pod perl -I lib bin/irspy.pl -t "bagel.indexdata.dk/gils foo.bar.baz:12345/fish z3950.loc.gov:7090/Voyager" localhost:3313/IR-Explain---1
+$ cd /usr/local/src/cvs/irspy && YAZ_LOG=irspy,irspy_test,irspy_debug,pod perl -I lib bin/irspy.pl -t "bagel.indexdata.dk/gils foo.bar.baz:12345/fish z3950.loc.gov:7090/Voyager" localhost:8018/IR-Explain---1
 

diff --git a/bin/.gdbinit b/bin/.gdbinit
index 71edf37..58b08cf 100644 (file)
--- a/bin/.gdbinit
+++ b/bin/.gdbinit
@@ -1,3 +1,3 @@
-# $Id: .gdbinit,v 1.2 2006-11-29 11:05:40 mike Exp $
+# $Id: .gdbinit,v 1.3 2007-01-24 09:28:02 mike Exp $
 set env YAZ_LOG=irspy,irspy_test,irspy_task
-set args -I ../lib irspy.pl -t Quick localhost:3313/IR-Explain---1 bagel.indexdata.dk/gils
+set args -I ../lib irspy.pl -t Quick localhost:8018/IR-Explain---1 bagel.indexdata.dk/gils

diff --git a/bin/irspy-stats.pl b/bin/irspy-stats.pl
index fd72ebd..a9b9ade 100755 (executable)
--- a/bin/irspy-stats.pl
+++ b/bin/irspy-stats.pl
@@ -1,8 +1,8 @@
 #!/usr/bin/perl -w
 
-# $Id: irspy-stats.pl,v 1.3 2006-12-18 15:31:39 mike Exp $
+# $Id: irspy-stats.pl,v 1.4 2007-01-24 09:28:02 mike Exp $
 #
-#      perl -I ../lib irspy-stats.pl localhost:3313/IR-Explain---1 "net.host=*indexdata*"
+#      perl -I ../lib irspy-stats.pl localhost:8018/IR-Explain---1 "net.host=*indexdata*"
 
 use strict;
 use warnings;

diff --git a/bin/irspy.pl b/bin/irspy.pl
index 08284b5..02f5c25 100755 (executable)
--- a/bin/irspy.pl
+++ b/bin/irspy.pl
@@ -1,9 +1,9 @@
 #!/usr/bin/perl -w
 
-# $Id: irspy.pl,v 1.17 2006-11-28 12:01:54 mike Exp $
+# $Id: irspy.pl,v 1.18 2007-01-24 09:28:02 mike Exp $
 #
 # Run like this:
-#      YAZ_LOG=irspy,irspy_test perl -I ../lib irspy.pl -t Quick localhost:3313/IR-Explain---1 bagel.indexdata.dk/gils z3950.loc.gov:7090/Voyager bagel.indexdata.dk:210/marc
+#      YAZ_LOG=irspy,irspy_test perl -I ../lib irspy.pl -t Quick localhost:8018/IR-Explain---1 bagel.indexdata.dk/gils z3950.loc.gov:7090/Voyager bagel.indexdata.dk:210/marc
 # Available log-levels are as follows:
 #      irspy -- high-level application logging
 #      irspy_debug -- low-level debugging (not very interesting)

diff --git a/bin/test-xml-update.pl b/bin/test-xml-update.pl
index 69f4d30..321142d 100755 (executable)
--- a/bin/test-xml-update.pl
+++ b/bin/test-xml-update.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 
-# $Id: test-xml-update.pl,v 1.7 2006-11-29 17:22:32 mike Exp $
+# $Id: test-xml-update.pl,v 1.8 2007-01-24 09:28:02 mike Exp $
 #
 # Run like this:
 #      perl -I ../lib ./test-xml-update.pl bagel.indexdata.dk:210/gils title "Test Database" author "Adam" description "This is a nice database"
@@ -55,7 +55,7 @@ if (!getopts('wnxd', \%opts) || @ARGV % 2 == 0) {
 }
 my($id, %data) = @ARGV;
 
-my $conn = new ZOOM::Connection("localhost:3313/IR-Explain---1", 0,
+my $conn = new ZOOM::Connection("localhost:8018/IR-Explain---1", 0,
                                user => "admin", password => "fruitbat");
 $conn->option(elementSetName => "zeerex");
 my $qid = $id;

diff --git a/bin/xslt_process.pl b/bin/xslt_process.pl
index 55aa826..557ee91 100755 (executable)
--- a/bin/xslt_process.pl
+++ b/bin/xslt_process.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 
-# $Id: xslt_process.pl,v 1.1 2006-12-12 10:45:04 sondberg Exp $
+# $Id: xslt_process.pl,v 1.2 2007-01-24 09:28:02 mike Exp $
 
 use strict;
 use warnings;
@@ -11,7 +11,7 @@ use XML::LibXSLT;
 
 XML::LibXSLT->debug_callback(\&xslt_debug);
 
-my $dbname = 'localhost:3313/IR-Explain---1';
+my $dbname = 'localhost:8018/IR-Explain---1';
 my $spy = new ZOOM::IRSpy($dbname, "admin", "fruitbat");
 my $source_file = shift || die("$0: Please specify xml instance file");
 my $source_doc = $spy->libxml->parse_file($source_file);

diff --git a/lib/ZOOM/IRSpy/Stats.pm b/lib/ZOOM/IRSpy/Stats.pm
index c7780f4..0058e75 100644 (file)
--- a/lib/ZOOM/IRSpy/Stats.pm
+++ b/lib/ZOOM/IRSpy/Stats.pm
@@ -1,4 +1,4 @@
-# $Id: Stats.pm,v 1.5 2006-12-18 15:34:27 mike Exp $
+# $Id: Stats.pm,v 1.6 2007-01-24 09:28:02 mike Exp $
 
 package ZOOM::IRSpy::Stats;
 
@@ -49,7 +49,7 @@ Either one or two arguments are required:
 
 An indication of the IRSpy database that statistics are required for.
 This may be in the form of a C<ZOOM::Connection> object or a
-database-name string such as C<localhost:3313/IR-Explain---1>.
+database-name string such as C<localhost:8018/IR-Explain---1>.
 
 =item $query (optional)
 

diff --git a/lib/ZOOM/IRSpy/WebService.pod b/lib/ZOOM/IRSpy/WebService.pod
index b325f5a..a30bfa6 100644 (file)
--- a/lib/ZOOM/IRSpy/WebService.pod
+++ b/lib/ZOOM/IRSpy/WebService.pod
@@ -1,4 +1,4 @@
-# $Id: WebService.pod,v 1.4 2006-11-02 15:01:10 mike Exp $
+# $Id: WebService.pod,v 1.5 2007-01-24 09:28:02 mike Exp $
 
 package ZOOM::IRSpy::WebService;
 
@@ -24,7 +24,7 @@ Here is a example SRU URL that accesses the IRSpy database of the live
 system (although it will not be accessible to most clients due to
 firewall issues.  It is broken across lines for clarity:
 
-       http://irspy.indexdata.com:3313/IR-Explain---1?
+       http://irspy.indexdata.com:8018/IR-Explain---1?
                version=1.1&
                operation=searchRetrieve&
                query=net.port=3950&
@@ -33,7 +33,7 @@ firewall issues.  It is broken across lines for clarity:
 
 =cut
 
-# http://irspy.indexdata.com:3313/IR-Explain---1?version=1.1&operation=searchRetrieve&query=net.port=3950&maximumRecords=10&recordSchema=zeerex
+# http://irspy.indexdata.com:8018/IR-Explain---1?version=1.1&operation=searchRetrieve&query=net.port=3950&maximumRecords=10&recordSchema=zeerex
 
 =pod
 
@@ -42,7 +42,7 @@ tutorial, but briefly, the URL above consists of the following parts:
 
 =over 4
 
-=item http://irspy.indexdata.com:3313
+=item http://irspy.indexdata.com:8018
 
 The base-URL of the SRU server.
 
@@ -120,7 +120,7 @@ also by C<maximumTerms> and C<responsePosition>.
 
 Here is an example SRU Scan URL:
 
-       http://irspy.indexdata.com:3313/IR-Explain---1?
+       http://irspy.indexdata.com:8018/IR-Explain---1?
                version=1.1&
                operation=scan&
                scanClause=dc.title=fish

diff --git a/web/htdocs/details/check.mc b/web/htdocs/details/check.mc
index 7b434be..b4c7dc3 100644 (file)
--- a/web/htdocs/details/check.mc
+++ b/web/htdocs/details/check.mc
@@ -1,4 +1,4 @@
-%# $Id: check.mc,v 1.14 2006-11-30 10:53:27 mike Exp $
+%# $Id: check.mc,v 1.15 2007-01-24 09:28:02 mike Exp $
 <%args>
 @id
 $test => "Quick"
@@ -31,7 +31,7 @@ $m->flush_buffer();
 # on in the HTTP configuration, so we don't even try -- instead,
 # having ZOOM::IRSpy::Web::log() explicitly calling $m->flush_buffer()
 
-my $spy = new ZOOM::IRSpy::Web("localhost:3313/IR-Explain---1",
+my $spy = new ZOOM::IRSpy::Web("localhost:8018/IR-Explain---1",
                               admin => "fruitbat");
 $spy->log_init_level("irspy,irspy_test");
 $spy->targets(@id) if !$allTargets;

diff --git a/web/htdocs/details/delete.mc b/web/htdocs/details/delete.mc
index 930a27a..a3b6007 100644 (file)
--- a/web/htdocs/details/delete.mc
+++ b/web/htdocs/details/delete.mc
@@ -1,4 +1,4 @@
-%# $Id: delete.mc,v 1.3 2007-01-03 10:41:07 mike Exp $
+%# $Id: delete.mc,v 1.4 2007-01-24 09:28:02 mike Exp $
 <%args>
 $id
 $really => 0
@@ -15,7 +15,7 @@ $really => 0
      </p>
 % } else {
 <%perl>
-    my $conn = new ZOOM::Connection("localhost:3313/IR-Explain---1", 0,
+    my $conn = new ZOOM::Connection("localhost:8018/IR-Explain---1", 0,
                                    user => "admin", password => "fruitbat",
                                    elementSetName => "zeerex");
     # I am thinking that ZOOM should provide delete(), update(), etc.

diff --git a/web/htdocs/details/edit.mc b/web/htdocs/details/edit.mc
index ab9d64e..8bab7b2 100644 (file)
--- a/web/htdocs/details/edit.mc
+++ b/web/htdocs/details/edit.mc
@@ -1,4 +1,4 @@
-%# $Id: edit.mc,v 1.25 2006-12-06 10:47:27 mike Exp $
+%# $Id: edit.mc,v 1.26 2007-01-24 09:28:02 mike Exp $
 <%args>
 $op
 $id => undef
@@ -32,7 +32,7 @@ duplicate ID.
 die "op = new but id defined" if $op eq "new" && defined $id;
 die "op != new but id undefined" if $op ne "new" && !defined $id;
 
-my $conn = new ZOOM::Connection("localhost:3313/IR-Explain---1", 0,
+my $conn = new ZOOM::Connection("localhost:8018/IR-Explain---1", 0,
                                user => "admin", password => "fruitbat",
                                elementSetName => "zeerex");
 my $rec = '<explain xmlns="http://explain.z3950.org/dtd/2.0/"/>';

diff --git a/web/htdocs/details/found.mc b/web/htdocs/details/found.mc
index da9cc2b..3247f23 100644 (file)
--- a/web/htdocs/details/found.mc
+++ b/web/htdocs/details/found.mc
@@ -1,4 +1,4 @@
-%# $Id: found.mc,v 1.24 2006-12-15 18:07:40 mike Exp $
+%# $Id: found.mc,v 1.25 2007-01-24 09:28:02 mike Exp $
 <%once>
 sub print_navlink {
     my($params, $cond, $caption, $skip) = @_;
@@ -69,7 +69,7 @@ if ($sort) {
 my $tried_to_open = 0;
 if (!defined $conn) {
   OPEN:
-    $conn = new ZOOM::Connection("localhost:3313/IR-Explain---1");
+    $conn = new ZOOM::Connection("localhost:8018/IR-Explain---1");
     $conn->option(elementSetName => "zeerex");
 }
 

diff --git a/web/htdocs/details/full.mc b/web/htdocs/details/full.mc
index 6df895b..8cb4863 100644 (file)
--- a/web/htdocs/details/full.mc
+++ b/web/htdocs/details/full.mc
@@ -1,9 +1,9 @@
-%# $Id: full.mc,v 1.20 2006-12-18 15:37:06 mike Exp $
+%# $Id: full.mc,v 1.21 2007-01-24 09:28:02 mike Exp $
 <%args>
 $id
 </%args>
 <%perl>
-my $conn = new ZOOM::Connection("localhost:3313/IR-Explain---1");
+my $conn = new ZOOM::Connection("localhost:8018/IR-Explain---1");
 $conn->option(elementSetName => "zeerex");
 my $qid = $id;
 $qid =~ s/"/\\"/g;

diff --git a/web/htdocs/details/stats.mc b/web/htdocs/details/stats.mc
index a1871cf..fa9b652 100644 (file)
--- a/web/htdocs/details/stats.mc
+++ b/web/htdocs/details/stats.mc
@@ -1,4 +1,4 @@
-%# $Id: stats.mc,v 1.5 2006-12-18 15:38:09 mike Exp $
+%# $Id: stats.mc,v 1.6 2007-01-24 09:28:02 mike Exp $
 <%doc>
 Here are the headings in the Z-Spy version:
        The ten most commonly supported Bib-1 Use attributes
@@ -27,7 +27,7 @@ my $from_cache = 1;
 my $stats = $m->cache->get($key);
 if (!defined $stats || $reload) {
     $from_cache = 0;
-    $stats = new ZOOM::IRSpy::Stats("localhost:3313/IR-Explain---1", $query);
+    $stats = new ZOOM::IRSpy::Stats("localhost:8018/IR-Explain---1", $query);
     $m->cache->set($key, $stats, "10 minutes");
 }
 </%perl>

diff --git a/web/htdocs/raw.html b/web/htdocs/raw.html
index cd797c7..47bac0b 100644 (file)
--- a/web/htdocs/raw.html
+++ b/web/htdocs/raw.html
@@ -1,4 +1,4 @@
-%# $Id: raw.html,v 1.6 2006-11-29 12:31:25 mike Exp $
+%# $Id: raw.html,v 1.7 2007-01-24 09:28:02 mike Exp $
 <%args>
 $id
 </%args>
@@ -6,7 +6,7 @@ $id
 use ZOOM;
 </%once>
 <%perl>
-my $conn = new ZOOM::Connection("localhost:3313/IR-Explain---1");
+my $conn = new ZOOM::Connection("localhost:8018/IR-Explain---1");
 $conn->option(elementSetName => "zeerex");
 my $qid = $id;
 $qid =~ s/"/\\"/g;

diff --git a/zebra/README b/zebra/README
index 0b2713c..1ec0d41 100644 (file)
--- a/zebra/README
+++ b/zebra/README
@@ -1,4 +1,4 @@
-$Id: README,v 1.16 2006-12-13 12:02:52 mike Exp $
+$Id: README,v 1.17 2007-01-24 09:28:03 mike Exp $
 
 What's what in this directory:
 
@@ -79,7 +79,7 @@ db -- A subdirectory containing the actual database: register files,
        dictionaries and suchlike.
 
 form.html -- A simple HTML search form that submits SRU queries to a
-       server running on local port 3313.
+       server running on local port 8018.
 
 init-script -- A startup/shutdown script for controlling the zebra
        server according to "System V init" rules.  Instructions can
@@ -104,5 +104,5 @@ To run all these commands, use:
 sed -n '/^zebraidx/,+3p' README | while read line; do eval $line; done
 
 Then interrogate the database with SRU URLs such as:
-       http://localhost:3313/IR-Explain---1?version=1.1&operation=searchRetrieve&maximumRecords=10&recordSchema=zeerex&query=net.protocol=sru
+       http://localhost:8018/IR-Explain---1?version=1.1&operation=searchRetrieve&maximumRecords=10&recordSchema=zeerex&query=net.protocol=sru
 

diff --git a/zebra/crontab b/zebra/crontab
index dcb8b8f..8e9a6c6 100644 (file)
--- a/zebra/crontab
+++ b/zebra/crontab
@@ -1,3 +1,3 @@
-# $Id: crontab,v 1.1 2006-12-08 15:58:17 mike Exp $
+# $Id: crontab,v 1.2 2007-01-24 09:28:03 mike Exp $
 # m h  dom mon dow   command
-0 3 * * * cd /usr/local/src/cvs/irspy/bin && YAZ_LOG=irspy,irspy_test perl -I ../lib irspy.pl -t Full localhost:3313/IR-Explain---1 indexdata.com:210/marc indexdata.com:210/gils
+0 3 * * * cd /usr/local/src/cvs/irspy/bin && YAZ_LOG=irspy,irspy_test perl -I ../lib irspy.pl -t Full localhost:8018/IR-Explain---1 indexdata.com:210/marc indexdata.com:210/gils

diff --git a/zebra/form.html b/zebra/form.html
index d16019a..d782e40 100644 (file)
--- a/zebra/form.html
+++ b/zebra/form.html
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- $Id: form.html,v 1.2 2006-09-20 13:19:54 mike Exp $ -->
+<!-- $Id: form.html,v 1.3 2007-01-24 09:28:03 mike Exp $ -->
 <!DOCTYPE html 
        PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -9,7 +9,7 @@
  </head>
  <body>
   <h1>SRU form for the IRSpy database</h1>
-  <form method="get" action="http://localhost:3313/IR-Explain---1">
+  <form method="get" action="http://localhost:8018/IR-Explain---1">
    <table>
     <tr>
      <td align="right">

diff --git a/zebra/yazserver.xml b/zebra/yazserver.xml
index 991bbe5..9f4cb1c 100644 (file)
--- a/zebra/yazserver.xml
+++ b/zebra/yazserver.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: yazserver.xml,v 1.3 2006-09-20 13:19:54 mike Exp $ -->
+<!-- $Id: yazserver.xml,v 1.4 2007-01-24 09:28:03 mike Exp $ -->
 <yazgfs>
- <listen id="tcp3313">tcp:@:3313</listen>
- <server id="alvis" listenref="tcp3313">
+ <listen id="tcp8018">tcp:@:8018</listen>
+ <server id="alvis" listenref="tcp8018">
   <directory>./</directory>
   <config>zebra.cfg</config>
   <cql2rpn>pqf.properties</cql2rpn>
@@ -11,7 +11,7 @@
     <explain xmlns="http://explain.z3950.org/dtd/2.0/">
      <serverInfo>
       <host>localhost</host>
-      <port>3313</port>
+      <port>8018</port>
       <database>IR-Explain---1</database>
      </serverInfo>
     </explain>

diff --git a/zebra/zeerex.xml b/zebra/zeerex.xml
index e117a9b..abd8de0 100644 (file)
--- a/zebra/zeerex.xml
+++ b/zebra/zeerex.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: zeerex.xml,v 1.14 2006-10-27 00:44:36 mike Exp $ -->
+<!-- $Id: zeerex.xml,v 1.15 2007-01-24 09:28:03 mike Exp $ -->
 <explain xmlns="http://explain.z3950.org/dtd/2.0/">
 
  <serverInfo protocol="SRW/SRU/Z39.50" version="1.1" method="GET/POST">
   <host>localhost</host>
-  <port>3313</port>
+  <port>8018</port>
   <database>IR-Explain---1</database>
  </serverInfo>