Use port 3313 instead of 1313, which is in widish use for other Zebra projects

diff --git a/README b/README
index 76e425b..2227d8f 100644 (file)
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-$Id: README,v 1.2 2006-07-21 11:24:20 mike Exp $
+$Id: README,v 1.3 2006-09-20 13:19:52 mike Exp $

 
 Net-Z3950-IRSpy
 ===============
 
 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.
 --
 
 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:1313/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:3313/IR-Explain---1

 
 

diff --git a/bin/irspy.pl b/bin/irspy.pl
index e6c2cc3..76dc72f 100755 (executable)
--- a/bin/irspy.pl
+++ b/bin/irspy.pl
@@ -1,9 +1,9 @@
 #!/usr/bin/perl -w
 
 #!/usr/bin/perl -w
 

-# $Id: irspy.pl,v 1.2 2006-07-19 11:52:24 mike Exp $
+# $Id: irspy.pl,v 1.3 2006-09-20 13:19:53 mike Exp $

 #
 # Run like this:
 #
 # Run like this:

-#      YAZ_LOG=irspy,irspy_test,irspy_debug perl -I ../lib irspy.pl -t "bagel.indexdata.dk/gils z3950.loc.gov:7090/Voyager" localhost:1313/IR-Explain---1
+#      YAZ_LOG=irspy,irspy_test,irspy_debug perl -I ../lib irspy.pl -t "bagel.indexdata.dk/gils z3950.loc.gov:7090/Voyager" localhost:3313/IR-Explain---1

 
 use strict;
 use warnings;
 
 use strict;
 use warnings;

diff --git a/web/htdocs/details/all.mc b/web/htdocs/details/all.mc
index 3a42f7c..83064f5 100644 (file)
--- a/web/htdocs/details/all.mc
+++ b/web/htdocs/details/all.mc
@@ -1,7 +1,7 @@
-%# $Id: all.mc,v 1.2 2006-09-19 16:30:07 mike Exp $
+%# $Id: all.mc,v 1.3 2006-09-20 13:19:53 mike Exp $

 <%perl>
 print "IRSpy version $ZOOM::IRSpy::VERSION<br/>\n";
 <%perl>
 print "IRSpy version $ZOOM::IRSpy::VERSION<br/>\n";

-my $spy = new ZOOM::IRSpy("localhost:1313/IR-Explain---1");
+my $spy = new ZOOM::IRSpy("localhost:3313/IR-Explain---1");

 if (1) {
     # Testing all targets would take much too long for testing
     my @targets = qw(bagel.indexdata.dk/gils z3950.loc.gov:7090/Voyager);
 if (1) {
     # Testing all targets would take much too long for testing
     my @targets = qw(bagel.indexdata.dk/gils z3950.loc.gov:7090/Voyager);

diff --git a/web/htdocs/details/check.mc b/web/htdocs/details/check.mc
index 4b9d86b..809354b 100644 (file)
--- a/web/htdocs/details/check.mc
+++ b/web/htdocs/details/check.mc
@@ -1,11 +1,11 @@
-%# $Id: check.mc,v 1.1 2006-09-18 19:27:21 mike Exp $
+%# $Id: check.mc,v 1.2 2006-09-20 13:19:53 mike Exp $

 <%perl>
 my $id = $r->param("id");
 if (!$id) {
     print "No 'id' specified!\n";
 } else {
     print "<h2>'$id'</h2>\n";
 <%perl>
 my $id = $r->param("id");
 if (!$id) {
     print "No 'id' specified!\n";
 } else {
     print "<h2>'$id'</h2>\n";

-    my $spy = new ZOOM::IRSpy("localhost:1313/IR-Explain---1");
+    my $spy = new ZOOM::IRSpy("localhost:3313/IR-Explain---1");

     ZOOM::Log::mask_str("irspy,irspy_test"); # Do we need this?
     ZOOM::Log::init_level(ZOOM::Log::module_level("irspy,irspy_test"));
     ZOOM::Log::time_format("%F %T"); # ISO-8601 format
     ZOOM::Log::mask_str("irspy,irspy_test"); # Do we need this?
     ZOOM::Log::init_level(ZOOM::Log::module_level("irspy,irspy_test"));
     ZOOM::Log::time_format("%F %T"); # ISO-8601 format

diff --git a/web/htdocs/details/found.mc b/web/htdocs/details/found.mc
index eb9fe8f..f7f8799 100644 (file)
--- a/web/htdocs/details/found.mc
+++ b/web/htdocs/details/found.mc
@@ -1,4 +1,4 @@
-%# $Id: found.mc,v 1.6 2006-09-20 11:25:42 mike Exp $
+%# $Id: found.mc,v 1.7 2006-09-20 13:19:53 mike Exp $

 <%once>
 use XML::LibXML;
 use XML::LibXML::XPathContext;
 <%once>
 use XML::LibXML;
 use XML::LibXML::XPathContext;

@@ -30,7 +30,7 @@ if ($sort) {
 ### We can think about keeping the Connection object open to re-use
 # for multiple requests, but that may not get us much.  Same applies
 # for the XML parser.
 ### We can think about keeping the Connection object open to re-use
 # for multiple requests, but that may not get us much.  Same applies
 # for the XML parser.

-my $conn = new ZOOM::Connection("localhost:1313/IR-Explain---1");
+my $conn = new ZOOM::Connection("localhost:3313/IR-Explain---1");

 $conn->option(elementSetName => "zeerex");
 my $parser = new XML::LibXML();
 
 $conn->option(elementSetName => "zeerex");
 my $parser = new XML::LibXML();
 

diff --git a/web/htdocs/raw.html b/web/htdocs/raw.html
index 8d8eb21..dcb605f 100644 (file)
--- a/web/htdocs/raw.html
+++ b/web/htdocs/raw.html
@@ -1,4 +1,4 @@
-%# $Id: raw.html,v 1.1 2006-09-19 11:11:33 mike Exp $
+%# $Id: raw.html,v 1.2 2006-09-20 13:19:53 mike Exp $

 <%args>
 $id
 </%args>
 <%args>
 $id
 </%args>

@@ -6,7 +6,7 @@ $id
 use ZOOM;
 </%once>
 <%perl>
 use ZOOM;
 </%once>
 <%perl>

-my $conn = new ZOOM::Connection("localhost:1313/IR-Explain---1");
+my $conn = new ZOOM::Connection("localhost:3313/IR-Explain---1");

 $conn->option(elementSetName => "zeerex");
 my $query = qq[rec.id="$id"];
 my $rs = $conn->search(new ZOOM::Query::CQL($query));
 $conn->option(elementSetName => "zeerex");
 my $query = qq[rec.id="$id"];
 my $rs = $conn->search(new ZOOM::Query::CQL($query));

diff --git a/web/htdocs/run.html b/web/htdocs/run.html
index 0f66ee7..1a6d984 100644 (file)
--- a/web/htdocs/run.html
+++ b/web/htdocs/run.html
@@ -1,8 +1,8 @@
-%# $Id: run.html,v 1.1 2006-09-14 15:15:45 mike Exp $
+%# $Id: run.html,v 1.2 2006-09-20 13:19:53 mike Exp $

 <%perl>
 use lib "/usr/local/src/cvs/irspy/lib";
 use ZOOM::IRSpy;
 <%perl>
 use lib "/usr/local/src/cvs/irspy/lib";
 use ZOOM::IRSpy;

-my $dbname = "localhost:1313/IR-Explain---1";
+my $dbname = "localhost:3313/IR-Explain---1";

 my @targets = qw(bagel.indexdata.dk/gils
                 z3950.loc.gov:7090/Voyager);
 </%perl>
 my @targets = qw(bagel.indexdata.dk/gils
                 z3950.loc.gov:7090/Voyager);
 </%perl>

diff --git a/zebra/README b/zebra/README
index bdb8d51..fff099f 100644 (file)
--- a/zebra/README
+++ b/zebra/README
@@ -1,4 +1,4 @@
-$Id: README,v 1.11 2006-09-13 15:36:12 mike Exp $
+$Id: README,v 1.12 2006-09-20 13:19:54 mike Exp $

 
 What's what in this directory:
 
 
 What's what in this directory:
 

@@ -66,7 +66,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
        dictionaries and suchlike.
 
 form.html -- a simple HTML search form that submits SRU queries to a

-       server running on local port 1313.
+       server running on local port 3313.

 
 --
 
 
 --
 

@@ -81,5 +81,5 @@ zebraidx commit
 zebrasrv -f yazserver.xml
 
 Then interrogate the database with SRU URLs such as:
 zebrasrv -f yazserver.xml
 
 Then interrogate the database with SRU URLs such as:

-       http://localhost:1313/IR-Explain---1?version=1.1&operation=searchRetrieve&maximumRecords=10&recordSchema=zeerex&query=net.protocol=sru
+       http://localhost:3313/IR-Explain---1?version=1.1&operation=searchRetrieve&maximumRecords=10&recordSchema=zeerex&query=net.protocol=sru

 
 

diff --git a/zebra/form.html b/zebra/form.html
index b7a3012..d16019a 100644 (file)
--- a/zebra/form.html
+++ b/zebra/form.html
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <?xml version="1.0" encoding="ISO-8859-1"?>

-<!-- $Id: form.html,v 1.1 2006-05-12 16:26:00 mike Exp $ -->
+<!-- $Id: form.html,v 1.2 2006-09-20 13:19:54 mike Exp $ -->

 <!DOCTYPE html 
        PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <!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>
  </head>
  <body>
   <h1>SRU form for the IRSpy database</h1>

-  <form method="get" action="http://localhost:1313/IR-Explain---1">
+  <form method="get" action="http://localhost:3313/IR-Explain---1">

    <table>
     <tr>
      <td align="right">
    <table>
     <tr>
      <td align="right">

diff --git a/zebra/yazserver.xml b/zebra/yazserver.xml
index 658a618..991bbe5 100644 (file)
--- a/zebra/yazserver.xml
+++ b/zebra/yazserver.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>

-<!-- $Id: yazserver.xml,v 1.2 2006-05-12 16:13:53 mike Exp $ -->
+<!-- $Id: yazserver.xml,v 1.3 2006-09-20 13:19:54 mike Exp $ -->

 <yazgfs>
 <yazgfs>

- <listen id="tcp1313">tcp:@:1313</listen>
- <server id="alvis" listenref="tcp1313">
+ <listen id="tcp3313">tcp:@:3313</listen>
+ <server id="alvis" listenref="tcp3313">

   <directory>./</directory>
   <config>zebra.cfg</config>
   <cql2rpn>pqf.properties</cql2rpn>
   <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>
     <explain xmlns="http://explain.z3950.org/dtd/2.0/">
      <serverInfo>
       <host>localhost</host>

-      <port>1313</port>
+      <port>3313</port>

       <database>IR-Explain---1</database>
      </serverInfo>
     </explain>
       <database>IR-Explain---1</database>
      </serverInfo>
     </explain>

diff --git a/zebra/zeerex.xml b/zebra/zeerex.xml
index b5013dd..0f55a44 100644 (file)
--- a/zebra/zeerex.xml
+++ b/zebra/zeerex.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>

-<!-- $Id: zeerex.xml,v 1.12 2006-09-07 10:29:38 mike Exp $ -->
+<!-- $Id: zeerex.xml,v 1.13 2006-09-20 13:19:54 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>
 <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>1313</port>
+  <port>3313</port>

   <database>Default</database>
  </serverInfo>
 
   <database>Default</database>
  </serverInfo>