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

diff --git a/bin/reindex.pl b/bin/reindex.pl
index 67e4976..36fa799 100755 (executable)
--- a/bin/reindex.pl
+++ b/bin/reindex.pl
@@ -1,21 +1,33 @@
 #!/usr/bin/perl
 
 # Run as:
-#      perl -I../lib reindex.pl user=admin,password=SWORDFISH,localhost:8018/IR-Explain---1
+#      ./reindex.pl user=admin,password=SWORDFISH,localhost:8018/IR-Explain---1
+#      ./reindex.pl -d -q zeerex.reliability=0 localhost:8018/IR-Explain---1
 
 use strict;
 use warnings;
 use ZOOM;
+use Getopt::Long;
 
-if (@ARGV != 1) {
-    print STDERR "Usage: $0 target\n";
+my $setUdb = 0;
+my $delete = 0;
+my $noAction = 0;
+my $query = 'cql.allRecords=1';
+if (!GetOptions(
+        'setUdb' => \$setUdb,
+        'delete' => \$delete,
+        'noAction' => \$noAction,
+        'query=s' => \$query,
+    ) || @ARGV != 1) {
+    print STDERR "Usage: $0 [-s|--setUdb] [-d|--delete] [-n|--noaction] [-q <query>] <target>\n";
     exit 1;
 }
 
 my $conn = new ZOOM::Connection($ARGV[0]);
 $conn->option(preferredRecordSyntax => "xml");
 $conn->option(elementSetName => "zebra::data");
-my $rs = $conn->search_pqf('@attr 1=_ALLRECORDS @attr 2=103 ""');
+my $rs = $conn->search(new ZOOM::Query::CQL($query));
+
 my $n = $rs->size();
 $| = 1;
 print "$0: reindexing $n records\n";
@@ -24,6 +36,16 @@ foreach my $i (1..$n) {
     print " $i/$n (", int($i*100/$n), "%)\n" if $i % 50 == 0;
     my $rec = $rs->record($i-1);
     my $xml = $rec->render();
+    if ($xml !~ /<\/(e:)?host>/) {
+       # There is an undeletable phantom record: ignore it
+       next;
+    }
+
+    if ($setUdb) {
+       my $udb = qq[<i:udb xmlns:i="http://indexdata.com/irspy/1.0">irspy-$i</i:udb>];
+       $xml =~ s/<\/(e:)?host>/$1$udb/;
+    }
+
     update($conn, $xml);
 }
 print " $n/$n (100%)\n" if $n % 50 != 0;
@@ -35,8 +57,9 @@ print "committed\n";
 sub update {
     my($conn, $xml) = @_;
 
+    return if $noAction;
     my $p = $conn->package();
-    $p->option(action => "specialUpdate");
+    $p->option(action => $delete ? "recordDelete" : "specialUpdate");
     $p->option(record => $xml);
     $p->send("update");
     $p->destroy();

diff --git a/etc/dallas.rules b/etc/dallas.rules
index e0c64e0..8e5df56 100644 (file)
--- a/etc/dallas.rules
+++ b/etc/dallas.rules
@@ -1,6 +1,6 @@
 # Format of IRSpy rules files:
 #
-# Hash characters (#) introduced comments, which are ignored
+# Hash characters (#) introduce comments, which are ignored
 # Trailing whitespace is ignored
 # Blank lines (i.e. including those consisting only of whitespace
 #      and/or comments) are ignored

diff --git a/lib/ZOOM/IRSpy.pm b/lib/ZOOM/IRSpy.pm
index fe1984c..49e7932 100644 (file)
--- a/lib/ZOOM/IRSpy.pm
+++ b/lib/ZOOM/IRSpy.pm
@@ -1,4 +1,3 @@
-
 package ZOOM::IRSpy;
 
 use 5.008;
@@ -366,10 +365,13 @@ sub _rewrite_irspy_record {
 }
 
 
-my $_reliabilityField = {
+my $_specialFields = {
     reliability => [ reliability => 0,
-                     "Calculated reliability of server",
-                     "e:serverInfo/e:reliability" ],
+                    "Calculated reliability of server",
+                    "e:serverInfo/e:reliability" ],
+    udb => [ udb => 0,
+            "Access Name (Unique DB)",
+            "e:databaseInfo/i:udb" ],
 };
 
 sub _rewrite_zeerex_record {
@@ -378,7 +380,14 @@ sub _rewrite_zeerex_record {
     # Add reliability score
     my $xc = irspy_xpath_context($rec);
     my($nok, $nall, $percent) = calc_reliability_stats($xc);
-    modify_xml_document($xc, $_reliabilityField, { reliability => $percent });
+    modify_xml_document($xc, $_specialFields, { reliability => $percent });
+
+    my $xpath = $_specialFields->{udb}->[3];
+    my $value = $xc->findvalue($xpath);
+    if (!defined $oldid && (!defined $value || $value eq '')) {
+       # New record with no explicit UDB: generate a UDB for it.
+       modify_xml_document($xc, $_specialFields, { udb => _next_udb() });
+    }
 
     my $p = $conn->package();
     $p->option(action => "specialUpdate");
@@ -407,6 +416,19 @@ sub _rewrite_zeerex_record {
 }
 
 
+sub _next_udb {
+    use IndexData::Utils::PersistentCounter;
+
+    my $file = $ENV{IRSPY_COUNTER_FILE}
+       or die "no IRSPY_COUNTER_FILE in environment";
+    my $counter = new IndexData::Utils::PersistentCounter($file)
+       or die "can't open counter file '$file': $!";
+    my $val = $counter->next()
+       or die "can't get counter value from '$file': $!";
+    return "irspy-$val";
+}
+
+
 sub _delete_record {
     my($conn, $id) = @_;
 

diff --git a/web/conf/apache2.0/irspy.conf b/web/conf/apache2.0/irspy.conf
index 3ba0447..f742d2d 100644 (file)
--- a/web/conf/apache2.0/irspy.conf
+++ b/web/conf/apache2.0/irspy.conf
@@ -34,13 +34,14 @@ MaxClients 32
     PerlAddVar MasonCompRoot "private => /home/indexdata/irspy/web/htdocs"
     PerlSetVar MasonDataDir              /home/indexdata/irspy/web/data
     PerlSetVar IRSpyLibDir               /home/indexdata/irspy/lib
-    PerlSetEnv PERL5LIB                 /home/indexdata/irspy/lib
+    PerlSetEnv PERL5LIB                 /home/indexdata/irspy/lib:/home/indexdata/perl-indexdata-utils/lib
+    PerlSetEnv IRSPY_COUNTER_FILE        /home/indexdata/irspy/zebra/db/counter
 
     #PerlSetEnv IRSpyDbName    localhost:8018/IR-Explain---1
 
    # We need +Parent to make PerlSwitches -I work properly ... don't ask.
    PerlOptions +Parent
-   PerlSwitches -I/home/indexdata/irspy/lib
+   PerlSwitches -I/home/indexdata/irspy/lib -I/home/indexdata/perl-indexdata-utils/lib
 
     <Location /admin>
        AuthType Basic

diff --git a/web/conf/apache2.0/xeno-dev.conf b/web/conf/apache2.0/xeno-dev.conf
index c86e46d..3cf2831 100644 (file)
--- a/web/conf/apache2.0/xeno-dev.conf
+++ b/web/conf/apache2.0/xeno-dev.conf
@@ -4,9 +4,14 @@
 <VirtualHost *:80>
     ServerName x.irspy.indexdata.com
 
+    <Directory />
+        Allow from all
+       Require all granted
+    </Directory>
+
     ErrorLog     /var/log/apache2/irspy-error.log
     CustomLog    /var/log/apache2/irspy-access.log combined
-    DocumentRoot /usr/local/src/git/irspy/web/htdocs
+    DocumentRoot /home/mike/git/work/irspy/web/htdocs
     <FilesMatch "\.(html|css)$">
      SetHandler perl-script
      PerlHandler HTML::Mason::ApacheHandler
@@ -14,20 +19,20 @@
 
     PerlSetVar MasonArgsMethod mod_perl
 
-    PerlAddVar MasonCompRoot "private => /usr/local/src/git/irspy/web/htdocs"
+    PerlAddVar MasonCompRoot "private => /home/mike/git/work/irspy/web/htdocs"
     PerlSetVar MasonDataDir /tmp/irspy-mason
     # IRSpyLibDir is used only to find source for online documentation
-    PerlSetVar IRSpyLibDir /usr/local/src/git/irspy/lib
-    PerlSetEnv PERL5LIB /usr/local/src/git/irspy/lib
+    PerlSetVar IRSpyLibDir /home/mike/git/work/irspy/lib
+    PerlSetEnv IRSPY_COUNTER_FILE /home/mike/git/work/irspy/zebra/db/counter
 
-   # We need +Parent to make PerlSwitches -I work properly ... don't ask.
-   PerlOptions +Parent
-   PerlSwitches -I/usr/local/src/git/irspy/lib
+    # We need +Parent to make PerlSwitches -I work properly ... don't ask.
+    PerlOptions +Parent
+    PerlSwitches -I/home/mike/git/work/irspy/lib -I/home/mike/git/work/perl-indexdata-utils/lib
 
     <Location /admin>
        AuthType Basic
        AuthName "IRSpy Administration"
-       AuthUserFile /usr/local/src/git/irspy/web/conf/htpasswd
+       AuthUserFile /home/mike/git/work/irspy/web/conf/htpasswd
        Require user admin
     </Location>
 </VirtualHost>

diff --git a/web/htdocs/Lanikai_2009_wide.jpeg b/web/htdocs/Lanikai_2009_wide.jpeg
new file mode 100644 (file)
index 0000000..6f0f311
Binary files /dev/null and b/web/htdocs/Lanikai_2009_wide.jpeg differ

diff --git a/web/htdocs/details/edit.mc b/web/htdocs/details/edit.mc
index e0cb6e7..375e3ef 100644 (file)
--- a/web/htdocs/details/edit.mc
+++ b/web/htdocs/details/edit.mc
@@ -121,6 +121,7 @@ my @fields =
      [ port         => 0, "Port", "e:serverInfo/e:port" ],
      [ dbname       => 0, "Database Name", "e:serverInfo/e:database",
        qw(e:host e:port) ],
+     [ udb          => 0, "Access Name (Unique DB)", "e:databaseInfo/i:udb", qw(e:host e:port e:database) ],
      [ type         => $m->comp("libtype-list.mc"),
        "Type of Library", "i:status/i:libraryType" ],
      [ username     => 0, "Username (if needed)", "e:serverInfo/e:authentication/e:user",

diff --git a/web/htdocs/details/full.mc b/web/htdocs/details/full.mc
index 4695a51..6655727 100644 (file)
--- a/web/htdocs/details/full.mc
+++ b/web/htdocs/details/full.mc
@@ -22,6 +22,7 @@ if ($n == 0) {
                  [ Host => "e:serverInfo/e:host" ],
                  [ Port => "e:serverInfo/e:port" ],
                  [ "Database Name" => "e:serverInfo/e:database" ],
+                 [ "Access Name (Unique DB)" => "e:databaseInfo/i:udb" ],
                  [ "Type of Library" => "i:status/i:libraryType" ],
 #                [ "Username (if needed)" => "e:serverInfo/e:authentication/e:user" ],
 #                [ "Password (if needed)" => "e:serverInfo/e:authentication/e:password" ],

diff --git a/web/htdocs/help/edit/udb.html b/web/htdocs/help/edit/udb.html
new file mode 100644 (file)
index 0000000..ecb30c7
--- /dev/null
+++ b/web/htdocs/help/edit/udb.html
@@ -0,0 +1,6 @@
+  <p>
+   A short, unique name for the database which allows it to be
+   addressed by client programs such as MasterKey. In general, this
+   should not be changed once it's been assigned, so that clients that
+   expect to use the specified name can continue to do so.
+  </p>

diff --git a/web/htdocs/style.css b/web/htdocs/style.css
index adb064a..456bec0 100644 (file)
--- a/web/htdocs/style.css
+++ b/web/htdocs/style.css
@@ -1,6 +1,7 @@
 body {
   color: black;
   background: white;
+  font-family: Gill Sans, "Gillius ADF", Gillius, GilliusADF, Sans-Serif;
 }
 
 h1,h2 { font-family: Verdana, "Sans Serif", Sans }
@@ -11,13 +12,15 @@ blockquote {
   padding: 0.5em;
 }
 
-.banner { background: url(/beach.jpeg) }
+.banner { background: url(/Lanikai_2009_wide.jpeg) }
 .logo { text-decoration: none; color: white; margin-left: 1em }
 .title { color: black; margin-right: 1em }
-.panel1 { background: #d4e7f3; padding: 0em 1em; }
+.panel1 { background: #d0e0f3; padding: 0em 1em; }
 .panel1 a { text-decoration: none }
 .panel3 { background: #ffcc66 }
 
+.panel1, .panel2 { border-radius: 1em; }
+
 /* Fixing the layout */
 .panel1 { width: 9em }
 .spacer { width: 1em }
@@ -54,8 +57,11 @@ img { border: 0 }
 table.targets tr:hover { background-color:silver !important; }
 
 table.targets td, table.targets th {
-  border: 1px solid #DDD;
-  padding: 4px !important;
+  border: none;
+  padding: 6px !important;
 }
 table.targets { border-spacing: 0px; }
 
+table.fullrecord, table.fullrecord th, table.fullrecord td { border: none }
+
+a { text-decoration: none }

diff --git a/zebra/.gitignore b/zebra/.gitignore
index dca4145..b61066c 100644 (file)
--- a/zebra/.gitignore
+++ b/zebra/.gitignore
@@ -4,6 +4,8 @@ records-2008-09-16
 records-2010-04-06
 records-2010-04-14
 records-2010-04-20
+records-2013-08-13
+records-2014-11-24
 terse.properties
 log
 db

diff --git a/zebra/Makefile b/zebra/Makefile
index 35a4a25..c89de53 100644 (file)
--- a/zebra/Makefile
+++ b/zebra/Makefile
@@ -1,9 +1,8 @@
-
-IRSPY_ARCHIVE=         records-2013-08-13
+IRSPY_ARCHIVE=         records-2014-11-24
 IRSPY_ARCHIVE_EXT=     .tar.gz
 DUMP_DIR=              irspy-dump
 ZEBRA_DIR=             db
-ZEBRAIDX=              zebraidx-2.0 
+ZEBRAIDX=              zebraidx-2.0
 ZEBRAIDX_TEST=         zebraidx-2.0 -c zebra-test.cfg
 IRSPY_DATABASE=                $${IRSpyDbName-"localhost:8018/IR-Explain---1"}
 ZEBRA_LOGFILE=         irspy-zebra.log
@@ -47,9 +46,9 @@ dump:
        mkdir records-${DATE}
        cd records-${DATE} && ../../bin/irspy-dump.pl ${IRSPY_DATABASE}
        cd records-${DATE}; find . -name '*.xml' -print0 | \
-          xargs -n1 -0 -P4 tidy -xml -i -m -w 140 > /dev/null 2>&1 
+          xargs -n1 -0 -P4 tidy -xml -i -m -w 140 > /dev/null 2>&1
        tar cf - records-${DATE} | gzip > records-${DATE}.tar.gz
-       
+
 clean:
        rm -f terse.properties
 
@@ -72,7 +71,7 @@ stop-zebra:
        -kill -9 `cat ${ZEBRA_PID_FILE}`
 
 check: newdb start-zebra dump stop-zebra distclean
-       
+
 distclean: clean
        rm -rf ${IRSPY_ARCHIVE} ${ZEBRA_DIR} ${ZEBRA_DIR} ${ZEBRA_TEST_DIR} ${ZEBRA_LOGFILE}
 

diff --git a/zebra/irspy-dump/records-2007-05-01.tar.gz b/zebra/irspy-dump/records-2007-05-01.tar.gz
deleted file mode 100644 (file)
index 631f551..0000000
Binary files a/zebra/irspy-dump/records-2007-05-01.tar.gz and /dev/null differ

diff --git a/zebra/irspy-dump/records-2008-09-16.tar.gz b/zebra/irspy-dump/records-2008-09-16.tar.gz
deleted file mode 100644 (file)
index 8d20960..0000000
Binary files a/zebra/irspy-dump/records-2008-09-16.tar.gz and /dev/null differ

diff --git a/zebra/irspy-dump/records-2010-04-06.tar.gz b/zebra/irspy-dump/records-2010-04-06.tar.gz
deleted file mode 100644 (file)
index ef5319d..0000000
Binary files a/zebra/irspy-dump/records-2010-04-06.tar.gz and /dev/null differ

diff --git a/zebra/irspy-dump/records-2010-04-14.tar.gz b/zebra/irspy-dump/records-2010-04-14.tar.gz
deleted file mode 100644 (file)
index 32dd0d8..0000000
Binary files a/zebra/irspy-dump/records-2010-04-14.tar.gz and /dev/null differ

diff --git a/zebra/irspy-dump/records-2014-11-24.tar.gz b/zebra/irspy-dump/records-2014-11-24.tar.gz
new file mode 100644 (file)
index 0000000..10a6479
Binary files /dev/null and b/zebra/irspy-dump/records-2014-11-24.tar.gz differ