Merge branch 'master' into fetch_more

diff --git a/IDMETA b/IDMETA
index beff310..faa3c65 100644 (file)
--- a/IDMETA
+++ b/IDMETA
@@ -1,4 +1,4 @@
 DEBIAN_DIST="wheezy squeeze"
 UBUNTU_DIST="quantal precise oneiric natty lucid"
 CENTOS_DIST="centos5 centos6"
-VERSION=1.6.24
+VERSION=1.6.25

diff --git a/NEWS b/NEWS
index 1a5aac6..f9678bf 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+--- 1.6.25 2013/02/07
+
+Fix hang of 2nd command=show with esn/syntax given.
+
 --- 1.6.24 2013/01/18
 
 New merge attribute type: 'first', which takes all metadata fields

diff --git a/debian/changelog b/debian/changelog
index bb14cf6..f37387d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pazpar2 (1.6.25-1indexdata) unstable; urgency=low
+
+  * Upstream.
+
+ -- Adam Dickmeiss <adam@indexdata.dk>  Thu, 07 Feb 2013 12:55:25 +0100
+
 pazpar2 (1.6.24-1indexdata) unstable; urgency=low
 
   * Upstream.

diff --git a/perf/ztest/perf.xml b/perf/ztest/perf.xml
index 6777f3c..9fa0387 100644 (file)
--- a/perf/ztest/perf.xml
+++ b/perf/ztest/perf.xml
@@ -8,10 +8,10 @@
   <timeout session="60" z3950_operation="30" z3950_session="180"/>
   <settings target="*">
     <set target="localhost:9999/db01&parm;" name="pz:name" value="db01"/>
-    <set target="localhost:9999/db02" name="pz:name" value="db02"/>
-    <set target="localhost:9999/db03" name="pz:name" value="db03"/>
-    <set target="localhost:9999/db04" name="pz:name" value="db04"/>
-    <set target="localhost:9999/db05" name="pz:name" value="db05"/>
+    <set target="localhost:9999/db02&parm;" name="pz:name" value="db02"/>
+    <set target="localhost:9999/db03&parm;" name="pz:name" value="db03"/>
+    <set target="localhost:9999/db04&parm;" name="pz:name" value="db04"/>
+    <set target="localhost:9999/db05&parm;" name="pz:name" value="db05"/>
     <set target="localhost:9999/db06" name="pz:name" value="db06"/>
     <set target="localhost:9999/db07" name="pz:name" value="db07"/>
     <set target="localhost:9999/db08" name="pz:name" value="db08"/>
@@ -86,6 +86,7 @@
   <metadata name="corporate-name"/>
   <metadata name="corporate-location"/>
   <metadata name="corporate-date"/>
+  <metadata name="has-fulltext"/>
   <metadata name="meeting-name"/>
   <metadata name="meeting-location"/>
   <metadata name="meeting-date"/>
@@ -98,6 +99,8 @@
   <metadata name="title-dates" brief="yes" merge="longest"/>
   <metadata name="title-medium" brief="yes" merge="longest"/>
   <metadata name="title-number-section" brief="yes" merge="longest"/>
+  <metadata name="title-complete"/>
+  <metadata name="title-uniform"/>
   <metadata name="medium" brief="yes" merge="no" mergekey="optional"/>
   <metadata name="iii-id" brief="yes" merge="no"/>
   <metadata name="edition"/>
@@ -130,6 +133,7 @@
   <metadata name="locallocation" brief="yes"/>
   <metadata name="callnumber" brief="yes"/>
   <metadata name="publicnote" brief="yes"/>
+  <metadata name="system-control-nr"/>
   
   <!-- journals -->
   <metadata name="journal-title"/>
@@ -139,6 +143,7 @@
   <metadata name="issue-number"/>
   
   <metadata name="url_recipe" setting="postproc" brief="yes" merge="no"/>
+  <metadata name="oclc-number"/>
   <metadata name="open_url_resolver" setting="parameter" merge="no"/>
   <metadata name="open-url" merge="longest"/>
   <metadata name="use_url_proxy" setting="postproc" brief="yes" merge="no"/>

diff --git a/src/client.c b/src/client.c
index 39140a7..5f2df7b 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -646,7 +646,7 @@ static void client_record_ingest(struct client *cl)
     }
 }
 
-void client_record_response(struct client *cl)
+void client_record_response(struct client *cl, int *got_records)
 {
     struct connection *co = cl->connection;
     ZOOM_connection link = connection_get_link(co);
@@ -679,6 +679,7 @@ void client_record_response(struct client *cl)
         else
         {
             client_record_ingest(cl);
+            *got_records = 1;
         }
     }
 }

diff --git a/src/client.h b/src/client.h
index 483136b..d50fbdf 100644 (file)
--- a/src/client.h
+++ b/src/client.h
@@ -63,7 +63,7 @@ const char *client_get_pquery(struct client *cl);
 
 void client_init_response(struct client *cl, Z_APDU *a);
 void client_search_response(struct client *cl);
-void client_record_response(struct client *cl);
+void client_record_response(struct client *cl, int *got_records);
 void client_close_response(struct client *cl, Z_APDU *a);
 
 int client_is_our_response(struct client *cl);

diff --git a/src/connection.c b/src/connection.c
index 9ca2142..a87d14c 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -257,8 +257,7 @@ static void non_block_events(struct connection *co)
             client_search_response(cl);
             break;
         case ZOOM_EVENT_RECV_RECORD:
-            client_record_response(cl);
-            got_records = 1;
+            client_record_response(cl, &got_records);
             break;
         default:
             yaz_log(YLOG_LOG, "Unhandled event (%d) from %s",
@@ -281,20 +280,7 @@ void connection_continue(struct connection *co)
 {
     int r = ZOOM_connection_exec_task(co->link);
     if (!r)
-    {
-        const char *error, *addinfo;
-        int err;
-        if ((err = ZOOM_connection_error(co->link, &error, &addinfo)))
-        {
-            if (co->client)
-            {
-                yaz_log(YLOG_LOG, "Error %s from %s",
-                        error, client_get_id(co->client));
-                client_set_diagnostic(co->client, err, error, addinfo);
-                client_set_state_nb(co->client, Client_Error);
-            }
-        }
-    }
+        non_block_events(co);
     else
     {
         iochan_setflags(co->iochan, ZOOM_connection_get_mask(co->link));

diff --git a/test/test_http.urls b/test/test_http.urls
index 7f40d59..e51c15e 100644 (file)
--- a/test/test_http.urls
+++ b/test/test_http.urls
@@ -82,3 +82,5 @@ http://localhost:9763/search.pz2?session=10&command=show&block=1
 http://localhost:9763/search.pz2?session=10&command=termlist
 http://localhost:9763/search.pz2?session=10&command=search&query=teachers&limit=subject%3DGreece
 http://localhost:9763/search.pz2?session=10&command=show&block=1
+http://localhost:9763/search.pz2?session=10&command=record&id=content%3A+title+the+religious+teachers+of+greece+author+adam+james+medium+book&offset=0&esn=F&r=1
+http://localhost:9763/search.pz2?session=10&command=record&id=content%3A+title+the+religious+teachers+of+greece+author+adam+james+medium+book&offset=0&esn=F&r=2

diff --git a/test/test_http_85.res b/test/test_http_85.res
new file mode 100644 (file)
index 0000000..ceb102b
--- /dev/null
+++ b/test/test_http_85.res
@@ -0,0 +1,66 @@
+<record xmlns="http://www.loc.gov/MARC21/slim">
+  <leader>00888nam a2200265   4504</leader>
+  <controlfield tag="001">   72002565 </controlfield>
+  <controlfield tag="003">DLC</controlfield>
+  <controlfield tag="005">19730409000000.0</controlfield>
+  <controlfield tag="008">720418r19721909nyu      b    00000 eng  </controlfield>
+  <datafield tag="010" ind1=" " ind2=" ">
+    <subfield code="a">   72002565 </subfield>
+  </datafield>
+  <datafield tag="020" ind1=" " ind2=" ">
+    <subfield code="a">0836968433</subfield>
+  </datafield>
+  <datafield tag="040" ind1=" " ind2=" ">
+    <subfield code="a">DLC</subfield>
+    <subfield code="c">DLC</subfield>
+    <subfield code="d">DLC</subfield>
+  </datafield>
+  <datafield tag="043" ind1=" " ind2=" ">
+    <subfield code="a">e-gr---</subfield>
+  </datafield>
+  <datafield tag="050" ind1="0" ind2="0">
+    <subfield code="a">BL785</subfield>
+    <subfield code="b">.A3 1972</subfield>
+  </datafield>
+  <datafield tag="082" ind1="0" ind2="0">
+    <subfield code="a">292/.08</subfield>
+  </datafield>
+  <datafield tag="100" ind1="1" ind2="0">
+    <subfield code="a">Adam, James,</subfield>
+    <subfield code="d">1860-1907.</subfield>
+  </datafield>
+  <datafield tag="245" ind1="1" ind2="4">
+    <subfield code="a">The religious teachers of Greece.</subfield>
+    <subfield code="c">Edited with a memoir, by his wife, Adela Marion Adam.</subfield>
+  </datafield>
+  <datafield tag="260" ind1="0" ind2=" ">
+    <subfield code="a">Freeport, N.Y.,</subfield>
+    <subfield code="b">Books for Libraries Press</subfield>
+    <subfield code="c">[1972]</subfield>
+  </datafield>
+  <datafield tag="300" ind1=" " ind2=" ">
+    <subfield code="a">xix, lv, 467 p.</subfield>
+    <subfield code="c">22 cm.</subfield>
+  </datafield>
+  <datafield tag="500" ind1=" " ind2=" ">
+    <subfield code="a">Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures.</subfield>
+  </datafield>
+  <datafield tag="504" ind1=" " ind2=" ">
+    <subfield code="a">Includes bibliographical references.</subfield>
+  </datafield>
+  <datafield tag="650" ind1=" " ind2="0">
+    <subfield code="a">Greek literature</subfield>
+    <subfield code="x">History and criticism.</subfield>
+  </datafield>
+  <datafield tag="650" ind1=" " ind2="0">
+    <subfield code="a">Philosophy, Ancient.</subfield>
+  </datafield>
+  <datafield tag="651" ind1=" " ind2="0">
+    <subfield code="a">Greece</subfield>
+    <subfield code="x">Religion.</subfield>
+  </datafield>
+  <datafield tag="830" ind1=" " ind2="0">
+    <subfield code="a">Gifford lectures,</subfield>
+    <subfield code="v">1904-1906.</subfield>
+  </datafield>
+</record>

diff --git a/test/test_http_86.res b/test/test_http_86.res
new file mode 100644 (file)
index 0000000..ceb102b
--- /dev/null
+++ b/test/test_http_86.res
@@ -0,0 +1,66 @@
+<record xmlns="http://www.loc.gov/MARC21/slim">
+  <leader>00888nam a2200265   4504</leader>
+  <controlfield tag="001">   72002565 </controlfield>
+  <controlfield tag="003">DLC</controlfield>
+  <controlfield tag="005">19730409000000.0</controlfield>
+  <controlfield tag="008">720418r19721909nyu      b    00000 eng  </controlfield>
+  <datafield tag="010" ind1=" " ind2=" ">
+    <subfield code="a">   72002565 </subfield>
+  </datafield>
+  <datafield tag="020" ind1=" " ind2=" ">
+    <subfield code="a">0836968433</subfield>
+  </datafield>
+  <datafield tag="040" ind1=" " ind2=" ">
+    <subfield code="a">DLC</subfield>
+    <subfield code="c">DLC</subfield>
+    <subfield code="d">DLC</subfield>
+  </datafield>
+  <datafield tag="043" ind1=" " ind2=" ">
+    <subfield code="a">e-gr---</subfield>
+  </datafield>
+  <datafield tag="050" ind1="0" ind2="0">
+    <subfield code="a">BL785</subfield>
+    <subfield code="b">.A3 1972</subfield>
+  </datafield>
+  <datafield tag="082" ind1="0" ind2="0">
+    <subfield code="a">292/.08</subfield>
+  </datafield>
+  <datafield tag="100" ind1="1" ind2="0">
+    <subfield code="a">Adam, James,</subfield>
+    <subfield code="d">1860-1907.</subfield>
+  </datafield>
+  <datafield tag="245" ind1="1" ind2="4">
+    <subfield code="a">The religious teachers of Greece.</subfield>
+    <subfield code="c">Edited with a memoir, by his wife, Adela Marion Adam.</subfield>
+  </datafield>
+  <datafield tag="260" ind1="0" ind2=" ">
+    <subfield code="a">Freeport, N.Y.,</subfield>
+    <subfield code="b">Books for Libraries Press</subfield>
+    <subfield code="c">[1972]</subfield>
+  </datafield>
+  <datafield tag="300" ind1=" " ind2=" ">
+    <subfield code="a">xix, lv, 467 p.</subfield>
+    <subfield code="c">22 cm.</subfield>
+  </datafield>
+  <datafield tag="500" ind1=" " ind2=" ">
+    <subfield code="a">Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures.</subfield>
+  </datafield>
+  <datafield tag="504" ind1=" " ind2=" ">
+    <subfield code="a">Includes bibliographical references.</subfield>
+  </datafield>
+  <datafield tag="650" ind1=" " ind2="0">
+    <subfield code="a">Greek literature</subfield>
+    <subfield code="x">History and criticism.</subfield>
+  </datafield>
+  <datafield tag="650" ind1=" " ind2="0">
+    <subfield code="a">Philosophy, Ancient.</subfield>
+  </datafield>
+  <datafield tag="651" ind1=" " ind2="0">
+    <subfield code="a">Greece</subfield>
+    <subfield code="x">Religion.</subfield>
+  </datafield>
+  <datafield tag="830" ind1=" " ind2="0">
+    <subfield code="a">Gifford lectures,</subfield>
+    <subfield code="v">1904-1906.</subfield>
+  </datafield>
+</record>

diff --git a/win/makefile b/win/makefile
index 9a9f258..a1ca3d8 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -4,7 +4,7 @@
 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.24
+PACKAGE_VERSION=1.6.25
 
 # YAZ
 YAZ_DIR=..\..\yaz