From: Adam Dickmeiss Date: Thu, 7 Feb 2013 12:30:20 +0000 (+0100) Subject: Merge branch 'master' into fetch_more X-Git-Tag: v1.6.26~10 X-Git-Url: http://lists.indexdata.com/cgi-bin?a=commitdiff_plain;h=d8df693f0e28a9aabc4ac0cac4f492facc703086;hp=87e9791ee9a652b3665d59ca5bf0e927e935e666;p=pazpar2-moved-to-github.git Merge branch 'master' into fetch_more --- diff --git a/IDMETA b/IDMETA index beff310..faa3c65 100644 --- 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 --- 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 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pazpar2 (1.6.25-1indexdata) unstable; urgency=low + + * Upstream. + + -- Adam Dickmeiss 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 --- a/perf/ztest/perf.xml +++ b/perf/ztest/perf.xml @@ -8,10 +8,10 @@ - - - - + + + + @@ -86,6 +86,7 @@ + @@ -98,6 +99,8 @@ + + @@ -130,6 +133,7 @@ + @@ -139,6 +143,7 @@ + diff --git a/src/client.c b/src/client.c index 39140a7..5f2df7b 100644 --- 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 --- 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 --- 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 --- 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 index 0000000..ceb102b --- /dev/null +++ b/test/test_http_85.res @@ -0,0 +1,66 @@ + + 00888nam a2200265 4504 + 72002565 + DLC + 19730409000000.0 + 720418r19721909nyu b 00000 eng + + 72002565 + + + 0836968433 + + + DLC + DLC + DLC + + + e-gr--- + + + BL785 + .A3 1972 + + + 292/.08 + + + Adam, James, + 1860-1907. + + + The religious teachers of Greece. + Edited with a memoir, by his wife, Adela Marion Adam. + + + Freeport, N.Y., + Books for Libraries Press + [1972] + + + xix, lv, 467 p. + 22 cm. + + + Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures. + + + Includes bibliographical references. + + + Greek literature + History and criticism. + + + Philosophy, Ancient. + + + Greece + Religion. + + + Gifford lectures, + 1904-1906. + + diff --git a/test/test_http_86.res b/test/test_http_86.res new file mode 100644 index 0000000..ceb102b --- /dev/null +++ b/test/test_http_86.res @@ -0,0 +1,66 @@ + + 00888nam a2200265 4504 + 72002565 + DLC + 19730409000000.0 + 720418r19721909nyu b 00000 eng + + 72002565 + + + 0836968433 + + + DLC + DLC + DLC + + + e-gr--- + + + BL785 + .A3 1972 + + + 292/.08 + + + Adam, James, + 1860-1907. + + + The religious teachers of Greece. + Edited with a memoir, by his wife, Adela Marion Adam. + + + Freeport, N.Y., + Books for Libraries Press + [1972] + + + xix, lv, 467 p. + 22 cm. + + + Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures. + + + Includes bibliographical references. + + + Greek literature + History and criticism. + + + Philosophy, Ancient. + + + Greece + Religion. + + + Gifford lectures, + 1904-1906. + + diff --git a/win/makefile b/win/makefile index 9a9f258..a1ca3d8 100644 --- 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