From: Adam Dickmeiss Date: Thu, 17 Apr 2014 18:40:56 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/idzebra X-Git-Tag: v2.0.59~1 X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=commitdiff_plain;h=a05fd4d93f41fc3e6fe5d0cc8bd8f9d7a6410cb5;hp=bbd69a699ce9596e5b2a83f9393d47b659a53cc6 Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/idzebra --- diff --git a/IDMETA b/IDMETA index af35eda..668deec 100644 --- a/IDMETA +++ b/IDMETA @@ -1,4 +1,4 @@ DEBIAN_DIST="jessie wheezy squeeze" UBUNTU_DIST="saucy raring quantal precise oneiric lucid" CENTOS_DIST="centos5 centos6" -VERSION=2.0.57 +VERSION=2.0.58 diff --git a/NEWS b/NEWS index 431d1f7..fe247fd 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,10 @@ +--- 2.0.58 2014/03/06 + +Update OAI example README and allow Bib-1 attribute searches. + +Fix ICU indexing test. The code was not really broken, but the test +program was. + --- 2.0.57 2014/02/28 Deb/RPM/Win Zebra packages uses libyaz5 (rather than libyaz4). This adds diff --git a/debian/changelog b/debian/changelog index af35e53..4584ab0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +idzebra (2.0.58-1.indexdata) unstable; urgency=low + + * Upstream. + + -- Adam Dickmeiss Thu, 06 Mar 2014 13:33:48 +0100 + idzebra (2.0.57-1.indexdata) unstable; urgency=medium * Upstream. diff --git a/examples/oai-pmh/README b/examples/oai-pmh/README index 076bf54..21e0739 100644 --- a/examples/oai-pmh/README +++ b/examples/oai-pmh/README @@ -1,27 +1,20 @@ Example DOM XML filter configuration using XSLT stylesheets - Get some more data to play with: - cd data fetch_OAI_data.sh (stop the script when you get tired waiting ..) cd ../ - Checking manually the retrieval stylesheets: - cat data/debug-record.xml xsltproc conf/oai2dc.xsl data/debug-record.xml xsltproc conf/oai2zebra.xsl data/debug-record.xml - Checking manually the indexing stylesheet: - xsltproc conf/oai2index.xsl data/debug-record.xml Indexing: - zebraidx -c conf/zebra.cfg init zebraidx -c conf/zebra.cfg update data zebraidx -c conf/zebra.cfg commit @@ -29,20 +22,14 @@ Indexing: (in case you have not installed zebra yet, use the following command: ../../index/zebraidx -c conf/zebra.cfg this and that .. ) - Starting the SRU/SRW/Z39.50 server in PQF mode only: - zebrasrv -c conf/zebra.cfg Or, alternatively, starting the SRU/SRW/Z39.50 server including PQF and CQL query configuration: - zebrasrv -f yazserver.xml - - Z39.50 search: - yaz-client localhost:9999 Z> format xml Z> querytype prefix @@ -50,16 +37,13 @@ Z39.50 search: Z> find the Z> show 1+1 - Z39.50 presents using presentation stylesheets: - Z> elements dc Z> show 2+1 Z> elements zebra Z> show 3+1 - Z39.50 buildin Zebra presents (in this configuration only if started without yaz-frontendserver): @@ -85,10 +69,14 @@ Z39.50 buildin Zebra presents (in this configuration only if Z> elements zebra::facet::any:w,dc_title:w Z> show 9+1 - - Z39.50 searches targeted at specific indexes + Z> find @attr 1=title communication + Z> show 1+1 + + Z> find @attr 1=author alain + Z> show 1+1 + Z> elements zebra Z> find @attr 1=oai_identifier @attr 4=3 oai:caltechcstr.library.caltech.edu:4 Z> show 1+1 @@ -99,10 +87,7 @@ Z39.50 searches targeted at specific indexes Z> find @attr 1=oai_setspec @attr 4=3 7374617475733D756E707562 Z> show 1+1 - Z> find @attr 1=dc_title communication - Z> show 1+1 - - Z> find @attr 1=dc_identifier @attr 4=3 + Z> find @attr 1=identifier @attr 4=3 http://resolver.caltech.edu/CaltechCSTR:1986.5228-tr-86 Z> show 1+1 @@ -113,14 +98,26 @@ Z39.50 searches targeted at specific indexes structure attribute instruction. Notice also that searching and scan on indexes - 'dc_contributor', 'dc_language', 'dc_rights', and 'dc_source' + 'contributor', 'language', 'rights', and 'source' fails, simply because none of the records in this example set have these fields set, and consequently, these indexes are _not_ created. +Z39.50 searches using Bib-1 -XXXXXXXX +- only if bib1.att is referred to from zebra.cfg + Z> find @attr 1=4 communication + Z> show 1+1 + + Z> find @attr 1=1003 alain + Z> show 1+1 + + Z> find @attr 1=21 all + Z> show 1+1 + + Z> find @attr 1=1018 data + Z> show 1+1 Z39.50 scan: diff --git a/examples/oai-pmh/conf/zebra.cfg b/examples/oai-pmh/conf/zebra.cfg index c07724e..aa59e71 100644 --- a/examples/oai-pmh/conf/zebra.cfg +++ b/examples/oai-pmh/conf/zebra.cfg @@ -16,6 +16,9 @@ storeKeys: 1 # use the DOM XML filter with config file dom-conf.xml recordtype: dom.conf/dom-conf.xml +# Offer Bib-1 + Explain searches +attset: bib1.att +attset: explain.att # where to put registers, and other var content, and how large they may be register: tmp:10G diff --git a/test/api/test_icu_indexing.c b/test/api/test_icu_indexing.c index e9d231a..d7f0b41 100644 --- a/test/api/test_icu_indexing.c +++ b/test/api/test_icu_indexing.c @@ -139,7 +139,7 @@ static void tst(int argc, char **argv) YAZ_CHECK(tl_query(zh, "@attr 5=102 " "..rme", 1)); /* Abstract searches . Chinese mostly */ - YAZ_CHECK(tl_query(zh, "@attr 1=abstract בן", 1)); + YAZ_CHECK(tl_query(zh, "@attr 1=abstract בן-שלום", 1)); YAZ_CHECK(tl_query(zh, "@attr 1=abstract צביה", 1)); YAZ_CHECK(tl_query(zh, "@attr 1=abstract הגדול", 1)); YAZ_CHECK(tl_query(zh, "@attr 1=abstract בסיפור", 1)); @@ -153,7 +153,10 @@ static void tst(int argc, char **argv) YAZ_CHECK(tl_query(zh, "@attr 1=abstract @attr 5=1 בס", 1)); YAZ_CHECK(tl_query(zh, "@attr 1=abstract @attr 5=1 ב", 1)); - YAZ_CHECK(tl_query(zh, "@attr 1=abstract @attr 5=102 בן", 1)); + YAZ_CHECK(tl_query(zh, "@attr 1=abstract @attr 5=1 בן-שלום", 1)); + /* below: should be 1, but the dash (-) is probably a problem */ + YAZ_CHECK(tl_query(zh, "@attr 1=abstract @attr 5=102 בן-שלום", 0)); + YAZ_CHECK(tl_query(zh, "@attr 1=abstract @attr 5=102 צביה", 1)); /* phrase search */ YAZ_CHECK(tl_query(zh, "@attr 1=title {my computer}", 2));