From: Adam Dickmeiss Date: Wed, 2 Jul 2014 07:35:40 +0000 (+0200) Subject: Merge branch 'master' into paz-927 X-Git-Tag: v1.12.0~25 X-Git-Url: http://lists.indexdata.com/cgi-bin?a=commitdiff_plain;h=5f9bcb0650ab5b1661bf75f320dfbb204c6b6d6b;hp=ed8400c109b2a440ed32e78368a554a35411e5b3;p=pazpar2-moved-to-github.git Merge branch 'master' into paz-927 --- diff --git a/IDMETA b/IDMETA index 625c8b5..c6330e9 100644 --- a/IDMETA +++ b/IDMETA @@ -1,4 +1,4 @@ DEBIAN_DIST="jessie wheezy squeeze" -UBUNTU_DIST="trusty saucy raring quantal precise oneiric lucid" +UBUNTU_DIST="trusty saucy raring quantal precise oneiric" CENTOS_DIST="centos5 centos6" -VERSION=1.6.41 +VERSION=1.7.0 diff --git a/Makefile.am b/Makefile.am index 02c2225..8cf96e1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = src test js doc +SUBDIRS = src etc/xsl test js doc EXTRA_DIST = $(PACKAGE).spec IDMETA README NEWS LICENSE m4/id-config.sh \ buildconf.sh Doxyfile.in m4/yaz.m4 \ diff --git a/NEWS b/NEWS index c5b34b1..6d9f270 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,26 @@ +--- 1.7.0 2014/06/27 + +Separate package: pazpar2-xsl PAZ-932 + +--- 1.6.44 2014/06/27 + +Update OPAC stylesheets for availabilityDate PAZ-943 + +Fix too funny startrecs description + +Fix broken ~ match if filter contains = PAZ-941 + +--- 1.6.43 2014/06/12 + +Add pz:redis option for ZOOM caching using redis. This is an alternative +to memcached. Requires YAZ 5.2.0 to work. + +--- 1.6.42 2014/05/06 + +Re-ingest native facets PAZ-934 + +Fix medium override for solr-pz2.xsl. + --- 1.6.41 2014/04/23 Fix URL with leading http:// not working PAZ-933 diff --git a/configure.ac b/configure.ac index 8d55d69..6fa9844 100644 --- a/configure.ac +++ b/configure.ac @@ -63,6 +63,7 @@ AC_OUTPUT([ src/Makefile test/Makefile js/Makefile + etc/xsl/Makefile doc/Makefile doc/local0.ent doc/common/Makefile diff --git a/debian/changelog b/debian/changelog index c644392..9db1ea6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +pazpar2 (1.7.0-2.indexdata) unstable; urgency=medium + + * Fix version passed to dpkg-maintscript-helper rm_conffile + + -- Adam Dickmeiss Fri, 27 Jun 2014 15:48:37 +0200 + +pazpar2 (1.7.0-1.indexdata) unstable; urgency=medium + + * Upstream. + + -- Adam Dickmeiss Fri, 27 Jun 2014 15:02:50 +0200 + pazpar2 (1.6.41-1.indexdata) unstable; urgency=medium * Upstream. diff --git a/debian/control b/debian/control index e4a4199..96daf36 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Standards-Version: 3.7.2 Package: pazpar2 Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, pazpar2-xsl Description: High-performance metaseacher Pazpar2 is a high-performance, user interface-independent, data model-independent metasearching middleware featuring merging, relevance @@ -44,6 +44,16 @@ Description: Java Script utilities Alias for Apache2 so that this library and other demo portals are available. +Package: pazpar2-xsl +Architecture: all +Description: XSLTs for converting to pz2 XML + Pazpar2 is a high-performance, user interface-independent, data + model-independent metasearching middleware featuring merging, relevance + ranking, record sorting, and faceted results. + . + This package includes the standard XSLTs for converting various external + XML Formats to pazpar2's internal format (pz2). + Package: pazpar2-doc Section: doc Architecture: all diff --git a/debian/pazpar2-xsl.dirs b/debian/pazpar2-xsl.dirs new file mode 100644 index 0000000..8973862 --- /dev/null +++ b/debian/pazpar2-xsl.dirs @@ -0,0 +1 @@ +usr/share/pazpar2/xsl diff --git a/debian/pazpar2.postinst b/debian/pazpar2.postinst index 7bf566b..9588514 100644 --- a/debian/pazpar2.postinst +++ b/debian/pazpar2.postinst @@ -4,6 +4,14 @@ set -e if [ "$1" != "configure" ]; then exit 0 fi +for i in cf.xsl marc21.xsl pp2out-to-carrot2.xsl solr-pz2.xsl \ + dads-pz2.xsl marc22.xsl primo-pz2.xsl tmarc.xsl danmarc2.xsl \ + MarcXML2TurboMarc.xsl pz2-ourl-base.xsl unimarc.xsl dc.xsl \ + oai_dc.xsl pz2-ourl-marc21.xsl usmarc.xsl dkabm.xsl opac_turbomarc.xsl \ + pz2-solr.xsl marc21-ourl.xsl opac.xsl server-status-nagios.xsl ; do + dpkg-maintscript-helper rm_conffile /etc/pazpar2/$i 1.6.99.-1.indexdata -- "$@" +done + # add default.xml if there are no enabled services no_services=true for f in /etc/pazpar2/services-enabled/*.xml; do diff --git a/debian/pazpar2.postrm b/debian/pazpar2.postrm index 911bac3..65a8a57 100644 --- a/debian/pazpar2.postrm +++ b/debian/pazpar2.postrm @@ -1,6 +1,14 @@ #!/bin/sh set -e +for i in cf.xsl marc21.xsl pp2out-to-carrot2.xsl solr-pz2.xsl \ + dads-pz2.xsl marc22.xsl primo-pz2.xsl tmarc.xsl danmarc2.xsl \ + MarcXML2TurboMarc.xsl pz2-ourl-base.xsl unimarc.xsl dc.xsl \ + oai_dc.xsl pz2-ourl-marc21.xsl usmarc.xsl dkabm.xsl opac_turbomarc.xsl \ + pz2-solr.xsl marc21-ourl.xsl opac.xsl server-status-nagios.xsl ; do + dpkg-maintscript-helper rm_conffile /etc/pazpar2/$i 1.6.99-1.indexdata -- "$@" +done + if [ "$1" = "purge" ] ; then update-rc.d pazpar2 remove >/dev/null || exit $? rm -f /var/log/pazpar2.log diff --git a/debian/pazpar2.preinst b/debian/pazpar2.preinst new file mode 100644 index 0000000..a8876fa --- /dev/null +++ b/debian/pazpar2.preinst @@ -0,0 +1,10 @@ +#!/bin/sh -e + +for i in cf.xsl marc21.xsl pp2out-to-carrot2.xsl solr-pz2.xsl \ + dads-pz2.xsl marc22.xsl primo-pz2.xsl tmarc.xsl danmarc2.xsl \ + MarcXML2TurboMarc.xsl pz2-ourl-base.xsl unimarc.xsl dc.xsl \ + oai_dc.xsl pz2-ourl-marc21.xsl usmarc.xsl dkabm.xsl opac_turbomarc.xsl \ + pz2-solr.xsl marc21-ourl.xsl opac.xsl server-status-nagios.xsl ; do + dpkg-maintscript-helper rm_conffile /etc/pazpar2/$i 1.6.99-1.indexdata -- "$@" +done + diff --git a/debian/rules b/debian/rules index e460465..4546ede 100755 --- a/debian/rules +++ b/debian/rules @@ -24,7 +24,6 @@ override_dh_auto_install: cp etc/services/*.xml debian/pazpar2/etc/pazpar2/services-available cp etc/settings/*.xml debian/pazpar2/etc/pazpar2/settings/ cp -r etc/settings/mkc debian/pazpar2/etc/pazpar2/settings - cp etc/*.xsl debian/pazpar2/etc/pazpar2/ # pazpar2-apache2 package cp debian/ap2pazpar2.cfg debian/pazpar2-apache2/etc/pazpar2 # pazpar2-test1 package @@ -38,6 +37,8 @@ override_dh_auto_install: # pazpar2-js package cp debian/ap2pazpar2-js.cfg debian/pazpar2-js/etc/pazpar2 mv debian/tmp/usr/share/pazpar2/js/pz2.js debian/pazpar2-js/usr/share/pazpar2/js/ +# pazpar2-xsl package + cp etc/xsl/*.xsl debian/pazpar2-xsl/usr/share/pazpar2/xsl override_dh_installchangelogs: dh_installchangelogs NEWS diff --git a/doc/common b/doc/common index b864825..f6a5ec8 160000 --- a/doc/common +++ b/doc/common @@ -1 +1 @@ -Subproject commit b864825869c7e4c3061952b64afc99a7268be4f8 +Subproject commit f6a5ec8c243e2a6829a2917cb30c849612d6fd01 diff --git a/doc/pazpar2_conf.xml b/doc/pazpar2_conf.xml index c6325f4..4e82022 100644 --- a/doc/pazpar2_conf.xml +++ b/doc/pazpar2_conf.xml @@ -73,6 +73,16 @@ in main thread). + + file + + This configuration takes one attribute path which + specifies a path to search for local files, such as XSLTs and settings. + The path is a colon separated list of directories. Its default value + is "." which is equivalent to the location of the + main configuration file (where indeed the file element is given). + + server @@ -1315,6 +1325,23 @@ + pz:redis + + + If set and non-empty, + redis will + configured and enabled for the target. + The value of this setting is exactly as the redis option for + ZOOM C of YAZ. + + + This setting is honored in Pazpar2 1.6.43 or later. Pazpar2 must + be using YAZ version 5.2.0 or later. + + + + + pz:nativesyntax diff --git a/doc/pazpar2_protocol.xml b/doc/pazpar2_protocol.xml index 4c525fb..9586c3e 100644 --- a/doc/pazpar2_protocol.xml +++ b/doc/pazpar2_protocol.xml @@ -248,7 +248,7 @@ search.pz?command=settings&session=2044502273&pz:allow[search.com:210/db1]=1 Specifies the first record to retrieve from each target. The first record in a result set for a target is numbered 0, next - record is numbered 2. By default maxrecs is 0. + record is numbered 1. By default startrecs is 0. diff --git a/etc/MarcXML2TurboMarc.xsl b/etc/MarcXML2TurboMarc.xsl deleted file mode 100644 index 566fe03..0000000 --- a/etc/MarcXML2TurboMarc.xsl +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/etc/cf.xsl b/etc/cf.xsl deleted file mode 100644 index 7796273..0000000 --- a/etc/cf.xsl +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/etc/dads-pz2.xsl b/etc/dads-pz2.xsl deleted file mode 100644 index 09286ea..0000000 --- a/etc/dads-pz2.xsl +++ /dev/null @@ -1,232 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - e-article - - - article - - - other - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Vol. , - - - - no. - - - No. - - - - ( - - - - Jan. - - - Feb. - - - Mar. - - - Apr. - - - May - - - June - - - July - - - Aug. - - - Sept. - - - Oct. - - - Nov. - - - Dec. - - - - - - - ) - - , p. - - - - - - - - - - - - - - - - - - - - - - - - - - - http://dx.doi.org/ - - - - - - - - - - - - - - - - - diff --git a/etc/danmarc2.xsl b/etc/danmarc2.xsl deleted file mode 100644 index 7e595b1..0000000 --- a/etc/danmarc2.xsl +++ /dev/null @@ -1,261 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - electronic resource - - - electronic resource - - - electronic resource - - - article - - - book - - - - - - - title - - author - - medium - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/etc/dc.xsl b/etc/dc.xsl deleted file mode 100644 index d9ae36d..0000000 --- a/etc/dc.xsl +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/etc/dkabm.xsl b/etc/dkabm.xsl deleted file mode 100644 index ca135b6..0000000 --- a/etc/dkabm.xsl +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/etc/marc21-ourl.xsl b/etc/marc21-ourl.xsl deleted file mode 100644 index 804c153..0000000 --- a/etc/marc21-ourl.xsl +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - Our hook - - - - - - - - diff --git a/etc/marc21.xsl b/etc/marc21.xsl deleted file mode 100644 index e7bee0c..0000000 --- a/etc/marc21.xsl +++ /dev/null @@ -1,467 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - electronic resource - - - electronic resource - - - article - - - book - - - - - - - - yes - - - yes - - - no - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - , - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/etc/marc22.xsl b/etc/marc22.xsl deleted file mode 100644 index 02e34e0..0000000 --- a/etc/marc22.xsl +++ /dev/null @@ -1,306 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - electronic resource - - - electronic resource - - - article - - - book - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - , - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/etc/oai_dc.xsl b/etc/oai_dc.xsl deleted file mode 100644 index 36757cc..0000000 --- a/etc/oai_dc.xsl +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/etc/opac.xsl b/etc/opac.xsl deleted file mode 100644 index dd5c789..0000000 --- a/etc/opac.xsl +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - Available - - - - - - - - - - - - - - - - - - - - - diff --git a/etc/opac_turbomarc.xsl b/etc/opac_turbomarc.xsl deleted file mode 100644 index 98f33b7..0000000 --- a/etc/opac_turbomarc.xsl +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - Available - - - - - - - - - - - - - - - - - - - - diff --git a/etc/pazpar2.cfg.dist b/etc/pazpar2.cfg.dist index e1ed332..65dad25 100644 --- a/etc/pazpar2.cfg.dist +++ b/etc/pazpar2.cfg.dist @@ -1,6 +1,7 @@ - + + diff --git a/etc/perf_server.cfg b/etc/perf_server.cfg index 1678574..943f639 100644 --- a/etc/perf_server.cfg +++ b/etc/perf_server.cfg @@ -1,6 +1,7 @@ + diff --git a/etc/pp2out-to-carrot2.xsl b/etc/pp2out-to-carrot2.xsl deleted file mode 100644 index 5bdd7a0..0000000 --- a/etc/pp2out-to-carrot2.xsl +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - water - - - - - - <xsl:value-of select="md-title" /> - - - - - - - - - - - - \ No newline at end of file diff --git a/etc/primo-pz2.xsl b/etc/primo-pz2.xsl deleted file mode 100644 index 43a92a1..0000000 --- a/etc/primo-pz2.xsl +++ /dev/null @@ -1,189 +0,0 @@ - - - - - - - - - - - - - - no - - - yes - - - no - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - e-article - - - article - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/etc/pz2-ourl-base.xsl b/etc/pz2-ourl-base.xsl deleted file mode 100644 index 260dc9f..0000000 --- a/etc/pz2-ourl-base.xsl +++ /dev/null @@ -1,169 +0,0 @@ - - - - - - - - - ?generatedby=pz2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - &aulast= - - - - - &aufirst= - - - - - - - - - - - - - - - - &volume= - - - - - &issue= - - - - - &spage= - - - - - - - - - - - - - - - &date= - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - & - - = - - - - - - - - diff --git a/etc/pz2-ourl-marc21.xsl b/etc/pz2-ourl-marc21.xsl deleted file mode 100644 index 1c8efde..0000000 --- a/etc/pz2-ourl-marc21.xsl +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/etc/pz2-solr.xsl b/etc/pz2-solr.xsl deleted file mode 100644 index 0b7b796..0000000 --- a/etc/pz2-solr.xsl +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/etc/server.xml b/etc/server.xml index f2c404c..54b170b 100644 --- a/etc/server.xml +++ b/etc/server.xml @@ -1,7 +1,7 @@ - + diff --git a/etc/solr-pz2.xsl b/etc/solr-pz2.xsl deleted file mode 100644 index f6fa5dd..0000000 --- a/etc/solr-pz2.xsl +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/etc/tmarc.xsl b/etc/tmarc.xsl deleted file mode 100644 index 95e9975..0000000 --- a/etc/tmarc.xsl +++ /dev/null @@ -1,829 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - yes - - - - - - - - - book - - recording - - -cd - -cassette - -vinyl - - - - - - video - - -dvd - -blu-ray - -vhs - - - audio-visual - - - - - newspaper - journal - - - map - music-score - microform - thesis - - web - article - electronic - - other - - - - - - - - yes - - - yes - - - no - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - , - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Get resource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - (electronic) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Available - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/etc/unimarc.xsl b/etc/unimarc.xsl deleted file mode 100644 index 4842e24..0000000 --- a/etc/unimarc.xsl +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - , - - - - - - - - - - - - - - - - - diff --git a/etc/usmarc.xsl b/etc/usmarc.xsl deleted file mode 100644 index 12346c8..0000000 --- a/etc/usmarc.xsl +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/etc/xsl/.gitignore b/etc/xsl/.gitignore new file mode 100644 index 0000000..46d2c87 --- /dev/null +++ b/etc/xsl/.gitignore @@ -0,0 +1,5 @@ +*.log +*.log.xml +*.dif +Makefile +Makefile.in diff --git a/etc/xsl/Makefile.am b/etc/xsl/Makefile.am new file mode 100644 index 0000000..ce95cd4 --- /dev/null +++ b/etc/xsl/Makefile.am @@ -0,0 +1,9 @@ +TESTS = $(check_SCRIPTS) + +check_SCRIPTS = test_xsl.sh + +dist-hook: + rm -f ${srcdir}/*.log.xml + cp ${srcdir}/*.xml $(distdir) + cp ${srcdir}/*.xsl $(distdir) + diff --git a/etc/xsl/MarcXML2TurboMarc.xsl b/etc/xsl/MarcXML2TurboMarc.xsl new file mode 100644 index 0000000..566fe03 --- /dev/null +++ b/etc/xsl/MarcXML2TurboMarc.xsl @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/etc/xsl/cf.xsl b/etc/xsl/cf.xsl new file mode 100644 index 0000000..61edc04 --- /dev/null +++ b/etc/xsl/cf.xsl @@ -0,0 +1,122 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/etc/xsl/cf1.res.xml b/etc/xsl/cf1.res.xml new file mode 100644 index 0000000..6a243c0 --- /dev/null +++ b/etc/xsl/cf1.res.xml @@ -0,0 +1,15 @@ + + + + 2013 + 2013 + http://agricola.nal.usda.gov/cgi-bin/Pwebrecon.cgi?v1=1&ti=1,1&SAB1=mankind&BOOL1=all%20of%20these&FLD1=Keyword%20Anywhere%20%28GKEY%29&GRP1=AND%20with%20next%20set&SAB2=&BOOL2=any%20of%20these&FLD2=Subject%20%28SKEY%29&GRP2=AND%20with%20next%20set&SAB3=&BOOL3=as%20a%20phrase&FLD3=Title%20%28TKEY%29&GRP3=AND%20with%20next%20set&SAB4=&BOOL4=as%20a%20phrase&FLD4=Author%20Name%20%28NKEY%29&CNT=25&PID=j4FOGuOTymu6tJsbPHH3Q3yGIH7DxM&SEQ=20140519072849&SID=1 + Biotechnological applications of microalgae : biodiesel and value added products + Biotechnological applications of microalgae : biodiesel and value added products + + + Stacks + TP248.27.A46 B56 2013 + Available + + diff --git a/etc/xsl/cf1.xml b/etc/xsl/cf1.xml new file mode 100644 index 0000000..603f643 --- /dev/null +++ b/etc/xsl/cf1.xml @@ -0,0 +1,12 @@ + + + 2013 + http://agricola.nal.usda.gov/cgi-bin/Pwebrecon.cgi?v1=1&ti=1,1&SAB1=mankind&BOOL1=all%20of%20these&FLD1=Keyword%20Anywhere%20%28GKEY%29&GRP1=AND%20with%20next%20set&SAB2=&BOOL2=any%20of%20these&FLD2=Subject%20%28SKEY%29&GRP2=AND%20with%20next%20set&SAB3=&BOOL3=as%20a%20phrase&FLD3=Title%20%28TKEY%29&GRP3=AND%20with%20next%20set&SAB4=&BOOL4=as%20a%20phrase&FLD4=Author%20Name%20%28NKEY%29&CNT=25&PID=j4FOGuOTymu6tJsbPHH3Q3yGIH7DxM&SEQ=20140519072849&SID=1 + Biotechnological applications of microalgae : biodiesel and value added products + + + Stacks + TP248.27.A46 B56 2013 + Available + + diff --git a/etc/xsl/danmarc2.xsl b/etc/xsl/danmarc2.xsl new file mode 100644 index 0000000..7e595b1 --- /dev/null +++ b/etc/xsl/danmarc2.xsl @@ -0,0 +1,261 @@ + + + + + + + + + + + + + + + + + + + + + + electronic resource + + + electronic resource + + + electronic resource + + + article + + + book + + + + + + + title + + author + + medium + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/etc/xsl/dc.xsl b/etc/xsl/dc.xsl new file mode 100644 index 0000000..d9ae36d --- /dev/null +++ b/etc/xsl/dc.xsl @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/etc/xsl/dkabm.xsl b/etc/xsl/dkabm.xsl new file mode 100644 index 0000000..ca135b6 --- /dev/null +++ b/etc/xsl/dkabm.xsl @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/etc/xsl/marc21-ourl.xsl b/etc/xsl/marc21-ourl.xsl new file mode 100644 index 0000000..804c153 --- /dev/null +++ b/etc/xsl/marc21-ourl.xsl @@ -0,0 +1,23 @@ + + + + + + + + + + + Our hook + + + + + + + + diff --git a/etc/xsl/marc21.xsl b/etc/xsl/marc21.xsl new file mode 100644 index 0000000..e7bee0c --- /dev/null +++ b/etc/xsl/marc21.xsl @@ -0,0 +1,467 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + electronic resource + + + electronic resource + + + article + + + book + + + + + + + + yes + + + yes + + + no + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + , + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/etc/xsl/oai_dc.xsl b/etc/xsl/oai_dc.xsl new file mode 100644 index 0000000..36757cc --- /dev/null +++ b/etc/xsl/oai_dc.xsl @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/etc/xsl/opac.xsl b/etc/xsl/opac.xsl new file mode 100644 index 0000000..78f3b22 --- /dev/null +++ b/etc/xsl/opac.xsl @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + Available + + + + + + + + + + + + + + + + + + + + + diff --git a/etc/xsl/opac_turbomarc.xsl b/etc/xsl/opac_turbomarc.xsl new file mode 100644 index 0000000..430a43e --- /dev/null +++ b/etc/xsl/opac_turbomarc.xsl @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + Available + + + + + + + + + + + + + + + + + + + + diff --git a/etc/xsl/pp2out-to-carrot2.xsl b/etc/xsl/pp2out-to-carrot2.xsl new file mode 100644 index 0000000..5bdd7a0 --- /dev/null +++ b/etc/xsl/pp2out-to-carrot2.xsl @@ -0,0 +1,25 @@ + + + + + + + water + + + + + + <xsl:value-of select="md-title" /> + + + + + + + + + + + + \ No newline at end of file diff --git a/etc/xsl/primo-pz2.xsl b/etc/xsl/primo-pz2.xsl new file mode 100644 index 0000000..43a92a1 --- /dev/null +++ b/etc/xsl/primo-pz2.xsl @@ -0,0 +1,189 @@ + + + + + + + + + + + + + + no + + + yes + + + no + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + e-article + + + article + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/etc/xsl/pz2-ourl-base.xsl b/etc/xsl/pz2-ourl-base.xsl new file mode 100644 index 0000000..260dc9f --- /dev/null +++ b/etc/xsl/pz2-ourl-base.xsl @@ -0,0 +1,169 @@ + + + + + + + + + ?generatedby=pz2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + &aulast= + + + + + &aufirst= + + + + + + + + + + + + + + + + &volume= + + + + + &issue= + + + + + &spage= + + + + + + + + + + + + + + + &date= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + & + + = + + + + + + + + diff --git a/etc/xsl/pz2-ourl-marc21.xsl b/etc/xsl/pz2-ourl-marc21.xsl new file mode 100644 index 0000000..1c8efde --- /dev/null +++ b/etc/xsl/pz2-ourl-marc21.xsl @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/etc/xsl/solr-pz2.xsl b/etc/xsl/solr-pz2.xsl new file mode 100644 index 0000000..5a11a53 --- /dev/null +++ b/etc/xsl/solr-pz2.xsl @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/etc/xsl/solr-pz21.res.xml b/etc/xsl/solr-pz21.res.xml new file mode 100644 index 0000000..72845cd --- /dev/null +++ b/etc/xsl/solr-pz21.res.xml @@ -0,0 +1,28 @@ + + + + Science fiction Short stories Forgers -- Fiction + Science fiction Short stories Forgers -- Fiction, PS + http://www.gutenberg.org/ebooks/24558 + + Project Gutenberg + + + book + + + + 3552-24558 + + Schmitz, James H. + Watch the Sky + + + + + 3552 + 2014-04-23T08:00:01.067Z + 2014-04-23 + 1466162433409155072 + 7.7963223 + diff --git a/etc/xsl/solr-pz21.xml b/etc/xsl/solr-pz21.xml new file mode 100644 index 0000000..e8c6b05 --- /dev/null +++ b/etc/xsl/solr-pz21.xml @@ -0,0 +1,68 @@ + + + + + + + Science fiction Short stories Forgers -- Fiction + + + Science fiction Short stories Forgers -- Fiction, PS + + + http://www.gutenberg.org/ebooks/24558 + + + + + + Project Gutenberg + + + + + + + + + book + + + + + + + + + + + 3552-24558 + + + + + Schmitz, James H. + + + Watch the Sky + + + + + + + + + + + + + + + 3552 + + 2014-04-23T08:00:01.067Z + 2014-04-23 + 1466162433409155072 + 7.7963223 + diff --git a/etc/xsl/solr-pz22.res.xml b/etc/xsl/solr-pz22.res.xml new file mode 100644 index 0000000..1a4d948 --- /dev/null +++ b/etc/xsl/solr-pz22.res.xml @@ -0,0 +1,28 @@ + +cd + + Science fiction Short stories Forgers -- Fiction + Science fiction Short stories Forgers -- Fiction, PS + http://www.gutenberg.org/ebooks/24558 + + Project Gutenberg + + + + + + + 3552-24558 + + Schmitz, James H. + Watch the Sky + + + + + 3552 + 2014-04-23T08:00:01.067Z + 2014-04-23 + 1466162433409155072 + 7.7963223 + diff --git a/etc/xsl/solr-pz22.xml b/etc/xsl/solr-pz22.xml new file mode 100644 index 0000000..339c6d2 --- /dev/null +++ b/etc/xsl/solr-pz22.xml @@ -0,0 +1,69 @@ + + + + + + + + Science fiction Short stories Forgers -- Fiction + + + Science fiction Short stories Forgers -- Fiction, PS + + + http://www.gutenberg.org/ebooks/24558 + + + + + + Project Gutenberg + + + + + + + + + book + + + + + + + + + + + 3552-24558 + + + + + Schmitz, James H. + + + Watch the Sky + + + + + + + + + + + + + + + 3552 + + 2014-04-23T08:00:01.067Z + 2014-04-23 + 1466162433409155072 + 7.7963223 + diff --git a/etc/xsl/test_xsl.sh b/etc/xsl/test_xsl.sh new file mode 100755 index 0000000..ec3dce9 --- /dev/null +++ b/etc/xsl/test_xsl.sh @@ -0,0 +1,35 @@ +#!/bin/sh +v=`xsltproc --version|head -1|awk '{print $5}'` +if test $v -lt 10124; then + echo "libxslt is version $v. Skipping test" + exit 0 +fi +res=0 +for x in *.xsl; do + t=`basename $x .xsl` + if test ! -f ${t}1.xml; then + continue + fi + echo "$t" + for m in ${t}?.xml; do + b=`basename $m .xml` + opt=`grep 'xsltproc:' $m|cut -d: -f2|cut -d- -f1|tr '#' '-'` + l=$b.log.xml + r=$b.res.xml + d=$b.dif + xsltproc $opt $x $m >$l + if test -f $r; then + if diff $l $r >$d; then + rm $d + else + echo "$b: FAIL; check $d" + res=1 + fi + else + echo "$b: making $r for the first time" + mv $l $r + res=1 + fi + done +done +exit $res diff --git a/etc/xsl/tmarc.xsl b/etc/xsl/tmarc.xsl new file mode 100644 index 0000000..95e9975 --- /dev/null +++ b/etc/xsl/tmarc.xsl @@ -0,0 +1,829 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + yes + + + + + + + + + book + + recording + + -cd + -cassette + -vinyl + + + + + + video + + -dvd + -blu-ray + -vhs + + + audio-visual + + + + + newspaper + journal + + + map + music-score + microform + thesis + + web + article + electronic + + other + + + + + + + + yes + + + yes + + + no + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + , + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Get resource + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + (electronic) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Available + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/etc/xsl/tmarc1.res.xml b/etc/xsl/tmarc1.res.xml new file mode 100644 index 0000000..d5c2397 --- /dev/null +++ b/etc/xsl/tmarc1.res.xml @@ -0,0 +1,17 @@ + + + + Sloman + 2002 + On the road with Bob Dylan + On the road with Bob Dylan + Revised edition + New York + Three Rivers Press + 2002 + xv, 464 sider, tavler + Tidligere: 1. udgave. New York, Bantam, 1978 + book + no + + diff --git a/etc/xsl/tmarc1.xml b/etc/xsl/tmarc1.xml new file mode 100644 index 0000000..dab3674 --- /dev/null +++ b/etc/xsl/tmarc1.xml @@ -0,0 +1,95 @@ + + + + 00988nam0a32003011 450 + + 9 181 423 4 + 710100 + a + + + n + e + + + m + u + 2002 + us + eng + 0 + + + a + xx + + + 1-4000-4596-7 + $14,00 + + + DBC200439 + + + + Sloman + Larry + + + On the road with Bob Dylan + Larry "Ratso" Sloman + + + Revised edition + Three Rivers Press + + + New York + Three Rivers Press + 2002 + + + xv, 464 sider, tavler + + + Larry "Ratso" Slomans meget personlige beretning om Bob Dylans koncertturne i USA i 1975: "The Rolling Thunder revue" + + + På omslaget: With a new introduction by Kinky Friedman + + + Tidligere: 1. udgave. New York, Bantam, 1978 + + + + 99.4 + Dylan + Bob + + + 78.9064 + 5 + + + folkemusik + + + folkemusikere + + + rockmusik + + + rockmusikere + + + rockkoncerter + + + USA + + + 1970-1979 + + + diff --git a/etc/xsl/tmarc2.res.xml b/etc/xsl/tmarc2.res.xml new file mode 100644 index 0000000..bce5221 --- /dev/null +++ b/etc/xsl/tmarc2.res.xml @@ -0,0 +1,15 @@ + + + + Mimms + 1995 + Cry baby + Warm and soulful + Cry baby + Bury St. Edmunds + BGO + 1995 + book + no + + diff --git a/etc/xsl/tmarc2.xml b/etc/xsl/tmarc2.xml new file mode 100644 index 0000000..8f28780 --- /dev/null +++ b/etc/xsl/tmarc2.xml @@ -0,0 +1,102 @@ + + + + 01116nam0a32002171 450 + + 9 182 502 3 + 710100 + a + + + c + e + + + s + f + 1995 + gb + eng + 0 + + + s + xc + + + bef + + + Mimms + Garnet + + + Cry baby + Warm and soulful + Garnet Mimms ... [et al.] + + + Bury St. Edmunds + BGO + 1995 + + + 1 cd + + + Indspilninger publiceret 1963 (Cry baby) og 1965 (Warm and soulful) + + + Indhold: + + + BGO + BGOCD268 + + + 78.794 + 4 + + + soul + rhythm & blues + vokal + 1960-1969 + USA + + + 11 + Cry baby + Nobody but you + Until you were gone + Anytime you want me + So close + For your precious love + Baby don't you weep + A ¤quiet place + Cry to me + Don't change your heart + Wanting you + The ¤truth hurts + I'll take good care of you + Looking for you + It won't hurt (half as much) + It was easier to hurt her + Thinkin' + Prove it to me + More than a miracle + As long as I have you + One girl + There goes my baby + It's just a matter of time + A ¤little bit of soap + Look away + I'll make it up to you + + + 40 + 0 + 1 girl + + + diff --git a/etc/xsl/tmarc3.res.xml b/etc/xsl/tmarc3.res.xml new file mode 100644 index 0000000..ddd115f --- /dev/null +++ b/etc/xsl/tmarc3.res.xml @@ -0,0 +1,19 @@ + + + + Byfornyelse ved Ibsen-Ringen + Byfornyelse ved Ibsen-Ringen + farvefoto + plan + snit + byfornyelse + sanering + Telje Torp Aasen Arkitektkontor + Telje Torp Aasen Arkitektkontor, Kristian Augustsgate 7B + Eng, Dagfin + Eng, Dagfin + anlund, Tom, Kristian Augustsgate, Pilestredet 19 + web + no + + diff --git a/etc/xsl/tmarc3.xml b/etc/xsl/tmarc3.xml new file mode 100644 index 0000000..84f8bbe --- /dev/null +++ b/etc/xsl/tmarc3.xml @@ -0,0 +1,122 @@ + + + + 00914naa a2200337 450 + + a00001508 + a + + + i + n + + + 1991 + xx + nor + a + 9 + + + a + xx + + + nor + + + eng + + + 06 + + + Byfornyelse ved Ibsen-Ringen + + + farvefoto + plan + snit + + + Byggekunst + 1991 + 1/2 + 41-45 + + + byfornyelse + + + sanering + + + Norge + + + Oslo + + + Telje Torp Aasen Arkitektkontor + Kristian Augustsgate 7B + + + Eng, Dagfin + + + anlund, Tom + Kristian Augustsgate + Pilestredet 19 + + + a + + + + + + ITM + ARK50 + 0000145 + 1991 + 1/2 + 41-45 + + + + + 20020111 + ARK01 + 2002 + + + + + 20020111 + ARK01 + 2116 + + + + + 20021002 + ARK01 + 1000 + + + ICLLOAD + 00 + 20021122 + ARK01 + 1948 + + + 20030618 + ARK01 + 1330 + + + a00001508 + + + diff --git a/etc/xsl/tmarc4.res.xml b/etc/xsl/tmarc4.res.xml new file mode 100644 index 0000000..966fc24 --- /dev/null +++ b/etc/xsl/tmarc4.res.xml @@ -0,0 +1,7 @@ + + + + other + no + + diff --git a/etc/xsl/tmarc4.xml b/etc/xsl/tmarc4.xml new file mode 100644 index 0000000..dadbd7b --- /dev/null +++ b/etc/xsl/tmarc4.xml @@ -0,0 +1,11 @@ + + + + + + + 009140091a22a 22003370 + + + + diff --git a/etc/xsl/tmarc5.res.xml b/etc/xsl/tmarc5.res.xml new file mode 100644 index 0000000..5fa0c5b --- /dev/null +++ b/etc/xsl/tmarc5.res.xml @@ -0,0 +1,20 @@ + + + + 000277485 + Μαρούδης, Κωνσταντίνος Ιω + 1894 + Ελληνικόν κρυπτογραφικόν λεξικόν / + Κωνστ. Ι. Μαρούδης. + Ελληνικόν κρυπτογραφικόν λεξικόν / + Αθήνα, + 1894. + 248 σελ. + Greek language, Modern + Greek language, Modern, Dialects, Dictionaries + Cryptography. + Cryptography. + book + no + + diff --git a/etc/xsl/tmarc5.xml b/etc/xsl/tmarc5.xml new file mode 100644 index 0000000..89343ab --- /dev/null +++ b/etc/xsl/tmarc5.xml @@ -0,0 +1,33 @@ + + + 00492nam a22001455a 4500 + 000277485 + 20051026111436.0 + 050413s1894 gr 000 0 gre d + + Μαρούδης, Κωνσταντίνος Ιω + + + Ελληνικόν κρυπτογραφικόν λεξικόν / + Κωνστ. Ι. Μαρούδης. + + + εκδ. + + + Αθήνα, + 1894. + + + 248 σελ. + + + Greek language, Modern + Dialects + Dictionaries + + + Cryptography. + + + diff --git a/etc/xsl/tmarc6.res.xml b/etc/xsl/tmarc6.res.xml new file mode 100644 index 0000000..5665ab0 --- /dev/null +++ b/etc/xsl/tmarc6.res.xml @@ -0,0 +1,14 @@ + + + + 11224466 + 11224466 + Jack Collins + How to program a computer + How to program a computer + Penguin + p. cm. + book + no + + diff --git a/etc/xsl/tmarc6.xml b/etc/xsl/tmarc6.xml new file mode 100644 index 0000000..70d23e7 --- /dev/null +++ b/etc/xsl/tmarc6.xml @@ -0,0 +1,34 @@ + + + 00366nam a22001698a 4500 + 11224466 + DLC + 00000000000000.0 + 910710c19910701nju 00010 eng + + 11224466 + + + DLC + DLC + + + 123-xyz + + + Jack Collins + + + How to program a computer + + + Penguin + + + 8710 + + + p. cm. + + + diff --git a/etc/xsl/tmarc7.res.xml b/etc/xsl/tmarc7.res.xml new file mode 100644 index 0000000..dc96c3a --- /dev/null +++ b/etc/xsl/tmarc7.res.xml @@ -0,0 +1,34 @@ + + + + 77123332 + 77123332 + 57779 + 90490 + 93202 + 2001 + Voyager Diacritic test -- New input 001 (SBIE). + Voyager Diacritic test -- New input 001 (SBIE). + ny : + ny, + 2001. + 100 p. ; + 12 cm. + New copy imported from file (8/12/99). + VOYAGER COLUMN 0 (NEW): Degree sign (°); Phono Copyright mark (℗); Copyright mark (©); Sharp (♯); Inverted Question mark (¿); Inverted Exclamation mark (¡). + VOYAGER COLUMN 1: Script L (ℓ); Polish L (Ł); Scandanavian O (Ø); D with Crossbar (Đ); Icelandic Thorn (Þ); AE Digraph (Æ); OE Digraph (Œ); Miagkii Znak (ʹ); Dot at Midline (·). + VOYAGER COLUMN 2: Musical Flat (♭); Patent Mark (®); Plus or Minus (±); O Hook (Ơ); U Hook (Ư); Alif (ʼ); alpha α; Ayn (ʻ); Polish l (ł). + VOYAGER COLUMN 3: Scandanavian o (ø); d with crossbar (đ); Icelandic Thorn (þ); ae Digraph (æ); oe Digraph (œ); Tverdii Znak (ʺ); Turkish i (ı); British Pound (£); eth (ð). + VOYAGER COLUMN 4: Dagger (DO NOT USE); o Hook (ơ); u Hook (ư); Beta β; Gamma γ; Superscript 0 (⁰); Superscript 1 (¹); Superscript 2 (²); Superscript 3 (³). + VOYAGER COLUMN 5: Superscript 4 (⁴); Superscript 5 (⁵); Superscript 6 (⁶); Superscript 7 (⁷); Superscript 8 (⁸); Superscript 9 (⁹); Superscript + (⁺); Superscript - (⁻); Superscript ( (⁽). + VOYAGER COLUMN 6: Superscript ) (⁾); Subscript 0 (₀); Subscript 1 (₁); Subscript 2 (₂); Subscript 3 (₃); Subscript 4 (₄); Subscript 5 (₅); Subscript 6 (₆); Subscript 7 (₇). + VOYAGER COLUMN 7: Subscript 8 (₈); Subscript 9 (₉); Subscript + (₊); Subscript - (₋); Subscript ( (₍); Subscript ) (₎); Pseudo Question Mark (ỏ); Grave (ò); Acute (ó). + VOYAGER COLUMN 8: Circumflex (ô); Tilde (õ); Macron (ō); Breve (ŏ); Superior Dot (ȯ); Umlaut (ö); Hacek (ǒ); Circle Above (o̊); Ligature left (o͡). + VOYAGER COLUMN 9: Ligature right (o) ; High Comma off center (o̕); Double Acute (ő); Candrabindu (o̐); Cedilla (o̧); Right Hook (ǫ); Dot Below (ọ); Double Dot Below (o̤); Circle Below (o̥). + VOYAGER COLUMN 10: Double Underscore (o̳); Underscore (o̲); Left Hook (o̦); Right Cedilla (o̜); Upadhmaniya (o̮); Double Tilde 1st half (o͠); Double Tilde 2nd half (o) ; High Comma centered (o̓). + VOYAGER PC Keyboard: Spacing Circumflex (^); Spacing Underscore (_); Spacing Grave (`); Open Curly Bracket ({); Close Curly Bracket (}); Spacing Tilde (~). + Standard PC Keyboard: 1234567890-= !@#$%^&*()_+ qwertyuiop[]\ QWERTYUIOP{}| asdfghjkl;' ASDFGHJKL:" zxcvbnm,./ ZXCVBNM<>? + book + no + + diff --git a/etc/xsl/tmarc7.xml b/etc/xsl/tmarc7.xml new file mode 100644 index 0000000..2acb7d2 --- /dev/null +++ b/etc/xsl/tmarc7.xml @@ -0,0 +1,88 @@ + + + 03114cam a2200349 i 4500 + 77123332 + DLC + 20051218154744.0 + 981008b2001 ilu 000 0 eng + + 57779 + + + 90490 + + + 93202 + + + DLC + DLC + + + 0 + und + orignew + u + ncip + 19 + y-gencatlg + + + 77123332 + + + Voyager Diacritic test -- New input 001 (SBIE). + + + ny : + ny, + 2001. + + + 100 p. ; + 12 cm. + + + New copy imported from file (8/12/99). + + + VOYAGER COLUMN 0 (NEW): Degree sign (°); Phono Copyright mark (℗); Copyright mark (©); Sharp (♯); Inverted Question mark (¿); Inverted Exclamation mark (¡). + + + VOYAGER COLUMN 1: Script L (ℓ); Polish L (Ł); Scandanavian O (Ø); D with Crossbar (Đ); Icelandic Thorn (Þ); AE Digraph (Æ); OE Digraph (Œ); Miagkii Znak (ʹ); Dot at Midline (·). + + + VOYAGER COLUMN 2: Musical Flat (♭); Patent Mark (®); Plus or Minus (±); O Hook (Ơ); U Hook (Ư); Alif (ʼ); alpha α; Ayn (ʻ); Polish l (ł). + + + VOYAGER COLUMN 3: Scandanavian o (ø); d with crossbar (đ); Icelandic Thorn (þ); ae Digraph (æ); oe Digraph (œ); Tverdii Znak (ʺ); Turkish i (ı); British Pound (£); eth (ð). + + + VOYAGER COLUMN 4: Dagger (DO NOT USE); o Hook (ơ); u Hook (ư); Beta β; Gamma γ; Superscript 0 (⁰); Superscript 1 (¹); Superscript 2 (²); Superscript 3 (³). + + + VOYAGER COLUMN 5: Superscript 4 (⁴); Superscript 5 (⁵); Superscript 6 (⁶); Superscript 7 (⁷); Superscript 8 (⁸); Superscript 9 (⁹); Superscript + (⁺); Superscript - (⁻); Superscript ( (⁽). + + + VOYAGER COLUMN 6: Superscript ) (⁾); Subscript 0 (₀); Subscript 1 (₁); Subscript 2 (₂); Subscript 3 (₃); Subscript 4 (₄); Subscript 5 (₅); Subscript 6 (₆); Subscript 7 (₇). + + + VOYAGER COLUMN 7: Subscript 8 (₈); Subscript 9 (₉); Subscript + (₊); Subscript - (₋); Subscript ( (₍); Subscript ) (₎); Pseudo Question Mark (ỏ); Grave (ò); Acute (ó). + + + VOYAGER COLUMN 8: Circumflex (ô); Tilde (õ); Macron (ō); Breve (ŏ); Superior Dot (ȯ); Umlaut (ö); Hacek (ǒ); Circle Above (o̊); Ligature left (o͡). + + + VOYAGER COLUMN 9: Ligature right (o) ; High Comma off center (o̕); Double Acute (ő); Candrabindu (o̐); Cedilla (o̧); Right Hook (ǫ); Dot Below (ọ); Double Dot Below (o̤); Circle Below (o̥). + + + VOYAGER COLUMN 10: Double Underscore (o̳); Underscore (o̲); Left Hook (o̦); Right Cedilla (o̜); Upadhmaniya (o̮); Double Tilde 1st half (o͠); Double Tilde 2nd half (o) ; High Comma centered (o̓). + + + VOYAGER PC Keyboard: Spacing Circumflex (^); Spacing Underscore (_); Spacing Grave (`); Open Curly Bracket ({); Close Curly Bracket (}); Spacing Tilde (~). + + + Standard PC Keyboard: 1234567890-= !@#$%^&*()_+ qwertyuiop[]\ QWERTYUIOP{}| asdfghjkl;' ASDFGHJKL:" zxcvbnm,./ ZXCVBNM<>? + + + diff --git a/etc/xsl/tmarc8.res.xml b/etc/xsl/tmarc8.res.xml new file mode 100644 index 0000000..609ae7b --- /dev/null +++ b/etc/xsl/tmarc8.res.xml @@ -0,0 +1,42 @@ + + + + UCD-002592301 + 99851339eo + Clinton, Atkinson. + 1583? + Clinton, Purser & Arnold, to their countreymen wheresoeuer + Wherein is described by their own hands their vnfeigned penitence for their offences past: their patience in welcoming their death, & their duetiful minds towardes her most excellent Maiestie + [electronic resource] : + Clinton, Purser & Arnold, to their countreymen wheresoeuer Wherein is described by their own hands their vnfeigned penitence for their offences past: their patience in welcoming their death, & their duetiful minds towardes her most excellent Maiestie + London : + Imprinted by Iohn Wolfe and are to be sold [by W. Wright] at the middle shop in the Poultry, ioyning S. Mildreds Church, + [1583?] + [12] p + In verse + The first poem is signed: Thomas Walton alias Purser + Clinton's full name and bookseller's name from, and publication date conjectured by, STC + Signatures: A⁴ B² + Reproduction of the original in the Bodleian Library + Electronic texts. + Electronic texts., local + Pirates + Pirates, England, Early works to 1800. + http://gateway.proquest.com/openurl?ctx_ver=Z39.88-2003&res_id=xri:eebo&rft_val_fmt=&rft_id=xri:eebo:image:16610 + Get resource + Restricted to UC campuses + http://gateway.proquest.com/openurl?ctx_ver=Z39.88-2003&res_id=xri:eebo&rft_val_fmt=&rft_id=xri:eebo:image:16610 + Get resource + Restricted to UC campuses + http://gateway.proquest.com/openurl?ctx_ver=Z39.88-2003&res_id=xri:eebo&rft_val_fmt=&rft_id=xri:eebo:image:16610 + Get resource + Restricted to UC campuses + http://gateway.proquest.com/openurl?ctx_ver=Z39.88-2003&res_id=xri:eebo&rft_val_fmt=&rft_id=xri:eebo:image:16610 + Get resource + Restricted to UC campuses + Internet + book (electronic) + no + DVXL + + diff --git a/etc/xsl/tmarc8.xml b/etc/xsl/tmarc8.xml new file mode 100644 index 0000000..b1e7c76 --- /dev/null +++ b/etc/xsl/tmarc8.xml @@ -0,0 +1,141 @@ + + + 02647nam^a2200469^^^4500 + UCD-002592301 + 20061209034435.0 + m d + cr bn |||a|bb| + 920330s1583 enk s 000 0 eng d + + 99851339eo + + + CL0036000039 + ProQuest Information and Learning. 300 N. Zeeb Rd., Ann Arbor, MI 48106 + + + Cu-RivES + Cu-RivES + CStRLIN + dcrb + WaOLN + + + Clinton, Atkinson. + + + Clinton, Purser & Arnold, to their countreymen wheresoeuer + [electronic resource] : + Wherein is described by their own hands their vnfeigned penitence for their offences past: their patience in welcoming their death, & their duetiful minds towardes her most excellent Maiestie + + + Clinton, Purser & Arnold, to their countreymen wheresoever + + + Clinton, Purser & Arnold, to their countreymen wheresoever + + + London : + Imprinted by Iohn Wolfe and are to be sold [by W. Wright] at the middle shop in the Poultry, ioyning S. Mildreds Church, + [1583?] + + + [12] p + + + In verse + + + The first poem is signed: Thomas Walton alias Purser + + + Clinton's full name and bookseller's name from, and publication date conjectured by, STC + + + Signatures: A⁴ B² + + + Reproduction of the original in the Bodleian Library + + + STC (2nd ed.) + 5431 + + + Also issued in print and on microform + + + Electronic reproduction. + Mode of access: World Wide Web. + Restricted to UC campuses + + + Electronic texts. + local + + + Pirates + England + Early works to 1800. + + + Walton, Thomas, + fl. 1583. + aut + + + Arnold, + fl. 1583. + aut + + + Early English books online + + + MER + kmain + + + SCB + nnet + + + Restricted to UC campuses + SCP UCSD + http://gateway.proquest.com/openurl?ctx_ver=Z39.88-2003&res_id=xri:eebo&rft_val_fmt=&rft_id=xri:eebo:image:16610 + + + Restricted to UC campuses + SCP UCSD + http://gateway.proquest.com/openurl?ctx_ver=Z39.88-2003&res_id=xri:eebo&rft_val_fmt=&rft_id=xri:eebo:image:16610 + + + DVXL + ELECT-GEN + Internet + + + LAGE + in + Online access + + + Restricted to UC campuses + SCP UCSD + http://gateway.proquest.com/openurl?ctx_ver=Z39.88-2003&res_id=xri:eebo&rft_val_fmt=&rft_id=xri:eebo:image:16610 + + + Restricted to UC campuses + http://gateway.proquest.com/openurl?ctx_ver=Z39.88-2003&res_id=xri:eebo&rft_val_fmt=&rft_id=xri:eebo:image:16610 + CDL + + + Early English books, 1475-1640 ; + 1406:13. + + + DVXL + 002592301 + + + diff --git a/etc/xsl/tmarc9.res.xml b/etc/xsl/tmarc9.res.xml new file mode 100644 index 0000000..e545673 --- /dev/null +++ b/etc/xsl/tmarc9.res.xml @@ -0,0 +1,32 @@ + + + + 2005336282 + (OCoLC)170490164 + 2005336282 + (OCoLC)170490164 + 2005- + Qaḍāʼ al-usrah : + majallah mutakhaṣṣiṣah / + Wizārat al-ʻAdl. + Qaḍāʼ al-usrah : majallah mutakhaṣṣiṣah / + al-Rabāṭ : + Jamʻīyat Nashr al-Maʻlūmah al-Qānūnīyah wa-al-Qaḍāʼīyah, + 2005- + v. : + ill. ; + 24 cm. + Some issues have also a distinctive title. + Latest issue consulted: al-ʻAdad 3. (Dujanbir 2006). + Domestic relations (Islamic law) + Domestic relations (Islamic law), Morocco. + Divorce (Islamic law) + Divorce (Islamic law) + Marriage law + Marriage law, Morocco. + Law reports, digests, etc. + Law reports, digests, etc., Morocco. + journal + no + + diff --git a/etc/xsl/tmarc9.xml b/etc/xsl/tmarc9.xml new file mode 100644 index 0000000..7e070cc --- /dev/null +++ b/etc/xsl/tmarc9.xml @@ -0,0 +1,157 @@ + + + 02075cas a22005055a 4500 + 2005336282 + DLC + 20070911033614.0 + 070910c20059999mr uu p f0 0ara + + 2005336282 + + + -3-7-0709110002-p----- + + + (OCoLC)170490164 + + + 7 + und + serials + u + ncip + 19 + n-oclcserc + + + DLC + DLC + DLC + + + ara + fre + + + lc + + + f-mr--- + + + IN PROCESS + + + (3 + + + 880-01 + Qaḍāʼ al-usrah : + majallah mutakhaṣṣiṣah / + Wizārat al-ʻAdl. + + + Justice de la famille + + + 880-02 + Majallat Qaḍāʼ al-usrah + <2006> + + + 880-03 + al-Rabāṭ : + Jamʻīyat Nashr al-Maʻlūmah al-Qānūnīyah wa-al-Qaḍāʼīyah, + 2005- + + + v. : + ill. ; + 24 cm. + + + Irregular (semiannual) + + + 880-04 + al-ʻAdad 1. (Yūlyūz 2005)- + + + 880-05 + Manshūrāt Jamʻīyat Nashr al-Maʻlūmah al-Qānūnīyah wa-al-Qaḍāʼīyah + + + Some issues have also a distinctive title. + + + Latest issue consulted: al-ʻAdad 3. (Dujanbir 2006). + + + Chiefly in Arabic; some French. + + + Domestic relations (Islamic law) + Morocco. + + + Divorce (Islamic law) + + + Marriage law + Morocco. + + + Law reports, digests, etc. + Morocco. + + + 880-06 + Jamʻīyat Nashr al-Maʻlūmah al-Qānūnīyah wa-al-Qaḍāʼīyah. + + + 880-07 + Morocco. + Wizārat al-ʻAdl. + + + DLC + + + 245-01/(3/r + قضاء الأسرة : + مجلة متخصصة / + وزارة العدل. + + + 246-02/(3/r + مجلة قضاء الأسرة + <2006> + + + 260-03/(3/r + الرباط : + جمعية نشر المعلومة القانونية والقضائية، + 2005- + + + 362-04/(3/r + العدد 1. (يوليوز 2005)- + + + 490-05/(3/r + منشورات جمعية نشر المعلومة القانونية والقضائية + + + 710-06/(3/r + جمعية نشر المعلومة القانونية والقضائية. + + + 710-07/(3/r + Morocco. + وزارة العدل. + + + LC Cairo Office [we 45] + + + diff --git a/etc/xsl/unimarc.xsl b/etc/xsl/unimarc.xsl new file mode 100644 index 0000000..4842e24 --- /dev/null +++ b/etc/xsl/unimarc.xsl @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + , + + + + + + + + + + + + + + + + + diff --git a/js/pz2.js b/js/pz2.js index 59c501d..fb6264c 100644 --- a/js/pz2.js +++ b/js/pz2.js @@ -769,7 +769,7 @@ pz2.prototype = ** AJAX HELPER CLASS *********************************************************** ******************************************************************************** */ -var pzHttpRequest = function (url, errorHandler, cookieDomain) { +var pzHttpRequest = function (url, errorHandler, cookieDomain, windowId) { this.maxUrlLength = 2048; this.request = null; this.url = url; @@ -779,6 +779,7 @@ var pzHttpRequest = function (url, errorHandler, cookieDomain) { this.isXDR = false; this.domainRegex = /https?:\/\/([^:/]+).*/; this.cookieDomain = cookieDomain || null; + this.windowId = windowId || window.name; var xhr = new XMLHttpRequest(); var domain = this._getDomainFromUrl(url); @@ -906,9 +907,9 @@ pzHttpRequest.prototype = //session cookie, resend it var domain = this._getDomainFromUrl(url); if (domain && this._isCrossDomain(domain) && - this.getCookie(domain+":SESSID")) { + this.getCookie(domain+":"+this.windowId+":SESSID")) { //rewrite the URL - var sessparam = ';jsessionid=' + this.getCookie(domain+":SESSID"); + var sessparam = ';jsessionid=' + this.getCookie(domain+":"+this.windowId+":SESSID"); var q = url.indexOf('?'); if (q == -1) { url += sessparam; @@ -1020,7 +1021,7 @@ pzHttpRequest.prototype = var jsessionId = this.request.responseXML .documentElement.getAttribute('jsessionId'); if (jsessionId) - this.setCookie(domain+":SESSID", jsessionId); + this.setCookie(domain+":"+this.windowId+":SESSID", jsessionId); } this.callback(this.request.responseXML); } else { diff --git a/pazpar2.spec b/pazpar2.spec index c4ee13d..5bf759e 100644 --- a/pazpar2.spec +++ b/pazpar2.spec @@ -13,6 +13,7 @@ Packager: Adam Dickmeiss URL: http://www.indexdata.com/pazpar2 Summary: pazpar2 daemon Requires: libyaz5 >= 5.0.0 +Requires: pazpar2-xsl %description Pazpar2 is a high-performance, user interface-independent, data @@ -25,6 +26,14 @@ Group: Data Requires: pazpar2 %post +for f in /usr/share/pazpar2/xsl/*.xsl; do + e=/etc/pazpar2/`basename $f` + if test -f $e; then + if diff $e $f >/dev/null; then + rm $e + fi + fi +done if [ $1 = 1 ]; then /sbin/chkconfig --add pazpar2 /sbin/service pazpar2 start > /dev/null 2>&1 @@ -52,6 +61,14 @@ if [ $1 = 0 ]; then rm /etc/httpd/conf.d/pazpar2-js.conf fi fi +%package -n pazpar2-xsl +Summary: XSLTs for converting to pz2 format +Group: Data + +%description -n pazpar2-xsl +This package includes XSLTs for converting from various input XML formats +to Pazpar2's internal XML format. + %package -n pazpar2-doc Summary: pazpar2 documentation Group: Data @@ -81,7 +98,8 @@ cp etc/default.xml ${RPM_BUILD_ROOT}/etc/pazpar2/services-available/ cp etc/services/*.xml ${RPM_BUILD_ROOT}/etc/pazpar2/services-available/ cp etc/settings/*.xml ${RPM_BUILD_ROOT}/etc/pazpar2/settings/ cp -r etc/settings/mkc ${RPM_BUILD_ROOT}/etc/pazpar2/settings -cp etc/*.xsl ${RPM_BUILD_ROOT}/etc/pazpar2/ +mkdir -p ${RPM_BUILD_ROOT}/usr/share/pazpar2/xsl +cp etc/xsl/*.xsl ${RPM_BUILD_ROOT}/usr/share/pazpar2/xsl mkdir -p ${RPM_BUILD_ROOT}/etc/rc.d/init.d install -m755 rpm/pazpar2.init ${RPM_BUILD_ROOT}/etc/rc.d/init.d/pazpar2 echo "Alias /pazpar2 /usr/share/pazpar2" >${RPM_BUILD_ROOT}/etc/pazpar2/ap2pazpar2-js.cfg @@ -101,7 +119,6 @@ rm -fr ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/pazpar2/services-enabled %dir %{_sysconfdir}/pazpar2/services-available %config %{_sysconfdir}/pazpar2/*.xml -%config %{_sysconfdir}/pazpar2/*.xsl %config %{_sysconfdir}/pazpar2/settings/*.xml %config %{_sysconfdir}/pazpar2/settings/*/*.xml %config %{_sysconfdir}/pazpar2/services-available/*.xml @@ -116,6 +133,10 @@ rm -fr ${RPM_BUILD_ROOT} %{_datadir}/pazpar2/js/pz2.js %config %{_sysconfdir}/pazpar2/ap2pazpar2-js.cfg +%files -n pazpar2-xsl +%defattr(-,root,root) +%{_datadir}/pazpar2/xsl + %files -n pazpar2-doc %defattr(-,root,root) %{_defaultdocdir}/pazpar2 diff --git a/src/client.c b/src/client.c index 8ad2220..8686ec7 100644 --- a/src/client.c +++ b/src/client.c @@ -868,6 +868,7 @@ int client_start_search(struct client *cl) if (cl->same_search == 1 && rc_prep_connection == 2) { session_log(se, YLOG_LOG, "client %s resuse result", client_get_id(cl)); + client_report_facets(cl, cl->resultset); return client_reingest(cl); } else if (!rc_prep_connection) diff --git a/src/connection.c b/src/connection.c index 630db75..15bfc56 100644 --- a/src/connection.c +++ b/src/connection.c @@ -330,6 +330,7 @@ static int connection_connect(struct connection *con, iochan_man_t iochan_man) struct session_database *sdb = client_get_database(con->client); const char *apdulog = session_setting_oneval(sdb, PZ_APDULOG); const char *memcached = session_setting_oneval(sdb, PZ_MEMCACHED); + const char *redis = session_setting_oneval(sdb, PZ_REDIS); assert(con); @@ -341,6 +342,8 @@ static int connection_connect(struct connection *con, iochan_man_t iochan_man) ZOOM_options_set(zoptions, "charset", charset); if (memcached && *memcached) ZOOM_options_set(zoptions, "memcached", memcached); + if (redis && *redis) + ZOOM_options_set(zoptions, "redis", redis); if (con->zproxy) { diff --git a/src/database.c b/src/database.c index 681503a..2064fee 100644 --- a/src/database.c +++ b/src/database.c @@ -200,11 +200,18 @@ static struct database_criterion *create_database_criterion(NMEM m, int subi; struct database_criterion *new = nmem_malloc(m, sizeof(*new)); char *eq; - if ((eq = strchr(values[i], '='))) - new->type = PAZPAR2_STRING_MATCH; - else if ((eq = strchr(values[i], '~'))) - new->type = PAZPAR2_SUBSTRING_MATCH; - else + for (eq = values[i]; *eq; eq++) + if (*eq == '=') + { + new->type = PAZPAR2_STRING_MATCH; + break; + } + else if (*eq == '~') + { + new->type = PAZPAR2_SUBSTRING_MATCH; + break; + } + if (!*eq) { yaz_log(YLOG_WARN, "Missing equal-sign/tilde in filter"); return 0; diff --git a/src/normalize_record.c b/src/normalize_record.c index 373cf6c..ea15f46 100644 --- a/src/normalize_record.c +++ b/src/normalize_record.c @@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA struct normalize_step { struct normalize_step *next; - xsltStylesheet *stylesheet; /* created by normalize_record */ + xsltStylesheet *stylesheet1; /* created by normalize_record */ xsltStylesheet *stylesheet2; /* external stylesheet (service) */ struct marcmap *marcmap; }; @@ -66,15 +66,16 @@ normalize_record_t normalize_record_create(struct conf_service *service, if (!xsp_doc) no_errors++; + else { *m = nmem_malloc(nt->nmem, sizeof(**m)); (*m)->marcmap = NULL; - (*m)->stylesheet = NULL; + (*m)->stylesheet1 = NULL; (*m)->stylesheet2 = NULL; - (*m)->stylesheet = xsltParseStylesheetDoc(xsp_doc); - if (!(*m)->stylesheet) + (*m)->stylesheet1 = xsltParseStylesheetDoc(xsp_doc); + if (!(*m)->stylesheet1) no_errors++; m = &(*m)->next; } @@ -92,14 +93,14 @@ normalize_record_t normalize_record_create(struct conf_service *service, *m = nmem_malloc(nt->nmem, sizeof(**m)); (*m)->marcmap = NULL; - (*m)->stylesheet = NULL; + (*m)->stylesheet1 = NULL; (*m)->stylesheet2 = service_xslt_get(service, stylesheets[i]); if ((*m)->stylesheet2) ; else if (!strcmp(&stylesheets[i][strlen(stylesheets[i])-4], ".xsl")) { - if (!((*m)->stylesheet = + if (!((*m)->stylesheet1 = xsltParseStylesheetFile((xmlChar *) wrbuf_cstr(fname)))) { yaz_log(YLOG_FATAL|YLOG_ERRNO, "Unable to load stylesheet: %s", @@ -143,8 +144,8 @@ void normalize_record_destroy(normalize_record_t nt) struct normalize_step *m; for (m = nt->steps; m; m = m->next) { - if (m->stylesheet) - xsltFreeStylesheet(m->stylesheet); + if (m->stylesheet1) + xsltFreeStylesheet(m->stylesheet1); } nmem_destroy(nt->nmem); } @@ -160,8 +161,8 @@ int normalize_record_transform(normalize_record_t nt, xmlDoc **doc, { xmlNodePtr root = 0; xmlDoc *ndoc; - if (m->stylesheet) - ndoc = xsltApplyStylesheet(m->stylesheet, *doc, parms); + if (m->stylesheet1) + ndoc = xsltApplyStylesheet(m->stylesheet1, *doc, parms); else if (m->stylesheet2) ndoc = xsltApplyStylesheet(m->stylesheet2, *doc, parms); else if (m->marcmap) diff --git a/src/pazpar2_config.c b/src/pazpar2_config.c index 82ce585..c8ae0a8 100644 --- a/src/pazpar2_config.c +++ b/src/pazpar2_config.c @@ -54,6 +54,7 @@ struct conf_config int no_threads; WRBUF confdir; + char *path; iochan_man_t iochan_man; }; @@ -255,13 +256,20 @@ int conf_service_sortkey_field_id(struct conf_service *service, static void conf_dir_path(struct conf_config *config, WRBUF w, const char *src) { - if (config->confdir && wrbuf_len(config->confdir) > 0 && - !yaz_is_abspath(src)) + char full_path[1024]; + if (yaz_filepath_resolve(src, config->path, + wrbuf_len(config->confdir) > 0 ? + wrbuf_cstr(config->confdir) : ".", + full_path)) { - wrbuf_printf(w, "%s/%s", wrbuf_cstr(config->confdir), src); + wrbuf_puts(w, full_path); } else + { + yaz_log(YLOG_WARN, "File not found: fname=%s path=%s base=%s", src, + config->path, wrbuf_cstr(config->confdir)); wrbuf_puts(w, src); + } } void service_destroy(struct conf_service *service) @@ -1242,6 +1250,15 @@ static int parse_config(struct conf_config *config, xmlNode *root) xmlFree(number); } } + else if (!strcmp((const char *) n->name, "file")) + { + xmlChar *path = xmlGetProp(n, (xmlChar *) "path"); + if (path) + { + config->path = nmem_strdup(config->nmem, (const char *) path); + xmlFree(path); + } + } else if (!strcmp((const char *) n->name, "targetprofiles")) { yaz_log(YLOG_FATAL, "targetprofiles unsupported here. Must be part of service"); @@ -1288,6 +1305,7 @@ struct conf_config *config_create(const char *fname, int verbose) config->nmem = nmem; config->servers = 0; + config->path = nmem_strdup(nmem, "."); config->no_threads = 0; config->iochan_man = 0; diff --git a/src/settings.c b/src/settings.c index e8d6125..a17d094 100644 --- a/src/settings.c +++ b/src/settings.c @@ -85,6 +85,7 @@ static char *hard_settings[] = { "pz:authentication_mode", "pz:native_score", "pz:memcached", + "pz:redis", 0 }; diff --git a/src/settings.h b/src/settings.h index 3f306a0..de43d28 100644 --- a/src/settings.h +++ b/src/settings.h @@ -58,6 +58,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define PZ_AUTHENTICATION_MODE 35 #define PZ_NATIVE_SCORE 36 #define PZ_MEMCACHED 37 +#define PZ_REDIS 38 #define PZ_MAX_EOF 39 struct setting diff --git a/test/Makefile.am b/test/Makefile.am index 607b06d..f33c0b0 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -4,7 +4,7 @@ solr_tests = test_solr.sh test_termlist_block.sh test_limit_limitmap.sh test_sort.sh check_SCRIPTS = test_http.sh test_icu.sh test_post.sh \ test_settings.sh test_turbomarcxml.sh test_facets.sh \ - test_url.sh test_filter.sh test_tmarc.sh test_sru.sh \ + test_url.sh test_filter.sh test_sru.sh \ $(solr_tests) EXTRA_DIST = run_pazpar2.sh marc21_test.xsl tmarc.xsl solr-pz2.xsl \ @@ -49,5 +49,3 @@ dist-hook: cp ${srcdir}/test_*.res $(distdir) mkdir $(distdir)/set2 cp ${srcdir}/set2/*.xml $(distdir)/set2 - cp ${srcdir}/tmarc?.xml $(distdir) - cp ${srcdir}/tmarc?.res.xml $(distdir) diff --git a/test/test_facets.urls b/test/test_facets.urls index 5f087c0..bf2924b 100644 --- a/test/test_facets.urls +++ b/test/test_facets.urls @@ -23,3 +23,5 @@ test_facets_settings_2.xml http://localhost:9763/search.pz2?session=2&command=se http://localhost:9763/search.pz2?session=2&command=search&query=9+and+computer 10 http://localhost:9763/search.pz2?session=2&command=show&block=1 http://localhost:9763/search.pz2?session=2&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate%2Cmedium +http://localhost:9763/search.pz2?session=2&command=search&query=9+and+computer +http://localhost:9763/search.pz2?session=2&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate%2Cmedium diff --git a/test/test_facets_26.res b/test/test_facets_26.res new file mode 100644 index 0000000..ab63fe6 --- /dev/null +++ b/test/test_facets_26.res @@ -0,0 +1,2 @@ + +OK \ No newline at end of file diff --git a/test/test_facets_27.res b/test/test_facets_27.res new file mode 100644 index 0000000..c259c84 --- /dev/null +++ b/test/test_facets_27.res @@ -0,0 +1,49 @@ + +0 + + +localhost:9999/db1 +db1 +9 +Client_Idle +0 + + + +author0100 +author190 +author280 +author370 +author460 +author550 +author640 +author730 +author820 +author910 + + +subject0100 +subject190 +subject280 +subject370 +subject460 +subject550 +subject640 +subject730 +subject820 +subject910 + + +date0100 +date190 +date280 +date370 +date460 +date550 +date640 +date730 +date820 +date910 + + + \ No newline at end of file diff --git a/test/test_facets_settings_1.xml b/test/test_facets_settings_1.xml index 1fd7ade..9ce9297 100644 --- a/test/test_facets_settings_1.xml +++ b/test/test_facets_settings_1.xml @@ -1,4 +1,3 @@ - diff --git a/test/test_facets_settings_2.xml b/test/test_facets_settings_2.xml index 00a4286..04df40a 100644 --- a/test/test_facets_settings_2.xml +++ b/test/test_facets_settings_2.xml @@ -1,4 +1,3 @@ - diff --git a/test/test_limit_limitmap_settings_2.xml b/test/test_limit_limitmap_settings_2.xml index 656062a..1eb610b 100644 --- a/test/test_limit_limitmap_settings_2.xml +++ b/test/test_limit_limitmap_settings_2.xml @@ -1,4 +1,3 @@ - diff --git a/test/test_rank_settings_1.xml b/test/test_rank_settings_1.xml index 6ca8973..a1e53bd 100644 --- a/test/test_rank_settings_1.xml +++ b/test/test_rank_settings_1.xml @@ -1,4 +1,3 @@ - @@ -9,7 +8,6 @@ - diff --git a/test/test_rank_settings_2.xml b/test/test_rank_settings_2.xml index a003e95..565a56e 100644 --- a/test/test_rank_settings_2.xml +++ b/test/test_rank_settings_2.xml @@ -1,10 +1,9 @@ - - + diff --git a/test/test_rank_settings_3.xml b/test/test_rank_settings_3.xml index 3f51f26..87d2c5c 100644 --- a/test/test_rank_settings_3.xml +++ b/test/test_rank_settings_3.xml @@ -1,10 +1,8 @@ - - diff --git a/test/test_rank_settings_4.xml b/test/test_rank_settings_4.xml index edd80df..d09ab81 100644 --- a/test/test_rank_settings_4.xml +++ b/test/test_rank_settings_4.xml @@ -1,10 +1,8 @@ - - diff --git a/test/test_solr_settings_1.xml b/test/test_solr_settings_1.xml index 79a56f6..9372ffc 100644 --- a/test/test_solr_settings_1.xml +++ b/test/test_solr_settings_1.xml @@ -1,4 +1,3 @@ - diff --git a/test/test_solr_settings_2.xml b/test/test_solr_settings_2.xml index b170c67..ce5107c 100644 --- a/test/test_solr_settings_2.xml +++ b/test/test_solr_settings_2.xml @@ -1,4 +1,3 @@ - \ No newline at end of file diff --git a/test/test_solr_settings_3.xml b/test/test_solr_settings_3.xml index 579c2bf..f159d33 100644 --- a/test/test_solr_settings_3.xml +++ b/test/test_solr_settings_3.xml @@ -1,4 +1,3 @@ - diff --git a/test/test_solr_settings_4.xml b/test/test_solr_settings_4.xml index 867c513..b9276ef 100644 --- a/test/test_solr_settings_4.xml +++ b/test/test_solr_settings_4.xml @@ -1,5 +1,4 @@ - - + diff --git a/test/test_solr_settings_5.xml b/test/test_solr_settings_5.xml index 2aa611b..454c802 100644 --- a/test/test_solr_settings_5.xml +++ b/test/test_solr_settings_5.xml @@ -1,5 +1,4 @@ - - + diff --git a/test/test_solr_settings_6.xml b/test/test_solr_settings_6.xml index 89ab7ff..75f5aa7 100644 --- a/test/test_solr_settings_6.xml +++ b/test/test_solr_settings_6.xml @@ -1,8 +1,7 @@ - - - - - + + + + diff --git a/test/test_sort_settings.xml b/test/test_sort_settings.xml index 3cb9c71..f22d1dd 100644 --- a/test/test_sort_settings.xml +++ b/test/test_sort_settings.xml @@ -1,4 +1,3 @@ - diff --git a/test/test_termlist_block_settings_2.xml b/test/test_termlist_block_settings_2.xml index cb730b0..13ac378 100644 --- a/test/test_termlist_block_settings_2.xml +++ b/test/test_termlist_block_settings_2.xml @@ -1,4 +1,3 @@ - @@ -11,22 +10,8 @@ - - - - diff --git a/test/test_tmarc.sh b/test/test_tmarc.sh deleted file mode 100755 index b73b597..0000000 --- a/test/test_tmarc.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -res=0 -for m in tmarc?.xml; do - b=`basename $m .xml` - l=$b.log.xml - r=$b.res.xml - d=$b.dif - xsltproc ../etc/tmarc.xsl $m >$l - if test -f $r; then - if diff $l $r >$d; then - rm $d - else - echo "$b: FAIL; check $d" - res=1 - fi - else - echo "$b: making $r for the first time" - mv $l $r - res=1 - fi -done -exit $res diff --git a/test/tmarc1.res.xml b/test/tmarc1.res.xml deleted file mode 100644 index d5c2397..0000000 --- a/test/tmarc1.res.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - Sloman - 2002 - On the road with Bob Dylan - On the road with Bob Dylan - Revised edition - New York - Three Rivers Press - 2002 - xv, 464 sider, tavler - Tidligere: 1. udgave. New York, Bantam, 1978 - book - no - - diff --git a/test/tmarc1.xml b/test/tmarc1.xml deleted file mode 100644 index dab3674..0000000 --- a/test/tmarc1.xml +++ /dev/null @@ -1,95 +0,0 @@ - - - - 00988nam0a32003011 450 - - 9 181 423 4 - 710100 - a - - - n - e - - - m - u - 2002 - us - eng - 0 - - - a - xx - - - 1-4000-4596-7 - $14,00 - - - DBC200439 - - - - Sloman - Larry - - - On the road with Bob Dylan - Larry "Ratso" Sloman - - - Revised edition - Three Rivers Press - - - New York - Three Rivers Press - 2002 - - - xv, 464 sider, tavler - - - Larry "Ratso" Slomans meget personlige beretning om Bob Dylans koncertturne i USA i 1975: "The Rolling Thunder revue" - - - På omslaget: With a new introduction by Kinky Friedman - - - Tidligere: 1. udgave. New York, Bantam, 1978 - - - - 99.4 - Dylan - Bob - - - 78.9064 - 5 - - - folkemusik - - - folkemusikere - - - rockmusik - - - rockmusikere - - - rockkoncerter - - - USA - - - 1970-1979 - - - diff --git a/test/tmarc2.res.xml b/test/tmarc2.res.xml deleted file mode 100644 index bce5221..0000000 --- a/test/tmarc2.res.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - Mimms - 1995 - Cry baby - Warm and soulful - Cry baby - Bury St. Edmunds - BGO - 1995 - book - no - - diff --git a/test/tmarc2.xml b/test/tmarc2.xml deleted file mode 100644 index 8f28780..0000000 --- a/test/tmarc2.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - - 01116nam0a32002171 450 - - 9 182 502 3 - 710100 - a - - - c - e - - - s - f - 1995 - gb - eng - 0 - - - s - xc - - - bef - - - Mimms - Garnet - - - Cry baby - Warm and soulful - Garnet Mimms ... [et al.] - - - Bury St. Edmunds - BGO - 1995 - - - 1 cd - - - Indspilninger publiceret 1963 (Cry baby) og 1965 (Warm and soulful) - - - Indhold: - - - BGO - BGOCD268 - - - 78.794 - 4 - - - soul - rhythm & blues - vokal - 1960-1969 - USA - - - 11 - Cry baby - Nobody but you - Until you were gone - Anytime you want me - So close - For your precious love - Baby don't you weep - A ¤quiet place - Cry to me - Don't change your heart - Wanting you - The ¤truth hurts - I'll take good care of you - Looking for you - It won't hurt (half as much) - It was easier to hurt her - Thinkin' - Prove it to me - More than a miracle - As long as I have you - One girl - There goes my baby - It's just a matter of time - A ¤little bit of soap - Look away - I'll make it up to you - - - 40 - 0 - 1 girl - - - diff --git a/test/tmarc3.res.xml b/test/tmarc3.res.xml deleted file mode 100644 index ddd115f..0000000 --- a/test/tmarc3.res.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - Byfornyelse ved Ibsen-Ringen - Byfornyelse ved Ibsen-Ringen - farvefoto - plan - snit - byfornyelse - sanering - Telje Torp Aasen Arkitektkontor - Telje Torp Aasen Arkitektkontor, Kristian Augustsgate 7B - Eng, Dagfin - Eng, Dagfin - anlund, Tom, Kristian Augustsgate, Pilestredet 19 - web - no - - diff --git a/test/tmarc3.xml b/test/tmarc3.xml deleted file mode 100644 index 84f8bbe..0000000 --- a/test/tmarc3.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - 00914naa a2200337 450 - - a00001508 - a - - - i - n - - - 1991 - xx - nor - a - 9 - - - a - xx - - - nor - - - eng - - - 06 - - - Byfornyelse ved Ibsen-Ringen - - - farvefoto - plan - snit - - - Byggekunst - 1991 - 1/2 - 41-45 - - - byfornyelse - - - sanering - - - Norge - - - Oslo - - - Telje Torp Aasen Arkitektkontor - Kristian Augustsgate 7B - - - Eng, Dagfin - - - anlund, Tom - Kristian Augustsgate - Pilestredet 19 - - - a - - - - - - ITM - ARK50 - 0000145 - 1991 - 1/2 - 41-45 - - - - - 20020111 - ARK01 - 2002 - - - - - 20020111 - ARK01 - 2116 - - - - - 20021002 - ARK01 - 1000 - - - ICLLOAD - 00 - 20021122 - ARK01 - 1948 - - - 20030618 - ARK01 - 1330 - - - a00001508 - - - diff --git a/test/tmarc4.res.xml b/test/tmarc4.res.xml deleted file mode 100644 index 966fc24..0000000 --- a/test/tmarc4.res.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - other - no - - diff --git a/test/tmarc4.xml b/test/tmarc4.xml deleted file mode 100644 index dadbd7b..0000000 --- a/test/tmarc4.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - 009140091a22a 22003370 - - - - diff --git a/test/tmarc5.res.xml b/test/tmarc5.res.xml deleted file mode 100644 index 5fa0c5b..0000000 --- a/test/tmarc5.res.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - 000277485 - Μαρούδης, Κωνσταντίνος Ιω - 1894 - Ελληνικόν κρυπτογραφικόν λεξικόν / - Κωνστ. Ι. Μαρούδης. - Ελληνικόν κρυπτογραφικόν λεξικόν / - Αθήνα, - 1894. - 248 σελ. - Greek language, Modern - Greek language, Modern, Dialects, Dictionaries - Cryptography. - Cryptography. - book - no - - diff --git a/test/tmarc5.xml b/test/tmarc5.xml deleted file mode 100644 index 89343ab..0000000 --- a/test/tmarc5.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - 00492nam a22001455a 4500 - 000277485 - 20051026111436.0 - 050413s1894 gr 000 0 gre d - - Μαρούδης, Κωνσταντίνος Ιω - - - Ελληνικόν κρυπτογραφικόν λεξικόν / - Κωνστ. Ι. Μαρούδης. - - - εκδ. - - - Αθήνα, - 1894. - - - 248 σελ. - - - Greek language, Modern - Dialects - Dictionaries - - - Cryptography. - - - diff --git a/test/tmarc6.res.xml b/test/tmarc6.res.xml deleted file mode 100644 index 5665ab0..0000000 --- a/test/tmarc6.res.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - 11224466 - 11224466 - Jack Collins - How to program a computer - How to program a computer - Penguin - p. cm. - book - no - - diff --git a/test/tmarc6.xml b/test/tmarc6.xml deleted file mode 100644 index 70d23e7..0000000 --- a/test/tmarc6.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - 00366nam a22001698a 4500 - 11224466 - DLC - 00000000000000.0 - 910710c19910701nju 00010 eng - - 11224466 - - - DLC - DLC - - - 123-xyz - - - Jack Collins - - - How to program a computer - - - Penguin - - - 8710 - - - p. cm. - - - diff --git a/test/tmarc7.res.xml b/test/tmarc7.res.xml deleted file mode 100644 index dc96c3a..0000000 --- a/test/tmarc7.res.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - 77123332 - 77123332 - 57779 - 90490 - 93202 - 2001 - Voyager Diacritic test -- New input 001 (SBIE). - Voyager Diacritic test -- New input 001 (SBIE). - ny : - ny, - 2001. - 100 p. ; - 12 cm. - New copy imported from file (8/12/99). - VOYAGER COLUMN 0 (NEW): Degree sign (°); Phono Copyright mark (℗); Copyright mark (©); Sharp (♯); Inverted Question mark (¿); Inverted Exclamation mark (¡). - VOYAGER COLUMN 1: Script L (ℓ); Polish L (Ł); Scandanavian O (Ø); D with Crossbar (Đ); Icelandic Thorn (Þ); AE Digraph (Æ); OE Digraph (Œ); Miagkii Znak (ʹ); Dot at Midline (·). - VOYAGER COLUMN 2: Musical Flat (♭); Patent Mark (®); Plus or Minus (±); O Hook (Ơ); U Hook (Ư); Alif (ʼ); alpha α; Ayn (ʻ); Polish l (ł). - VOYAGER COLUMN 3: Scandanavian o (ø); d with crossbar (đ); Icelandic Thorn (þ); ae Digraph (æ); oe Digraph (œ); Tverdii Znak (ʺ); Turkish i (ı); British Pound (£); eth (ð). - VOYAGER COLUMN 4: Dagger (DO NOT USE); o Hook (ơ); u Hook (ư); Beta β; Gamma γ; Superscript 0 (⁰); Superscript 1 (¹); Superscript 2 (²); Superscript 3 (³). - VOYAGER COLUMN 5: Superscript 4 (⁴); Superscript 5 (⁵); Superscript 6 (⁶); Superscript 7 (⁷); Superscript 8 (⁸); Superscript 9 (⁹); Superscript + (⁺); Superscript - (⁻); Superscript ( (⁽). - VOYAGER COLUMN 6: Superscript ) (⁾); Subscript 0 (₀); Subscript 1 (₁); Subscript 2 (₂); Subscript 3 (₃); Subscript 4 (₄); Subscript 5 (₅); Subscript 6 (₆); Subscript 7 (₇). - VOYAGER COLUMN 7: Subscript 8 (₈); Subscript 9 (₉); Subscript + (₊); Subscript - (₋); Subscript ( (₍); Subscript ) (₎); Pseudo Question Mark (ỏ); Grave (ò); Acute (ó). - VOYAGER COLUMN 8: Circumflex (ô); Tilde (õ); Macron (ō); Breve (ŏ); Superior Dot (ȯ); Umlaut (ö); Hacek (ǒ); Circle Above (o̊); Ligature left (o͡). - VOYAGER COLUMN 9: Ligature right (o) ; High Comma off center (o̕); Double Acute (ő); Candrabindu (o̐); Cedilla (o̧); Right Hook (ǫ); Dot Below (ọ); Double Dot Below (o̤); Circle Below (o̥). - VOYAGER COLUMN 10: Double Underscore (o̳); Underscore (o̲); Left Hook (o̦); Right Cedilla (o̜); Upadhmaniya (o̮); Double Tilde 1st half (o͠); Double Tilde 2nd half (o) ; High Comma centered (o̓). - VOYAGER PC Keyboard: Spacing Circumflex (^); Spacing Underscore (_); Spacing Grave (`); Open Curly Bracket ({); Close Curly Bracket (}); Spacing Tilde (~). - Standard PC Keyboard: 1234567890-= !@#$%^&*()_+ qwertyuiop[]\ QWERTYUIOP{}| asdfghjkl;' ASDFGHJKL:" zxcvbnm,./ ZXCVBNM<>? - book - no - - diff --git a/test/tmarc7.xml b/test/tmarc7.xml deleted file mode 100644 index 2acb7d2..0000000 --- a/test/tmarc7.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - 03114cam a2200349 i 4500 - 77123332 - DLC - 20051218154744.0 - 981008b2001 ilu 000 0 eng - - 57779 - - - 90490 - - - 93202 - - - DLC - DLC - - - 0 - und - orignew - u - ncip - 19 - y-gencatlg - - - 77123332 - - - Voyager Diacritic test -- New input 001 (SBIE). - - - ny : - ny, - 2001. - - - 100 p. ; - 12 cm. - - - New copy imported from file (8/12/99). - - - VOYAGER COLUMN 0 (NEW): Degree sign (°); Phono Copyright mark (℗); Copyright mark (©); Sharp (♯); Inverted Question mark (¿); Inverted Exclamation mark (¡). - - - VOYAGER COLUMN 1: Script L (ℓ); Polish L (Ł); Scandanavian O (Ø); D with Crossbar (Đ); Icelandic Thorn (Þ); AE Digraph (Æ); OE Digraph (Œ); Miagkii Znak (ʹ); Dot at Midline (·). - - - VOYAGER COLUMN 2: Musical Flat (♭); Patent Mark (®); Plus or Minus (±); O Hook (Ơ); U Hook (Ư); Alif (ʼ); alpha α; Ayn (ʻ); Polish l (ł). - - - VOYAGER COLUMN 3: Scandanavian o (ø); d with crossbar (đ); Icelandic Thorn (þ); ae Digraph (æ); oe Digraph (œ); Tverdii Znak (ʺ); Turkish i (ı); British Pound (£); eth (ð). - - - VOYAGER COLUMN 4: Dagger (DO NOT USE); o Hook (ơ); u Hook (ư); Beta β; Gamma γ; Superscript 0 (⁰); Superscript 1 (¹); Superscript 2 (²); Superscript 3 (³). - - - VOYAGER COLUMN 5: Superscript 4 (⁴); Superscript 5 (⁵); Superscript 6 (⁶); Superscript 7 (⁷); Superscript 8 (⁸); Superscript 9 (⁹); Superscript + (⁺); Superscript - (⁻); Superscript ( (⁽). - - - VOYAGER COLUMN 6: Superscript ) (⁾); Subscript 0 (₀); Subscript 1 (₁); Subscript 2 (₂); Subscript 3 (₃); Subscript 4 (₄); Subscript 5 (₅); Subscript 6 (₆); Subscript 7 (₇). - - - VOYAGER COLUMN 7: Subscript 8 (₈); Subscript 9 (₉); Subscript + (₊); Subscript - (₋); Subscript ( (₍); Subscript ) (₎); Pseudo Question Mark (ỏ); Grave (ò); Acute (ó). - - - VOYAGER COLUMN 8: Circumflex (ô); Tilde (õ); Macron (ō); Breve (ŏ); Superior Dot (ȯ); Umlaut (ö); Hacek (ǒ); Circle Above (o̊); Ligature left (o͡). - - - VOYAGER COLUMN 9: Ligature right (o) ; High Comma off center (o̕); Double Acute (ő); Candrabindu (o̐); Cedilla (o̧); Right Hook (ǫ); Dot Below (ọ); Double Dot Below (o̤); Circle Below (o̥). - - - VOYAGER COLUMN 10: Double Underscore (o̳); Underscore (o̲); Left Hook (o̦); Right Cedilla (o̜); Upadhmaniya (o̮); Double Tilde 1st half (o͠); Double Tilde 2nd half (o) ; High Comma centered (o̓). - - - VOYAGER PC Keyboard: Spacing Circumflex (^); Spacing Underscore (_); Spacing Grave (`); Open Curly Bracket ({); Close Curly Bracket (}); Spacing Tilde (~). - - - Standard PC Keyboard: 1234567890-= !@#$%^&*()_+ qwertyuiop[]\ QWERTYUIOP{}| asdfghjkl;' ASDFGHJKL:" zxcvbnm,./ ZXCVBNM<>? - - - diff --git a/test/tmarc8.res.xml b/test/tmarc8.res.xml deleted file mode 100644 index 609ae7b..0000000 --- a/test/tmarc8.res.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - UCD-002592301 - 99851339eo - Clinton, Atkinson. - 1583? - Clinton, Purser & Arnold, to their countreymen wheresoeuer - Wherein is described by their own hands their vnfeigned penitence for their offences past: their patience in welcoming their death, & their duetiful minds towardes her most excellent Maiestie - [electronic resource] : - Clinton, Purser & Arnold, to their countreymen wheresoeuer Wherein is described by their own hands their vnfeigned penitence for their offences past: their patience in welcoming their death, & their duetiful minds towardes her most excellent Maiestie - London : - Imprinted by Iohn Wolfe and are to be sold [by W. Wright] at the middle shop in the Poultry, ioyning S. Mildreds Church, - [1583?] - [12] p - In verse - The first poem is signed: Thomas Walton alias Purser - Clinton's full name and bookseller's name from, and publication date conjectured by, STC - Signatures: A⁴ B² - Reproduction of the original in the Bodleian Library - Electronic texts. - Electronic texts., local - Pirates - Pirates, England, Early works to 1800. - http://gateway.proquest.com/openurl?ctx_ver=Z39.88-2003&res_id=xri:eebo&rft_val_fmt=&rft_id=xri:eebo:image:16610 - Get resource - Restricted to UC campuses - http://gateway.proquest.com/openurl?ctx_ver=Z39.88-2003&res_id=xri:eebo&rft_val_fmt=&rft_id=xri:eebo:image:16610 - Get resource - Restricted to UC campuses - http://gateway.proquest.com/openurl?ctx_ver=Z39.88-2003&res_id=xri:eebo&rft_val_fmt=&rft_id=xri:eebo:image:16610 - Get resource - Restricted to UC campuses - http://gateway.proquest.com/openurl?ctx_ver=Z39.88-2003&res_id=xri:eebo&rft_val_fmt=&rft_id=xri:eebo:image:16610 - Get resource - Restricted to UC campuses - Internet - book (electronic) - no - DVXL - - diff --git a/test/tmarc8.xml b/test/tmarc8.xml deleted file mode 100644 index b1e7c76..0000000 --- a/test/tmarc8.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - 02647nam^a2200469^^^4500 - UCD-002592301 - 20061209034435.0 - m d - cr bn |||a|bb| - 920330s1583 enk s 000 0 eng d - - 99851339eo - - - CL0036000039 - ProQuest Information and Learning. 300 N. Zeeb Rd., Ann Arbor, MI 48106 - - - Cu-RivES - Cu-RivES - CStRLIN - dcrb - WaOLN - - - Clinton, Atkinson. - - - Clinton, Purser & Arnold, to their countreymen wheresoeuer - [electronic resource] : - Wherein is described by their own hands their vnfeigned penitence for their offences past: their patience in welcoming their death, & their duetiful minds towardes her most excellent Maiestie - - - Clinton, Purser & Arnold, to their countreymen wheresoever - - - Clinton, Purser & Arnold, to their countreymen wheresoever - - - London : - Imprinted by Iohn Wolfe and are to be sold [by W. Wright] at the middle shop in the Poultry, ioyning S. Mildreds Church, - [1583?] - - - [12] p - - - In verse - - - The first poem is signed: Thomas Walton alias Purser - - - Clinton's full name and bookseller's name from, and publication date conjectured by, STC - - - Signatures: A⁴ B² - - - Reproduction of the original in the Bodleian Library - - - STC (2nd ed.) - 5431 - - - Also issued in print and on microform - - - Electronic reproduction. - Mode of access: World Wide Web. - Restricted to UC campuses - - - Electronic texts. - local - - - Pirates - England - Early works to 1800. - - - Walton, Thomas, - fl. 1583. - aut - - - Arnold, - fl. 1583. - aut - - - Early English books online - - - MER - kmain - - - SCB - nnet - - - Restricted to UC campuses - SCP UCSD - http://gateway.proquest.com/openurl?ctx_ver=Z39.88-2003&res_id=xri:eebo&rft_val_fmt=&rft_id=xri:eebo:image:16610 - - - Restricted to UC campuses - SCP UCSD - http://gateway.proquest.com/openurl?ctx_ver=Z39.88-2003&res_id=xri:eebo&rft_val_fmt=&rft_id=xri:eebo:image:16610 - - - DVXL - ELECT-GEN - Internet - - - LAGE - in - Online access - - - Restricted to UC campuses - SCP UCSD - http://gateway.proquest.com/openurl?ctx_ver=Z39.88-2003&res_id=xri:eebo&rft_val_fmt=&rft_id=xri:eebo:image:16610 - - - Restricted to UC campuses - http://gateway.proquest.com/openurl?ctx_ver=Z39.88-2003&res_id=xri:eebo&rft_val_fmt=&rft_id=xri:eebo:image:16610 - CDL - - - Early English books, 1475-1640 ; - 1406:13. - - - DVXL - 002592301 - - - diff --git a/test/tmarc9.res.xml b/test/tmarc9.res.xml deleted file mode 100644 index e545673..0000000 --- a/test/tmarc9.res.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - 2005336282 - (OCoLC)170490164 - 2005336282 - (OCoLC)170490164 - 2005- - Qaḍāʼ al-usrah : - majallah mutakhaṣṣiṣah / - Wizārat al-ʻAdl. - Qaḍāʼ al-usrah : majallah mutakhaṣṣiṣah / - al-Rabāṭ : - Jamʻīyat Nashr al-Maʻlūmah al-Qānūnīyah wa-al-Qaḍāʼīyah, - 2005- - v. : - ill. ; - 24 cm. - Some issues have also a distinctive title. - Latest issue consulted: al-ʻAdad 3. (Dujanbir 2006). - Domestic relations (Islamic law) - Domestic relations (Islamic law), Morocco. - Divorce (Islamic law) - Divorce (Islamic law) - Marriage law - Marriage law, Morocco. - Law reports, digests, etc. - Law reports, digests, etc., Morocco. - journal - no - - diff --git a/test/tmarc9.xml b/test/tmarc9.xml deleted file mode 100644 index 7e070cc..0000000 --- a/test/tmarc9.xml +++ /dev/null @@ -1,157 +0,0 @@ - - - 02075cas a22005055a 4500 - 2005336282 - DLC - 20070911033614.0 - 070910c20059999mr uu p f0 0ara - - 2005336282 - - - -3-7-0709110002-p----- - - - (OCoLC)170490164 - - - 7 - und - serials - u - ncip - 19 - n-oclcserc - - - DLC - DLC - DLC - - - ara - fre - - - lc - - - f-mr--- - - - IN PROCESS - - - (3 - - - 880-01 - Qaḍāʼ al-usrah : - majallah mutakhaṣṣiṣah / - Wizārat al-ʻAdl. - - - Justice de la famille - - - 880-02 - Majallat Qaḍāʼ al-usrah - <2006> - - - 880-03 - al-Rabāṭ : - Jamʻīyat Nashr al-Maʻlūmah al-Qānūnīyah wa-al-Qaḍāʼīyah, - 2005- - - - v. : - ill. ; - 24 cm. - - - Irregular (semiannual) - - - 880-04 - al-ʻAdad 1. (Yūlyūz 2005)- - - - 880-05 - Manshūrāt Jamʻīyat Nashr al-Maʻlūmah al-Qānūnīyah wa-al-Qaḍāʼīyah - - - Some issues have also a distinctive title. - - - Latest issue consulted: al-ʻAdad 3. (Dujanbir 2006). - - - Chiefly in Arabic; some French. - - - Domestic relations (Islamic law) - Morocco. - - - Divorce (Islamic law) - - - Marriage law - Morocco. - - - Law reports, digests, etc. - Morocco. - - - 880-06 - Jamʻīyat Nashr al-Maʻlūmah al-Qānūnīyah wa-al-Qaḍāʼīyah. - - - 880-07 - Morocco. - Wizārat al-ʻAdl. - - - DLC - - - 245-01/(3/r - قضاء الأسرة : - مجلة متخصصة / - وزارة العدل. - - - 246-02/(3/r - مجلة قضاء الأسرة - <2006> - - - 260-03/(3/r - الرباط : - جمعية نشر المعلومة القانونية والقضائية، - 2005- - - - 362-04/(3/r - العدد 1. (يوليوز 2005)- - - - 490-05/(3/r - منشورات جمعية نشر المعلومة القانونية والقضائية - - - 710-06/(3/r - جمعية نشر المعلومة القانونية والقضائية. - - - 710-07/(3/r - Morocco. - وزارة العدل. - - - LC Cairo Office [we 45] - - - diff --git a/win/makefile b/win/makefile index dbbaf5e..6460a66 100644 --- a/win/makefile +++ b/win/makefile @@ -5,7 +5,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.40 +PACKAGE_VERSION=1.7.0 # YAZ YAZ_DIR=..\..\yaz