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

diff --git a/IDMETA b/IDMETA
index 2496c55..74eff45 100644 (file)
--- a/IDMETA
+++ b/IDMETA
@@ -1,4 +1,4 @@
 DEBIAN_DIST="wheezy squeeze"
-UBUNTU_DIST="precise oneiric natty lucid"
-CENTOS_DIST="centos5"
-VERSION=1.6.22
+UBUNTU_DIST="quantal precise oneiric natty lucid"
+CENTOS_DIST="centos5 centos6"
+VERSION=1.6.23

diff --git a/NEWS b/NEWS
index 946f3f4..ca4b3b0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,26 @@
+--- 1.6.23 2013/01/02
+
+Extend info command with hostname and YAZ SHA1
+Indent results for both command stat and info.
+
+Allow limit on merged content. The new configuration metadata
+element, limitcluster, configures that a metadata element (name) be used
+as limit name for search. Applies to the whole service (ie all targets),
+unlike pz:limitmap which is configured per-target (database).
+
+New feature: limitmap local:* matches against all metadata fields.
+
+Allow repeated list in limitmap spec . Separated by comma. For
+example: value="local:title,rpn:@attr 1=4".
+
+New element <message> in bytarget response. Holds diagnostic message
+of code (say 'Unsupported Use Attribute' for Bib-1 114).
+
+Improved logging for record ingestion failures.
+
+Avoid using struct icu_chain in non-YAZ_HAVE_ICU mode. In the rare case,
+when YAZ is compiled without ICU support.
+
 --- 1.6.22 2012/10/11
 
 Requires YAZ-4.2.40 to support native solr support. 

diff --git a/README b/README
index 10ca2d7..69962ea 100644 (file)
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ Pazpar2 is a high-performance, user interface-independent, data
 model-independent metasearching middleware featuring merging, relevance
 ranking, record sorting, and faceted results.
 
-Copyright (C) 2006-2012 Index Data. See the file LICENSE for details.
+Copyright (C) 2006-2013 Index Data. See the file LICENSE for details.
 
 Installation instructions and documentation is found in directory 'doc' and
 on-line at http://www.indexdata.com/pazpar2/ .

diff --git a/configure.ac b/configure.ac
index 34806c9..93812df 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 ## -*- Autoconf -*-
 ## This file is part of Pazpar2.
-## Copyright (C) 2006-2012 Index Data
+## Copyright (C) 2006-2013 Index Data
 ## Process this file with autoconf to produce a configure script.
 
 # Autoconf and automake setup

diff --git a/debian/changelog b/debian/changelog
index c2908d8..1fae14a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pazpar2 (1.6.23-1indexdata) unstable; urgency=low
+
+  * Upstream.
+
+ -- Adam Dickmeiss <adam@indexdata.dk>  Wed, 02 Jan 2013 12:35:14 +0100
+
 pazpar2 (1.6.22-4indexdata) unstable; urgency=low
 
   * Patch for blocked show problem.

diff --git a/debian/copyright b/debian/copyright
index 1d48cb7..ea675c8 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,7 +10,7 @@ Upstream Authors:
 
 Copyright: 
 
-    Copyright (C) 2007, Index Data
+    Copyright (C) 2007-2013, Index Data
 
 License:
 

diff --git a/doc/entities.ent b/doc/entities.ent
index b299edd..6d78ee5 100644 (file)
--- a/doc/entities.ent
+++ b/doc/entities.ent
@@ -1,5 +1,5 @@
 <!-- Manually edited stuff used for all package documentation -->
-<!ENTITY copyright-year "2006-2012">
+<!ENTITY copyright-year "2006-2013">
 <!ENTITY manref SYSTEM "manref.xml">
 <!ENTITY sect-ajaxdev SYSTEM "ajaxdev.xml">
 <!ENTITY gpl2 SYSTEM "gpl-2.0.xml">

diff --git a/perf/bash/pp2client.sh b/perf/bash/pp2client.sh
index 55f1b4e..03b0421 100755 (executable)
--- a/perf/bash/pp2client.sh
+++ b/perf/bash/pp2client.sh
@@ -94,6 +94,8 @@ else
     wget -q -O ${TMP_DIR}$OF.show.xml "$H?command=show&session=$S&sort=relevance&start=0&num=100&block=1"
 fi
 wget -q -O ${TMP_DIR}$OF.bytarget.xml "$H?command=bytarget&session=$S"
+wget -q -O ${TMP_DIR}$OF.stat.xml "$H?command=stat&session=$S"
+wget -q -O ${TMP_DIR}$OF.info.xml "$H?command=info"
 exit 0
 
 # Local Variables:

diff --git a/src/charsets.c b/src/charsets.c
index fe91420..f931445 100644 (file)
--- a/src/charsets.c
+++ b/src/charsets.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/charsets.h b/src/charsets.h
index 467dc2e..b203ce4 100644 (file)
--- a/src/charsets.h
+++ b/src/charsets.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/client.c b/src/client.c
index bbafde0..0cf2e07 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/client.h b/src/client.h
index 422a380..8176db9 100644 (file)
--- a/src/client.h
+++ b/src/client.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/connection.c b/src/connection.c
index 16ae64a..9ca2142 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/connection.h b/src/connection.h
index c6b4ed0..105263d 100644 (file)
--- a/src/connection.h
+++ b/src/connection.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/database.c b/src/database.c
index a29fc06..1fa4097 100644 (file)
--- a/src/database.c
+++ b/src/database.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/database.h b/src/database.h
index 9fbe340..c53f0e4 100644 (file)
--- a/src/database.h
+++ b/src/database.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/eventl.c b/src/eventl.c
index 840e52b..5c77f49 100644 (file)
--- a/src/eventl.c
+++ b/src/eventl.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
- Copyright (C) 2006-2012 Index Data
+ Copyright (C) 2006-2013 Index Data
 
  Pazpar2 is free software; you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free
@@ -20,7 +20,7 @@
 /*
  * Based on  ParaZ - a simple tool for harvesting performance data for
  * parallel operations using Z39.50.
- * Copyright (C) 2006-2012 Index Data ApS
+ * Copyright (C) 2006-2013 Index Data ApS
  * See LICENSE file for details.
  */
 

diff --git a/src/eventl.h b/src/eventl.h
index ef94a10..4acff45 100644 (file)
--- a/src/eventl.h
+++ b/src/eventl.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/facet_limit.c b/src/facet_limit.c
index 131a1b7..0c15bdc 100644 (file)
--- a/src/facet_limit.c
+++ b/src/facet_limit.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/facet_limit.h b/src/facet_limit.h
index 717a4f8..cec7ba0 100644 (file)
--- a/src/facet_limit.h
+++ b/src/facet_limit.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/getaddrinfo.c b/src/getaddrinfo.c
index 6dca551..13f7c24 100644 (file)
--- a/src/getaddrinfo.c
+++ b/src/getaddrinfo.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/host.c b/src/host.c
index 9daabc2..ae536c6 100644 (file)
--- a/src/host.c
+++ b/src/host.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/host.h b/src/host.h
index 3fe68b6..c1f2d89 100644 (file)
--- a/src/host.h
+++ b/src/host.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/http.c b/src/http.c
index 05b2119..6580381 100644 (file)
--- a/src/http.c
+++ b/src/http.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/http.h b/src/http.h
index 1670766..dfe7446 100644 (file)
--- a/src/http.h
+++ b/src/http.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/http_command.c b/src/http_command.c
index 65be27c..f2f9b20 100644 (file)
--- a/src/http_command.c
+++ b/src/http_command.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -1355,17 +1355,17 @@ static void cmd_stat(struct http_channel *c)
     }
 
     response_open_no_status(c, "stat");
-    wrbuf_printf(c->wrbuf, "<activeclients>%d</activeclients>\n", clients);
-    wrbuf_printf(c->wrbuf, "<hits>" ODR_INT_PRINTF "</hits>\n", stat.num_hits);
-    wrbuf_printf(c->wrbuf, "<records>%d</records>\n", stat.num_records);
-    wrbuf_printf(c->wrbuf, "<clients>%d</clients>\n", stat.num_clients);
-    wrbuf_printf(c->wrbuf, "<unconnected>%d</unconnected>\n", stat.num_no_connection);
-    wrbuf_printf(c->wrbuf, "<connecting>%d</connecting>\n", stat.num_connecting);
-    wrbuf_printf(c->wrbuf, "<working>%d</working>\n", stat.num_working);
-    wrbuf_printf(c->wrbuf, "<idle>%d</idle>\n", stat.num_idle);
-    wrbuf_printf(c->wrbuf, "<failed>%d</failed>\n", stat.num_failed);
-    wrbuf_printf(c->wrbuf, "<error>%d</error>\n", stat.num_error);
-    wrbuf_printf(c->wrbuf, "<progress>%.2f</progress>\n", progress);
+    wrbuf_printf(c->wrbuf, "\n <activeclients>%d</activeclients>\n", clients);
+    wrbuf_printf(c->wrbuf, " <hits>" ODR_INT_PRINTF "</hits>\n", stat.num_hits);
+    wrbuf_printf(c->wrbuf, " <records>%d</records>\n", stat.num_records);
+    wrbuf_printf(c->wrbuf, " <clients>%d</clients>\n", stat.num_clients);
+    wrbuf_printf(c->wrbuf, " <unconnected>%d</unconnected>\n", stat.num_no_connection);
+    wrbuf_printf(c->wrbuf, " <connecting>%d</connecting>\n", stat.num_connecting);
+    wrbuf_printf(c->wrbuf, " <working>%d</working>\n", stat.num_working);
+    wrbuf_printf(c->wrbuf, " <idle>%d</idle>\n", stat.num_idle);
+    wrbuf_printf(c->wrbuf, " <failed>%d</failed>\n", stat.num_failed);
+    wrbuf_printf(c->wrbuf, " <error>%d</error>\n", stat.num_error);
+    wrbuf_printf(c->wrbuf, " <progress>%.2f</progress>\n", progress);
     response_close(c, "stat");
     release_session(c, s);
 }
@@ -1373,26 +1373,39 @@ static void cmd_stat(struct http_channel *c)
 static void cmd_info(struct http_channel *c)
 {
     char yaz_version_str[20];
+    char yaz_sha1_str[42];
 
     response_open_no_status(c, "info");
-    wrbuf_puts(c->wrbuf, " <version>\n");
+    wrbuf_puts(c->wrbuf, "\n <version>\n");
     wrbuf_puts(c->wrbuf, "  <pazpar2");
 #ifdef PAZPAR2_VERSION_SHA1
     wrbuf_printf(c->wrbuf, " sha1=\"%s\"", PAZPAR2_VERSION_SHA1);
 #endif
     wrbuf_puts(c->wrbuf, ">");
     wrbuf_xmlputs(c->wrbuf, VERSION);
-    wrbuf_puts(c->wrbuf, "</pazpar2>");
+    wrbuf_puts(c->wrbuf, "</pazpar2>\n");
 
-    yaz_version(yaz_version_str, 0);
+    yaz_version(yaz_version_str, yaz_sha1_str);
     wrbuf_puts(c->wrbuf, "  <yaz compiled=\"");
     wrbuf_xmlputs(c->wrbuf, YAZ_VERSION);
+    wrbuf_puts(c->wrbuf, "\" sha1=\"");
+    wrbuf_xmlputs(c->wrbuf, yaz_sha1_str);
     wrbuf_puts(c->wrbuf, "\">");
     wrbuf_xmlputs(c->wrbuf, yaz_version_str);
     wrbuf_puts(c->wrbuf, "</yaz>\n");
 
     wrbuf_puts(c->wrbuf, " </version>\n");
-
+#if HAVE_UNISTD_H
+    {
+        char hostname_str[64];
+        if (gethostname(hostname_str, sizeof(hostname_str)) == 0)
+        {
+            wrbuf_puts(c->wrbuf, " <host>");
+            wrbuf_xmlputs(c->wrbuf, hostname_str);
+            wrbuf_puts(c->wrbuf, "</host>\n");
+        }
+    }
+#endif
     info_services(c->server, c->wrbuf);
 
     response_close(c, "info");

diff --git a/src/incref.c b/src/incref.c
index e820f14..12fa346 100644 (file)
--- a/src/incref.c
+++ b/src/incref.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/incref.h b/src/incref.h
index 80c0313..9fe7342 100644 (file)
--- a/src/incref.h
+++ b/src/incref.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/jenkins_hash.c b/src/jenkins_hash.c
index ecfa6f3..f0e2c35 100644 (file)
--- a/src/jenkins_hash.c
+++ b/src/jenkins_hash.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/jenkins_hash.h b/src/jenkins_hash.h
index 23df691..408584a 100644 (file)
--- a/src/jenkins_hash.h
+++ b/src/jenkins_hash.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/marchash.c b/src/marchash.c
index 5771929..de92213 100644 (file)
--- a/src/marchash.c
+++ b/src/marchash.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/marchash.h b/src/marchash.h
index 98847a5..9a723a4 100644 (file)
--- a/src/marchash.h
+++ b/src/marchash.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/marcmap.c b/src/marcmap.c
index b10b464..fd9b1be 100644 (file)
--- a/src/marcmap.c
+++ b/src/marcmap.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/marcmap.h b/src/marcmap.h
index 9778e4d..f17d45d 100644 (file)
--- a/src/marcmap.h
+++ b/src/marcmap.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/normalize7bit.c b/src/normalize7bit.c
index 3087182..dadc3d5 100644 (file)
--- a/src/normalize7bit.c
+++ b/src/normalize7bit.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/normalize7bit.h b/src/normalize7bit.h
index 09cb3b3..b4f2ff2 100644 (file)
--- a/src/normalize7bit.h
+++ b/src/normalize7bit.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/normalize_cache.c b/src/normalize_cache.c
index 92b71ae..7cbc14b 100644 (file)
--- a/src/normalize_cache.c
+++ b/src/normalize_cache.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/normalize_cache.h b/src/normalize_cache.h
index 4ee9322..585212e 100644 (file)
--- a/src/normalize_cache.h
+++ b/src/normalize_cache.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/normalize_record.c b/src/normalize_record.c
index cb53cf6..92ef3d0 100644 (file)
--- a/src/normalize_record.c
+++ b/src/normalize_record.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/normalize_record.h b/src/normalize_record.h
index 4e748f5..5581269 100644 (file)
--- a/src/normalize_record.h
+++ b/src/normalize_record.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/parameters.h b/src/parameters.h
index 78531e4..c6295b9 100644 (file)
--- a/src/parameters.h
+++ b/src/parameters.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/pazpar2.c b/src/pazpar2.c
index 6afccf1..b580120 100644 (file)
--- a/src/pazpar2.c
+++ b/src/pazpar2.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/pazpar2_config.c b/src/pazpar2_config.c
index 27241a6..fa06db7 100644 (file)
--- a/src/pazpar2_config.c
+++ b/src/pazpar2_config.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/pazpar2_config.h b/src/pazpar2_config.h
index e258dd9..3487e36 100644 (file)
--- a/src/pazpar2_config.h
+++ b/src/pazpar2_config.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/pazpar2_play.c b/src/pazpar2_play.c
index 2669ed6..01d57eb 100644 (file)
--- a/src/pazpar2_play.c
+++ b/src/pazpar2_play.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/ppmutex.c b/src/ppmutex.c
index 2d5d665..8212653 100644 (file)
--- a/src/ppmutex.c
+++ b/src/ppmutex.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/ppmutex.h b/src/ppmutex.h
index ed859b8..a4159ec 100644 (file)
--- a/src/ppmutex.h
+++ b/src/ppmutex.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/reclists.c b/src/reclists.c
index 2594430..99c033e 100644 (file)
--- a/src/reclists.c
+++ b/src/reclists.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/reclists.h b/src/reclists.h
index 6d95401..ea87d80 100644 (file)
--- a/src/reclists.h
+++ b/src/reclists.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/record.c b/src/record.c
index 53cb34e..53b816a 100644 (file)
--- a/src/record.c
+++ b/src/record.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/record.h b/src/record.h
index fb6f8e1..99a9e63 100644 (file)
--- a/src/record.h
+++ b/src/record.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/relevance.c b/src/relevance.c
index d22598d..b08d217 100644 (file)
--- a/src/relevance.c
+++ b/src/relevance.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/relevance.h b/src/relevance.h
index 125f50e..1337b60 100644 (file)
--- a/src/relevance.h
+++ b/src/relevance.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/sel_thread.c b/src/sel_thread.c
index fe8ef82..15c3af5 100644 (file)
--- a/src/sel_thread.c
+++ b/src/sel_thread.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/sel_thread.h b/src/sel_thread.h
index 5bc1c23..8c9d7ea 100644 (file)
--- a/src/sel_thread.h
+++ b/src/sel_thread.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/service_xslt.c b/src/service_xslt.c
index 938a0ff..eefa427 100644 (file)
--- a/src/service_xslt.c
+++ b/src/service_xslt.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/service_xslt.h b/src/service_xslt.h
index 23ad730..d7d41b6 100644 (file)
--- a/src/service_xslt.h
+++ b/src/service_xslt.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/session.c b/src/session.c
index 250734e..6071726 100644 (file)
--- a/src/session.c
+++ b/src/session.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/session.h b/src/session.h
index 55bcb34..66c41ba 100644 (file)
--- a/src/session.h
+++ b/src/session.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/settings.c b/src/settings.c
index 192a022..233125e 100644 (file)
--- a/src/settings.c
+++ b/src/settings.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/settings.h b/src/settings.h
index 6351e9c..f6a33fd 100644 (file)
--- a/src/settings.h
+++ b/src/settings.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/termlists.c b/src/termlists.c
index 64f397a..0eb8eb7 100644 (file)
--- a/src/termlists.c
+++ b/src/termlists.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/termlists.h b/src/termlists.h
index 6f7271b..cc47a19 100644 (file)
--- a/src/termlists.h
+++ b/src/termlists.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/test_normalize.c b/src/test_normalize.c
index d41b9c1..8921319 100644 (file)
--- a/src/test_normalize.c
+++ b/src/test_normalize.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/test_sel_thread.c b/src/test_sel_thread.c
index fea51c5..92d6112 100644 (file)
--- a/src/test_sel_thread.c
+++ b/src/test_sel_thread.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/test/test_http_2.res b/test/test_http_2.res
index 1692dca..95185a4 100644 (file)
--- a/test/test_http_2.res
+++ b/test/test_http_2.res
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<stat><activeclients>0</activeclients>
-<hits>0</hits>
-<records>0</records>
-<clients>0</clients>
-<unconnected>0</unconnected>
-<connecting>0</connecting>
-<working>0</working>
-<idle>0</idle>
-<failed>0</failed>
-<error>0</error>
-<progress>0.00</progress>
+<stat>
+ <activeclients>0</activeclients>
+ <hits>0</hits>
+ <records>0</records>
+ <clients>0</clients>
+ <unconnected>0</unconnected>
+ <connecting>0</connecting>
+ <working>0</working>
+ <idle>0</idle>
+ <failed>0</failed>
+ <error>0</error>
+ <progress>0.00</progress>
 </stat>
\ No newline at end of file

diff --git a/test/test_icu_2.res b/test/test_icu_2.res
index 1692dca..95185a4 100644 (file)
--- a/test/test_icu_2.res
+++ b/test/test_icu_2.res
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<stat><activeclients>0</activeclients>
-<hits>0</hits>
-<records>0</records>
-<clients>0</clients>
-<unconnected>0</unconnected>
-<connecting>0</connecting>
-<working>0</working>
-<idle>0</idle>
-<failed>0</failed>
-<error>0</error>
-<progress>0.00</progress>
+<stat>
+ <activeclients>0</activeclients>
+ <hits>0</hits>
+ <records>0</records>
+ <clients>0</clients>
+ <unconnected>0</unconnected>
+ <connecting>0</connecting>
+ <working>0</working>
+ <idle>0</idle>
+ <failed>0</failed>
+ <error>0</error>
+ <progress>0.00</progress>
 </stat>
\ No newline at end of file

diff --git a/win/makefile b/win/makefile
index 8bbdc15..0be60e8 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -1,10 +1,10 @@
 # This file is part of Pazpar2.
-# Copyright (C) 2006-2012 Index Data
+# Copyright (C) 2006-2013 Index Data
 
 DEBUG=0   # 0 for release, 1 for debug
 USE_MANIFEST = 1 # Can be enabled Visual Studio 2005/2008
 PACKAGE_NAME=pazpar2
-PACKAGE_VERSION=1.6.22
+PACKAGE_VERSION=1.6.23
 
 # YAZ
 YAZ_DIR=..\..\yaz

diff --git a/win/pazpar2.nsi b/win/pazpar2.nsi
index 0af1dcd..bfb18ab 100644 (file)
--- a/win/pazpar2.nsi
+++ b/win/pazpar2.nsi
@@ -1,5 +1,5 @@
 ; This file is part of Pazpar2.
-; Copyright (C) 2006-2012 Index Data
+; Copyright (C) 2006-2013 Index Data
 
 !include version.nsi