From: Wolfram Schneider Date: Tue, 22 Mar 2011 18:16:45 +0000 (+0000) Subject: Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/pazpar2 X-Git-Tag: v1.5.5~7^2 X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=01f19b8c3664fa1c78d1fb9efb8e358d50f85c39;hp=88f96194d5a63278eb57b32c814019dab51da9ff;p=pazpar2-moved-to-github.git Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/pazpar2 --- diff --git a/.cproject b/.cproject index 8b529e5..be8b449 100644 --- a/.cproject +++ b/.cproject @@ -22,7 +22,7 @@ - + @@ -41,6 +41,9 @@ @@ -318,7 +321,7 @@ - + @@ -331,12 +334,12 @@ - - diff --git a/.gitignore b/.gitignore index d85d8de..1b85e92 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,5 @@ configure Doxyfile dox deb-src +Debug +*~ \ No newline at end of file diff --git a/.project b/.project index 5398d34..2663f18 100644 --- a/.project +++ b/.project @@ -27,7 +27,7 @@ org.eclipse.cdt.make.core.buildCommand - src/make + make org.eclipse.cdt.make.core.buildLocation @@ -63,7 +63,7 @@ org.eclipse.cdt.make.core.useDefaultBuildCmd - false + true diff --git a/IDMETA b/IDMETA index b281787..423a6de 100644 --- a/IDMETA +++ b/IDMETA @@ -1,2 +1,2 @@ -DEBIAN_DIST="squeeze etch lenny" -UBUNTU_DIST="karmic jaunty intrepid hardy" +DEBIAN_DIST="squeeze lenny" +UBUNTU_DIST="maverick lucid karmic" diff --git a/Makefile.am b/Makefile.am index c51fafc..a485e2b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,16 +4,14 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = src test js doc -EXTRA_DIST = README NEWS LICENSE buildconf.sh Doxyfile.in m4/yaz.m4 \ +EXTRA_DIST = $(PACKAGE).spec README NEWS LICENSE \ + buildconf.sh Doxyfile.in m4/yaz.m4 \ win/makefile win/version.nsi win/version.nsi.in win/license.txt dist-hook: if test -x /usr/bin/git -a -d .git; then git log >ChangeLog ; cp ChangeLog $(distdir); fi - for d in etc etc/settings www/test1 www/jsdemo; do \ - mkdir -p $(distdir)/$$d; \ - for f in $(srcdir)/$$d/*; do \ - test -f $$f && cp $$f $(distdir)/$$d; \ - done; \ + for d in etc etc/settings etc/services www/test1 www/jsdemo www/iphone; do \ + mkdir -p $(distdir)/$$d; cp -r $$d/* $(distdir)/$$d; \ done; rm -f $(distdir)/etc/pazpar2.cfg; exit 0 .PHONY:debian diff --git a/NEWS b/NEWS index d0602ef..3ac310e 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,92 @@ +-- 1.5.4 2011/03/08 +- Experiental support for DTIC DADS target +- adds dads-pz2.xsl +- Support for query_syntax (overrides the default for SRU | Z39.50) +- Support for extraArgs (ZOOM "extraArgs" option) for targets +- New commands: status-server and status-session + +-- 1.5.3 2011/02/18 +- Fix for threaded runs: +Client now have a copy of the database URL, +which can used after the database has been release from the client. +This makes the logging in the connection idle timeout of the client nicer (no NOURL) +and should be thread-safe. +- tmarc.xsl: +Add journal-title-abbrev and full text. +- cf.xsl +New fields: isbn, issn, journaltitle, volume, issue +- Fix for cmd=record before search. +- Session Logging clean up +- Fix: wrong termlist factor when maxrecs is different from 100. + +-- 1.5.2 2011/01/18 +Fixes: +- Missing pz:termlist_term_factor in settings.c messed up pz:preferred +- Term factor is default enabled but can be diseabled by pz:termlist_term_factor=0 + +-- 1.5.1 2011/01/06 + +Add scaling of facet count. Currently always enabled, needs fixing. +Allow user-defined info for target suffix. This has no meaning in +Pazpar2 except to distinguish targets from each other. The suffix +data begins with #. For example z3950.indexdata.com/gils#Mydata + +Added exact-match recordfilter; format name=value + +--- 1.5.0 2010/10/05 + +SOLR support. Pazpar2 may operate as web service client for SOLR. + +--- 1.4.4 2010/08/17 + +Fix for show command and block=1 (dead lock). Bug was introduced in +1.4.0. + +--- 1.4.3 2010/07/02 + +New RPM packages: pazpar2, pazpar2-js, pazpar2-doc. These have been +tested on CentOS 5.5 only. + +--- 1.4.2 2010/06/18 + +Fix problem with result sets being removed from a client session +if the connection for it was resused by another session. Bug #3489. + +New iphone UI for Pazpar2 (www/iphone). + +--- 1.4.1 2010/05/21 + +Fixes for threaded operation. + +New stylesheets for TurboMARC: tmarc.xsl and opac_turbomarc.xsl. + +New example services in etc/services in source. In the Debian packages +these are located in /etc/pazpar2/services-available + +Threaded mode operational on Windows. Requires Windows 7 or Windows +Server 2008. + +Default value of setting pz:max_connections is 0 which means that there +is no limit on number of connections. + +--- 1.4.0 2010/03/29 + +Pazpar2 may operate in threaded mode. Enabled by element threads in +the configuration. See pazpar2_conf for details. + +New setting setting: pz:max_connections. Setting pz:max_connections is +a limit of number of sockets to a host. When this limit is reached, +Pazpar2 will wait up to 5 seconds for a connection to becomes available. +The client will be marked Client_Error when it can not be searched +(other clients in a session may work). If pz:max_connections is not set +for a target, a value of 30 will be used. Note: the pz:max_connections +will only work in threaded mode. + +pz2.js: JSON support for show. + +Debian package: Enable default service, default.xml, before starting +Pazpar2 only if there is no service already in /etc/pazpar2/services-enabled. + --- 1.3.0 2010/01/25 Debian version depends on on libyaz4. Note that Pazpar2 will still diff --git a/README b/README index b9830ed..7ceac09 100644 --- a/README +++ b/README @@ -2,7 +2,7 @@ Pazpar2 is a high-performance, user interface-independent, data model-independent metasearching middleware featuring merging, relevance ranking, record sorting, and faceted results. -Copyright (C) 2006-2010, Index Data. See the file LICENSE for details. +Copyright (C) 2006-2011 Index Data. See the file LICENSE for details. Installation instructions and documentation is found in directory 'doc' and on-line at http://www.indexdata.com/pazpar2/ . diff --git a/configure.ac b/configure.ac index 536a04f..1134eb4 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,11 @@ ## -*- Autoconf -*- ## This file is part of Pazpar2. +## Copyright (C) 2006-2011 Index Data ## Process this file with autoconf to produce a configure script. # Autoconf and automake setup AC_PREREQ(2.60) -AC_INIT([pazpar2],[1.3.0],[pazpar2-help@indexdata.dk]) +AC_INIT([pazpar2],[1.5.4],[pazpar2-help@indexdata.dk]) AC_CONFIG_HEADERS(src/config.h) @@ -21,7 +22,7 @@ AC_LANG(C) AC_C_INLINE -YAZ_INIT([static icu server],[4.0.2]) +YAZ_INIT([static icu],[4.1.0]) if test -z "$YAZLIB"; then AC_MSG_ERROR([YAZ development libraries missing]) fi diff --git a/debian/changelog b/debian/changelog index d862a51..ee2b637 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,57 @@ +pazpar2 (1.5.3-1indexata) unstable; urgency=low + + * Upstrem. + + -- Dennis Schafroth Fri, 18 Feb 2011 12:26:12 +0100 + +pazpar2 (1.5.2-1indexdata) unstable; urgency=low + + * Upstream + + -- Dennis Schafroth Tue, 18 Jan 2011 10:51:26 +0100 + +pazpar2 (1.5.1-1indexdata) unstable; urgency=low + + * Upstream. + + -- Dennis Schafroth Thu, 06 Jan 2011 17:30:59 +0200 + +pazpar2 (1.5.0-1indexdata) unstable; urgency=low + + * Upstream. + + -- Adam Dickmeiss Tue, 05 Oct 2010 12:43:59 +0200 + +pazpar2 (1.4.4-1indexdata) unstable; urgency=low + + * Upstream. + + -- Adam Dickmeiss Tue, 17 Aug 2010 13:22:40 +0200 + +pazpar2 (1.4.3-1indexdata) unstable; urgency=low + + * Upstream. + + -- Adam Dickmeiss Thu, 01 Jul 2010 14:04:10 +0200 + +pazpar2 (1.4.2-1indexdata) unstable; urgency=low + + * Upstream. + + -- Adam Dickmeiss Fri, 18 Jun 2010 11:32:46 +0200 + +pazpar2 (1.4.1-1indexdata) unstable; urgency=low + + * Upstream. + + -- Adam Dickmeiss Fri, 21 May 2010 14:56:46 +0200 + +pazpar2 (1.4.0-1indexdata) unstable; urgency=low + + * Upstream. + + -- Adam Dickmeiss Thu, 29 Apr 2010 13:07:13 +0200 + pazpar2 (1.3.0-1indexdata) unstable; urgency=low * Upstream. diff --git a/debian/control b/debian/control index e734d6b..012da1a 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: pazpar2 Section: net Priority: extra Maintainer: Adam Dickmeiss -Build-Depends: debhelper (>= 5), autotools-dev, libyaz4-dev (>= 4.0.2), docbook-xsl +Build-Depends: debhelper (>= 5), autotools-dev, libyaz4-dev (>= 4.1.0), docbook-xsl, libgnutls-dev Standards-Version: 3.7.2 Package: pazpar2 diff --git a/debian/pazpar2.init b/debian/pazpar2.init index 73f0b05..495b930 100644 --- a/debian/pazpar2.init +++ b/debian/pazpar2.init @@ -97,7 +97,10 @@ case "$1" in do_start case "$?" in 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + 2) [ "$VERBOSE" = no ] && \ + log_daemon_msg "Starting $DESC" "$NAME" + log_end_msg 1 + ;; esac ;; stop) @@ -105,7 +108,10 @@ case "$1" in do_stop case "$?" in 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + 2) [ "$VERBOSE" = no ] && \ + log_daemon_msg "Stopping $DESC" "$NAME" + log_end_msg 1 + ;; esac ;; #reload|force-reload) diff --git a/debian/rules b/debian/rules index 2281048..e5d60be 100755 --- a/debian/rules +++ b/debian/rules @@ -78,10 +78,11 @@ binary-arch: build install # pazpar2-doc package mv $(CURDIR)/debian/pazpar2/usr/share/doc/pazpar2/* $(CURDIR)/debian/pazpar2-doc/usr/share/doc/pazpar2-doc # pazpar2 package - cp $(CURDIR)/debian/server.xml $(CURDIR)/debian/pazpar2/etc/pazpar2/server.xml + cp $(CURDIR)/etc/server.xml $(CURDIR)/debian/pazpar2/etc/pazpar2/server.xml cp $(CURDIR)/etc/default.xml $(CURDIR)/debian/pazpar2/etc/pazpar2/services-available/ - cp etc/settings/*.xml $(CURDIR)/debian/pazpar2/etc/pazpar2/settings/ - cp etc/*.xsl $(CURDIR)/debian/pazpar2/etc/pazpar2/ + cp $(CURDIR)/etc/services/*.xml $(CURDIR)/debian/pazpar2/etc/pazpar2/services-available + cp $(CURDIR)/etc/settings/*.xml $(CURDIR)/debian/pazpar2/etc/pazpar2/settings/ + cp $(CURDIR)/etc/*.xsl $(CURDIR)/debian/pazpar2/etc/pazpar2/ # pazpar2-apache2 package cp $(CURDIR)/debian/ap2pazpar2.cfg $(CURDIR)/debian/pazpar2-apache2/etc/pazpar2 # pazpar2-test1 package @@ -90,7 +91,7 @@ binary-arch: build install # pazpar2-jsdemo package cp www/jsdemo/*.html $(CURDIR)/debian/pazpar2-jsdemo/usr/share/pazpar2/jsdemo/ cp www/jsdemo/*.js $(CURDIR)/debian/pazpar2-jsdemo/usr/share/pazpar2/jsdemo/ - cp www/jsdemo/*.gif $(CURDIR)/debian/pazpar2-jsdemo/usr/share/pazpar2/jsdemo/ + cp www/jsdemo/*.png $(CURDIR)/debian/pazpar2-jsdemo/usr/share/pazpar2/jsdemo/ cp www/jsdemo/*.css $(CURDIR)/debian/pazpar2-jsdemo/usr/share/pazpar2/jsdemo/ # pazpar2-js package cp $(CURDIR)/debian/ap2pazpar2-js.cfg $(CURDIR)/debian/pazpar2-js/etc/pazpar2 diff --git a/debian/server.xml b/debian/server.xml deleted file mode 100644 index 419e7bf..0000000 --- a/debian/server.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/doc/book.xml b/doc/book.xml index ff1b58b..7c9c9d4 100644 --- a/doc/book.xml +++ b/doc/book.xml @@ -1,6 +1,6 @@ - %local; @@ -27,6 +27,9 @@ MikeTaylor + + DennisSchafroth + &version; ©right-year; @@ -76,8 +79,8 @@ -- XSLT is used to normalize and extract data from retrieval records for display and analysis. It can be used against any server which supports the - Z39.50 or SRU/SRW - protocol. Proprietary + Z39.50, SRU/SRW + or SOLR protocol. Proprietary backend modules can function as connectors between these standard protocols and any non-standard API, including web-site scraping, to support a large number of other protocols. @@ -159,7 +162,7 @@ proprietary framework for building connectors that enable Pazpar2 to access thousands of online databases, in addition to the vast number of catalogs - and online services that support the Z39.50/SRU/SRW protocols. + and online services that support the Z39.50/SRU/SRW/SOLR protocols. @@ -347,7 +350,7 @@ The test UIs are located in www. Ensure that this - directory is available to the web server by copying + directory is available to the web server by copying www to the document root, using Apache's Alias directive, or creating a symbolic link: for example, on a Debian or Ubuntu @@ -644,8 +647,8 @@ Connecting to non-standard resources Pazpar2 uses Z39.50 as its switchboard language -- i.e. as far as it - is concerned, all resources speak Z39.50, or its webservices derivatives, - SRU/SRW. It is, however, equipped + is concerned, all resources speak Z39.50, its webservices derivatives, + SRU/SRW and SOLR servers exposing Lucene indexes. It is, however, equipped to handle a broad range of different server behavior, through configurable query mapping and record normalization. If you develop configuration, stylesheets, etc., for a new type of resources, we diff --git a/doc/common b/doc/common index 51f33ab..cc59b50 160000 --- a/doc/common +++ b/doc/common @@ -1 +1 @@ -Subproject commit 51f33ab41eada587c95a46b3340c2cd03ddaa7cd +Subproject commit cc59b50a147656750bff1385f50fd6ad656d77e4 diff --git a/doc/entities.ent b/doc/entities.ent index 81c1f34..3feae87 100644 --- a/doc/entities.ent +++ b/doc/entities.ent @@ -1,5 +1,5 @@ - + diff --git a/doc/pazpar2.xml b/doc/pazpar2.xml index fde6da4..9e7b662 100644 --- a/doc/pazpar2.xml +++ b/doc/pazpar2.xml @@ -1,5 +1,5 @@ - %local; @@ -12,10 +12,13 @@ Pazpar2 &version; + Index Data + Pazpar2 8 + System management commands diff --git a/doc/pazpar2_conf.xml b/doc/pazpar2_conf.xml index de76d9d..1f7501e 100644 --- a/doc/pazpar2_conf.xml +++ b/doc/pazpar2_conf.xml @@ -1,6 +1,6 @@ - %local; @@ -13,10 +13,13 @@ Pazpar2 &version; + Index Data + Pazpar2 conf 5 + File formats and conventions @@ -118,11 +121,11 @@ - relevance / sort / mergekey + relevance / sort / mergekey / facet - Specifies character set normalization for relevancy / sorting - and the mergekey - for the server. These definitions serves as + Specifies character set normalization for relevancy / sorting / + mergekey and facets - for the server. These definitions serves as default for services that don't have these given. For the meaning of these settings refer to the "relevance" element inside service. @@ -412,6 +415,17 @@ + facet + + + Specifies ICU tokenization and transformation rules + for tokens that are used in Pazpar2's facets. The contents + is similar to that of relevance. + + + + + settings @@ -831,16 +845,27 @@ pz:nativesyntax - The representation (syntax) of the retrieval records. Currently - recognized values are iso2709 and xml. + Specifies how Pazpar2 shoule map retrieved records to XML. Currently + supported values are xml, + iso2709 and txml. + + + The value iso2709 makes Pazpar2 convert retrieved + MARC records to MARCXML. In order to convert to XML, the exact + chacater set of the MARC must be known (if not, the resulting + XML is probably not well-formed). The character set may be + specified by adding: + ;charset=charset to + iso2709. If omitted, a charset of + MARC-8 is assumed. This is correct for most MARC21/USMARC records. - For iso2709, can also specify a native character set, e.g. "iso2709;latin-1". - If no character set is provided, MARC-8 is assumed. + The value txml is like iso2709 + except that records are converted to TurboMARC instead of MARCXML. - If pz:nativesyntax is not specified, pazpar2 will attempt to determine - the value based on the response from the server. + The value xml is used if Pazpar2 retrieves + records that are already XML (no conversion takes place). @@ -967,10 +992,18 @@ pz:sru - This setting enables SRU/SRW support. It has three possible settings. + This setting enables + SRU/SOLR + support. + It has four possible settings. 'get', enables SRU access through GET requests. 'post' enables SRU/POST support, less commonly supported, but useful if very large requests are - to be submitted. 'srw' enables the SRW variation of the protocol. + to be submitted. 'srw' enables the SRW (SRU over SOAP) variation of + the protocol. + + + A value of 'solr' anables SOLR client support. This is supported + for Pazpar version 1.5.0 and later. @@ -981,7 +1014,7 @@ This allows SRU version to be specified. If unset Pazpar2 will the default of YAZ (currently 1.2). Should be set - to 1.1 or 1.2. + to 1.1 or 1.2. For SOLR, the current supported/tested version is 1.4 @@ -1033,13 +1066,55 @@ Specifies a filter which allows Pazpar2 to only include records that meet a certain criteria in a result. Unmatched records - will be ignored. The filter takes the form name[~value] , which + will be ignored. The filter takes the form name, name~value, or name=value, which will include only records with metadata element (name) that has the - substring (value) given. If value is omitted all records with the - metadata present will be included. + substring (~value) given, or matches exactly (=value). If value is omitted all records + with the named + metadata element present will be included. + + + pz:termlist_term_count + + + Specifies that the target should return up to n terms for each facets (where termlist="yes"). This implies + that the target can return facets on the search command. Requesting facets on targets that doesn't, + will return unpredictable or error result. + + + + + + pz:termlist_term_sort + + + Specifies how the terms should be sorted. (Not yet implemented) + + + + + + pz:preferred + + + Specifies that a target is preferred, e.g. possible local, faster target. Using block=pref on show command + will wait for all these targets to return records before releasing the block. If no target is preferred, + the block=pref will identical to block=1, which release when one target has returned records. + + + + + + pz:block_timeout + + + (Not yet implemented). Specifies the time for which a block should be released anyway. + + + + diff --git a/doc/pazpar2_protocol.xml b/doc/pazpar2_protocol.xml index eeb0d7d..e90b5c4 100644 --- a/doc/pazpar2_protocol.xml +++ b/doc/pazpar2_protocol.xml @@ -1,6 +1,6 @@ - %local; @@ -13,10 +13,12 @@ Pazpar2 &version; + Index Data Pazpar2 protocol 7 + Conventions and miscellaneous @@ -488,6 +490,14 @@ search.pz2?session=605047297&command=record&id=3 + + num + + + maximum number of entries to return - default is 15. + + + diff --git a/etc/cf.xsl b/etc/cf.xsl index ac8d0dd..fc18204 100644 --- a/etc/cf.xsl +++ b/etc/cf.xsl @@ -14,8 +14,13 @@ version="1.0" encoding="UTF-8"/> + + + + + @@ -45,6 +50,9 @@ + + + @@ -71,6 +79,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/etc/check-pazpar2.sh b/etc/check-pazpar2.sh new file mode 100755 index 0000000..c5d97d6 --- /dev/null +++ b/etc/check-pazpar2.sh @@ -0,0 +1,68 @@ +#!/bin/sh + +usage() +{ +cat < /dev/null` + +if [ $? -ne 0 ] ; then + MSG="FATAL failed to communicate with pazpar2" + exit 128 +fi + +if [ "$WARN_LEVEL" != "" ] ; then + if [ $SESSIONS -gt $WARN_LEVEL ]; then + MSG="WARNING " + rc=1; + fi +fi + +if [ "$CRIT_LEVEL" != "" ] ; then + if [ $SESSIONS -gt $CRIT_LEVEL ]; then + MSG="CRITICAL " + rc=2; + fi +fi + +echo "SESSIONS $MSG $SESSIONS ($CLIENTS) | $SESSIONS;$WARN_LEVEL;$CRIT_LEVEL " +exit $rc + diff --git a/etc/dads-pz2.xsl b/etc/dads-pz2.xsl new file mode 100644 index 0000000..c2858cf --- /dev/null +++ b/etc/dads-pz2.xsl @@ -0,0 +1,144 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + article + + other + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Vol. + no. + (-) + p. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/etc/dc.xsl b/etc/dc.xsl index f212bac..d9ae36d 100644 --- a/etc/dc.xsl +++ b/etc/dc.xsl @@ -15,6 +15,8 @@ version="1.0" encoding="UTF-8"/> + + @@ -70,6 +72,10 @@ + + + + diff --git a/etc/default.xml b/etc/default.xml index a3c5c7f..1e91636 100644 --- a/etc/default.xml +++ b/etc/default.xml @@ -1,7 +1,7 @@ - + diff --git a/etc/edu_turbo.xml b/etc/edu_turbo.xml new file mode 100644 index 0000000..353d5d5 --- /dev/null +++ b/etc/edu_turbo.xml @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/etc/marc21.xsl b/etc/marc21.xsl index 71178b7..bb60a32 100644 --- a/etc/marc21.xsl +++ b/etc/marc21.xsl @@ -42,8 +42,21 @@ + + + + yes + + + yes + + + no + + + + - @@ -76,7 +89,14 @@ - + + + + + + + + @@ -230,6 +250,10 @@ + + + + diff --git a/etc/opac.xsl b/etc/opac.xsl index 617a18b..e4c5457 100644 --- a/etc/opac.xsl +++ b/etc/opac.xsl @@ -17,33 +17,56 @@ - - - - PAZPAR2_NULL_VALUE - + + + + PAZPAR2_NULL_VALUE + - - - - PAZPAR2_NULL_VALUE - + + + + PAZPAR2_NULL_VALUE + - - - - PAZPAR2_NULL_VALUE - + + + + PAZPAR2_NULL_VALUE + + + + + + Available + + + + + + + PAZPAR2_NULL_VALUE + + + PAZPAR2_NULL_VALUE + - + + + + + + + + diff --git a/etc/opac_turbomarc.xsl b/etc/opac_turbomarc.xsl new file mode 100644 index 0000000..83d2319 --- /dev/null +++ b/etc/opac_turbomarc.xsl @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + PAZPAR2_NULL_VALUE + + + + + + + + PAZPAR2_NULL_VALUE + + + + + + + + PAZPAR2_NULL_VALUE + + + + + + Available + + + + + + + PAZPAR2_NULL_VALUE + + + PAZPAR2_NULL_VALUE + + + + + + + + + + + + + + + + diff --git a/etc/perf_server.cfg b/etc/perf_server.cfg new file mode 100644 index 0000000..1678574 --- /dev/null +++ b/etc/perf_server.cfg @@ -0,0 +1,16 @@ + + + + + + + + + + + + diff --git a/etc/pp2out-to-carrot2.xsl b/etc/pp2out-to-carrot2.xsl new file mode 100644 index 0000000..5bdd7a0 --- /dev/null +++ b/etc/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/pz2-solr.xsl b/etc/pz2-solr.xsl new file mode 100644 index 0000000..e2e0f04 --- /dev/null +++ b/etc/pz2-solr.xsl @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/etc/server-status-nagios.xsl b/etc/server-status-nagios.xsl new file mode 100644 index 0000000..56f53fa --- /dev/null +++ b/etc/server-status-nagios.xsl @@ -0,0 +1,26 @@ + + + + + + + + + + + export SESSIONS= + + + + export CLIENTS= + + + + export RESULTSETS= + + + + + + diff --git a/etc/server.xml b/etc/server.xml new file mode 100644 index 0000000..eb6c1b0 --- /dev/null +++ b/etc/server.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/etc/services/long_sessions.xml b/etc/services/long_sessions.xml new file mode 100644 index 0000000..c431027 --- /dev/null +++ b/etc/services/long_sessions.xml @@ -0,0 +1,153 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/etc/services/perf.xml b/etc/services/perf.xml new file mode 100644 index 0000000..90bae4c --- /dev/null +++ b/etc/services/perf.xml @@ -0,0 +1,154 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/etc/services/perf_opac_turbo.xml b/etc/services/perf_opac_turbo.xml new file mode 100644 index 0000000..7615ee8 --- /dev/null +++ b/etc/services/perf_opac_turbo.xml @@ -0,0 +1,154 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/etc/services/perf_turbo.xml b/etc/services/perf_turbo.xml new file mode 100644 index 0000000..614a286 --- /dev/null +++ b/etc/services/perf_turbo.xml @@ -0,0 +1,154 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/etc/services/perf_turbo_small.xml b/etc/services/perf_turbo_small.xml new file mode 100644 index 0000000..cb1bfda --- /dev/null +++ b/etc/services/perf_turbo_small.xml @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/etc/services/solr.xml b/etc/services/solr.xml new file mode 100644 index 0000000..6b997ca --- /dev/null +++ b/etc/services/solr.xml @@ -0,0 +1,141 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/etc/settings/edu_turbo.xml b/etc/settings/edu_turbo.xml new file mode 100644 index 0000000..5040a4e --- /dev/null +++ b/etc/settings/edu_turbo.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/etc/settings/sru-gbv.de.xml b/etc/settings/sru-gbv.de.xml new file mode 100644 index 0000000..033ea9e --- /dev/null +++ b/etc/settings/sru-gbv.de.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/etc/solr-pz2.xsl b/etc/solr-pz2.xsl new file mode 100644 index 0000000..e966711 --- /dev/null +++ b/etc/solr-pz2.xsl @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/etc/tmarc.xsl b/etc/tmarc.xsl index 51636dd..e6bec43 100644 --- a/etc/tmarc.xsl +++ b/etc/tmarc.xsl @@ -1,660 +1,868 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - electronic resource - - - electronic resource - - - article - - - book - - - - - + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:pz="http://www.indexdata.com/pazpar2/1.0" + xmlns:tmarc="http://www.indexdata.com/turbomarc"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PAZPAR2_NULL_VALUE + + + + + + + PAZPAR2_NULL_VALUE + + + + + + + PAZPAR2_NULL_VALUE + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + , + + + + + + diff --git a/etc/tmarcxml.xsl b/etc/tmarcxml.xsl deleted file mode 100644 index 42ae103..0000000 --- a/etc/tmarcxml.xsl +++ /dev/null @@ -1,838 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - electronic resource - - - electronic resource - - - article - - - book - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - , - - - - - - - - - - - - - - , - - - - - - - - - - - - - - , - - - - - - - - - - - - - - , - - - - - - - - - - - - - - , - - - - - - - - - - - - - - , - - - - - - - - - - - - - - , - - - - - - - - - - - - - - , - - - - - - - - - - - - - - , - - - - - - - - - - - - - - , - - - - - - - - - - - - - - , - - - - - - - - - - - - - - , - - - - - - - - - - - - - - , - - - - - - - - - - - - - - , - - - - - - - - - - - - - - , - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - , - - - - - - - - - diff --git a/jinx-it.sh b/jinx-it.sh new file mode 100644 index 0000000..a1e4f1c --- /dev/null +++ b/jinx-it.sh @@ -0,0 +1,8 @@ +if [ "$1" == "" ] ; then + COUNT=10 +else + COUNT=$1 +fi +for d in `seq $COUNT` ; do + jinx run src/pazpar2 -X -f ~/etc/pazpar2/server-threaded.xml -l pazpar2.log -v log,warn,fatal +done \ No newline at end of file diff --git a/js/json2.js b/js/json2.js new file mode 100644 index 0000000..844fb00 --- /dev/null +++ b/js/json2.js @@ -0,0 +1,485 @@ +alert('IMPORTANT: Remove this line from json2.js before deployment.'); +/* + http://www.JSON.org/json2.js + 2010-03-20 + + Public Domain. + + NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK. + + See http://www.JSON.org/js.html + + + This code should be minified before deployment. + See http://javascript.crockford.com/jsmin.html + + USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO + NOT CONTROL. + + + This file creates a global JSON object containing two methods: stringify + and parse. + + JSON.stringify(value, replacer, space) + value any JavaScript value, usually an object or array. + + replacer an optional parameter that determines how object + values are stringified for objects. It can be a + function or an array of strings. + + space an optional parameter that specifies the indentation + of nested structures. If it is omitted, the text will + be packed without extra whitespace. If it is a number, + it will specify the number of spaces to indent at each + level. If it is a string (such as '\t' or ' '), + it contains the characters used to indent at each level. + + This method produces a JSON text from a JavaScript value. + + When an object value is found, if the object contains a toJSON + method, its toJSON method will be called and the result will be + stringified. A toJSON method does not serialize: it returns the + value represented by the name/value pair that should be serialized, + or undefined if nothing should be serialized. The toJSON method + will be passed the key associated with the value, and this will be + bound to the value + + For example, this would serialize Dates as ISO strings. + + Date.prototype.toJSON = function (key) { + function f(n) { + // Format integers to have at least two digits. + return n < 10 ? '0' + n : n; + } + + return this.getUTCFullYear() + '-' + + f(this.getUTCMonth() + 1) + '-' + + f(this.getUTCDate()) + 'T' + + f(this.getUTCHours()) + ':' + + f(this.getUTCMinutes()) + ':' + + f(this.getUTCSeconds()) + 'Z'; + }; + + You can provide an optional replacer method. It will be passed the + key and value of each member, with this bound to the containing + object. The value that is returned from your method will be + serialized. If your method returns undefined, then the member will + be excluded from the serialization. + + If the replacer parameter is an array of strings, then it will be + used to select the members to be serialized. It filters the results + such that only members with keys listed in the replacer array are + stringified. + + Values that do not have JSON representations, such as undefined or + functions, will not be serialized. Such values in objects will be + dropped; in arrays they will be replaced with null. You can use + a replacer function to replace those with JSON values. + JSON.stringify(undefined) returns undefined. + + The optional space parameter produces a stringification of the + value that is filled with line breaks and indentation to make it + easier to read. + + If the space parameter is a non-empty string, then that string will + be used for indentation. If the space parameter is a number, then + the indentation will be that many spaces. + + Example: + + text = JSON.stringify(['e', {pluribus: 'unum'}]); + // text is '["e",{"pluribus":"unum"}]' + + + text = JSON.stringify(['e', {pluribus: 'unum'}], null, '\t'); + // text is '[\n\t"e",\n\t{\n\t\t"pluribus": "unum"\n\t}\n]' + + text = JSON.stringify([new Date()], function (key, value) { + return this[key] instanceof Date ? + 'Date(' + this[key] + ')' : value; + }); + // text is '["Date(---current time---)"]' + + + JSON.parse(text, reviver) + This method parses a JSON text to produce an object or array. + It can throw a SyntaxError exception. + + The optional reviver parameter is a function that can filter and + transform the results. It receives each of the keys and values, + and its return value is used instead of the original value. + If it returns what it received, then the structure is not modified. + If it returns undefined then the member is deleted. + + Example: + + // Parse the text. Values that look like ISO date strings will + // be converted to Date objects. + + myData = JSON.parse(text, function (key, value) { + var a; + if (typeof value === 'string') { + a = +/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z$/.exec(value); + if (a) { + return new Date(Date.UTC(+a[1], +a[2] - 1, +a[3], +a[4], + +a[5], +a[6])); + } + } + return value; + }); + + myData = JSON.parse('["Date(09/09/2001)"]', function (key, value) { + var d; + if (typeof value === 'string' && + value.slice(0, 5) === 'Date(' && + value.slice(-1) === ')') { + d = new Date(value.slice(5, -1)); + if (d) { + return d; + } + } + return value; + }); + + + This is a reference implementation. You are free to copy, modify, or + redistribute. +*/ + +/*jslint evil: true, strict: false */ + +/*members "", "\b", "\t", "\n", "\f", "\r", "\"", JSON, "\\", apply, + call, charCodeAt, getUTCDate, getUTCFullYear, getUTCHours, + getUTCMinutes, getUTCMonth, getUTCSeconds, hasOwnProperty, join, + lastIndex, length, parse, prototype, push, replace, slice, stringify, + test, toJSON, toString, valueOf +*/ + +// Create a stand-alone object (not sure it will work +this.JSON2 = {}; + +// Create a JSON object only if one does not already exist. We create the +// methods in a closure to avoid creating global variables. + +if (!this.JSON) { + this.JSON = {}; +} + +(function () { + + function f(n) { + // Format integers to have at least two digits. + return n < 10 ? '0' + n : n; + } + + if (typeof Date.prototype.toJSON !== 'function') { + + Date.prototype.toJSON = function (key) { + + return isFinite(this.valueOf()) ? + this.getUTCFullYear() + '-' + + f(this.getUTCMonth() + 1) + '-' + + f(this.getUTCDate()) + 'T' + + f(this.getUTCHours()) + ':' + + f(this.getUTCMinutes()) + ':' + + f(this.getUTCSeconds()) + 'Z' : null; + }; + + String.prototype.toJSON = + Number.prototype.toJSON = + Boolean.prototype.toJSON = function (key) { + return this.valueOf(); + }; + } + + var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g, + escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g, + gap, + indent, + meta = { // table of character substitutions + '\b': '\\b', + '\t': '\\t', + '\n': '\\n', + '\f': '\\f', + '\r': '\\r', + '"' : '\\"', + '\\': '\\\\' + }, + rep; + + + function quote(string) { + +// If the string contains no control characters, no quote characters, and no +// backslash characters, then we can safely slap some quotes around it. +// Otherwise we must also replace the offending characters with safe escape +// sequences. + + escapable.lastIndex = 0; + return escapable.test(string) ? + '"' + string.replace(escapable, function (a) { + var c = meta[a]; + return typeof c === 'string' ? c : + '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4); + }) + '"' : + '"' + string + '"'; + } + + + function str(key, holder) { + +// Produce a string from holder[key]. + + var i, // The loop counter. + k, // The member key. + v, // The member value. + length, + mind = gap, + partial, + value = holder[key]; + +// If the value has a toJSON method, call it to obtain a replacement value. + + if (value && typeof value === 'object' && + typeof value.toJSON === 'function') { + value = value.toJSON(key); + } + +// If we were called with a replacer function, then call the replacer to +// obtain a replacement value. + + if (typeof rep === 'function') { + value = rep.call(holder, key, value); + } + +// What happens next depends on the value's type. + + switch (typeof value) { + case 'string': + return quote(value); + + case 'number': + +// JSON numbers must be finite. Encode non-finite numbers as null. + + return isFinite(value) ? String(value) : 'null'; + + case 'boolean': + case 'null': + +// If the value is a boolean or null, convert it to a string. Note: +// typeof null does not produce 'null'. The case is included here in +// the remote chance that this gets fixed someday. + + return String(value); + +// If the type is 'object', we might be dealing with an object or an array or +// null. + + case 'object': + +// Due to a specification blunder in ECMAScript, typeof null is 'object', +// so watch out for that case. + + if (!value) { + return 'null'; + } + +// Make an array to hold the partial results of stringifying this object value. + + gap += indent; + partial = []; + +// Is the value an array? + + if (Object.prototype.toString.apply(value) === '[object Array]') { + +// The value is an array. Stringify every element. Use null as a placeholder +// for non-JSON values. + + length = value.length; + for (i = 0; i < length; i += 1) { + partial[i] = str(i, value) || 'null'; + } + +// Join all of the elements together, separated with commas, and wrap them in +// brackets. + + v = partial.length === 0 ? '[]' : + gap ? '[\n' + gap + + partial.join(',\n' + gap) + '\n' + + mind + ']' : + '[' + partial.join(',') + ']'; + gap = mind; + return v; + } + +// If the replacer is an array, use it to select the members to be stringified. + + if (rep && typeof rep === 'object') { + length = rep.length; + for (i = 0; i < length; i += 1) { + k = rep[i]; + if (typeof k === 'string') { + v = str(k, value); + if (v) { + partial.push(quote(k) + (gap ? ': ' : ':') + v); + } + } + } + } else { + +// Otherwise, iterate through all of the keys in the object. + + for (k in value) { + if (Object.hasOwnProperty.call(value, k)) { + v = str(k, value); + if (v) { + partial.push(quote(k) + (gap ? ': ' : ':') + v); + } + } + } + } + +// Join all of the member texts together, separated with commas, +// and wrap them in braces. + + v = partial.length === 0 ? '{}' : + gap ? '{\n' + gap + partial.join(',\n' + gap) + '\n' + + mind + '}' : '{' + partial.join(',') + '}'; + gap = mind; + return v; + } + } + +// If the JSON object does not yet have a stringify method, give it one. + + if (typeof JSON.stringify !== 'function') { + JSON.stringify = function (value, replacer, space) { + +// The stringify method takes a value and an optional replacer, and an optional +// space parameter, and returns a JSON text. The replacer can be a function +// that can replace values, or an array of strings that will select the keys. +// A default replacer method can be provided. Use of the space parameter can +// produce text that is more easily readable. + + var i; + gap = ''; + indent = ''; + +// If the space parameter is a number, make an indent string containing that +// many spaces. + + if (typeof space === 'number') { + for (i = 0; i < space; i += 1) { + indent += ' '; + } + +// If the space parameter is a string, it will be used as the indent string. + + } else if (typeof space === 'string') { + indent = space; + } + +// If there is a replacer, it must be a function or an array. +// Otherwise, throw an error. + + rep = replacer; + if (replacer && typeof replacer !== 'function' && + (typeof replacer !== 'object' || + typeof replacer.length !== 'number')) { + throw new Error('JSON.stringify'); + } + +// Make a fake root object containing our value under the key of ''. +// Return the result of stringifying the value. + + return str('', {'': value}); + }; + } + + +// If the JSON object does not yet have a parse method, give it one. + + if (typeof JSON.parse !== 'function') { + JSON.parse = function (text, reviver) { + +// The parse method takes a text and an optional reviver function, and returns +// a JavaScript value if the text is a valid JSON text. + + var j; + + function walk(holder, key) { + +// The walk method is used to recursively walk the resulting structure so +// that modifications can be made. + + var k, v, value = holder[key]; + if (value && typeof value === 'object') { + for (k in value) { + if (Object.hasOwnProperty.call(value, k)) { + v = walk(value, k); + if (v !== undefined) { + value[k] = v; + } else { + delete value[k]; + } + } + } + } + return reviver.call(holder, key, value); + } + + +// Parsing happens in four stages. In the first stage, we replace certain +// Unicode characters with escape sequences. JavaScript handles many characters +// incorrectly, either silently deleting them, or treating them as line endings. + + text = String(text); + cx.lastIndex = 0; + if (cx.test(text)) { + text = text.replace(cx, function (a) { + return '\\u' + + ('0000' + a.charCodeAt(0).toString(16)).slice(-4); + }); + } + +// In the second stage, we run the text against regular expressions that look +// for non-JSON patterns. We are especially concerned with '()' and 'new' +// because they can cause invocation, and '=' because it can cause mutation. +// But just to be safe, we want to reject all unexpected forms. + +// We split the second stage into 4 regexp operations in order to work around +// crippling inefficiencies in IE's and Safari's regexp engines. First we +// replace the JSON backslash pairs with '@' (a non-JSON character). Second, we +// replace all simple value tokens with ']' characters. Third, we delete all +// open brackets that follow a colon or comma or that begin the text. Finally, +// we look to see that the remaining characters are only whitespace or ']' or +// ',' or ':' or '{' or '}'. If that is so, then the text is safe for eval. + + if (/^[\],:{}\s]*$/. +test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@'). +replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']'). +replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) { + +// In the third stage we use the eval function to compile the text into a +// JavaScript structure. The '{' operator is subject to a syntactic ambiguity +// in JavaScript: it can begin a block or an object literal. We wrap the text +// in parens to eliminate the ambiguity. + + j = eval('(' + text + ')'); + +// In the optional fourth stage, we recursively walk the new structure, passing +// each name/value pair to a reviver function for possible transformation. + + return typeof reviver === 'function' ? + walk({'': j}, '') : j; + } + +// If the text is not JSON parseable, then a SyntaxError is thrown. + + throw new SyntaxError('JSON.parse'); + }; + } +}()); diff --git a/js/pz2.js b/js/pz2.js index 34c507b..8aab9bf 100644 --- a/js/pz2.js +++ b/js/pz2.js @@ -69,6 +69,7 @@ var pz2 = function ( paramArray ) this.keepAlive = paramArray.keepAlive; this.sessionID = null; + this.serviceId = paramArray.serviceId || null; this.initStatusOK = false; this.pingStatusOK = false; this.searchStatusOK = false; @@ -121,7 +122,7 @@ var pz2 = function ( paramArray ) } // else, auto init session or wait for a user init? if (this.useSessions && paramArray.autoInit !== false) { - this.init(); + this.init(this.sessionId, this.serviceId); } }; @@ -165,12 +166,12 @@ pz2.prototype = this.resetCallback(); }, - init: function ( sessionId ) + init: function (sessionId, serviceId) { this.reset(); // session id as a param - if ( sessionId != undefined && this.useSessions ) { + if (sessionId && this.useSessions ) { this.initStatusOK = true; this.sessionID = sessionId; this.ping(); @@ -178,8 +179,10 @@ pz2.prototype = } else if (this.useSessions) { var context = this; var request = new pzHttpRequest(this.pz2String, this.errorHandler); + var opts = {'command' : 'init'}; + if (serviceId) opts.service = serviceId; request.safeGet( - { "command": "init" }, + opts, function(data) { if ( data.getElementsByTagName("status")[0] .childNodes[0].nodeValue == "OK" ) { @@ -634,6 +637,18 @@ pz2.prototype = bytarget[i][nodeName] = nodeText; } } + if (bytarget[i]["state"]=="Client_Disconnected") { + bytarget[i]["hits"] = "Error"; + } else if (bytarget[i]["state"]=="Client_Error") { + bytarget[i]["hits"] = "Error"; + } else if (bytarget[i]["state"]=="Client_Working") { + bytarget[i]["hits"] = "..."; + } + if (bytarget[i].diagnostic == "1") { + bytarget[i].diagnostic = "Permanent system error"; + } else if (bytarget[i].diagnostic == "2") { + bytarget[i].diagnostic = "Temporary system error"; + } } context.bytargetCounter++; @@ -704,6 +719,7 @@ var pzHttpRequest = function ( url, errorHandler ) { } }; + pzHttpRequest.prototype = { safeGet: function ( params, callback ) @@ -802,8 +818,33 @@ pzHttpRequest.prototype = this.request.responseXML == null) { if (this.request.responseText != null) { //assume JSON - var json = eval("(" + this.request.responseText + ")"); - this.callback(json, "json"); + + var json = null; + var text = this.request.responseText; + if (typeof window.JSON == "undefined") + json = eval("(" + text + ")"); + else { + try { + json = JSON.parse(text); + } + catch (e) { + // Safari: eval will fail as well. Considering trying JSON2 (non-native implementation) instead + /* DEBUG only works in mk2-mobile + if (document.getElementById("log")) + document.getElementById("log").innerHTML = "" + e + " " + length + ": " + text; + */ + try { + json = eval("(" + text + ")"); + } + catch (e) { + /* DEBUG only works in mk2-mobile + if (document.getElementById("log")) + document.getElementById("log").innerHTML = "" + e + " " + length + ": " + text; + */ + } + } + } + this.callback(json, "json"); } else { var err = new Error("XML response is empty but no error " + "for " + savedUrlForErrorReporting); diff --git a/m4 b/m4 index a68af87..f7d7eb4 160000 --- a/m4 +++ b/m4 @@ -1 +1 @@ -Subproject commit a68af871a42a363953e3ff78feff378787ad6ddd +Subproject commit f7d7eb4b44b7fdad1942e32856d6afc2e6dcabda diff --git a/pazpar2.spec b/pazpar2.spec new file mode 100644 index 0000000..f20e2e2 --- /dev/null +++ b/pazpar2.spec @@ -0,0 +1,119 @@ +Summary: Metasearcher +Name: pazpar2 +Version: 1.5.3 +Release: 1 +License: GPL +Group: Applications/Internet +Vendor: Index Data ApS +Source: pazpar2-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: libyaz4-devel +Packager: Adam Dickmeiss +URL: http://www.indexdata.com/pazpar2 + +%description +Pazpar2 is a high-performance, user interface-independent, data +model-independent metasearching middleware featuring merging, relevance +ranking, record sorting, and faceted results. + +Summary: pazpar2 daemon +Requires: libyaz4 + +%package -n pazpar2-js +Summary: pazpar2 JS +Group: Data +Requires: pazpar2 + +%post +if [ $1 = 1 ]; then + /sbin/chkconfig --add pazpar2 + /sbin/service pazpar2 start > /dev/null 2>&1 +else + /sbin/service pazpar2 restart > /dev/null 2>&1 +fi +%preun +if [ $1 = 0 ]; then + /sbin/service pazpar2 stop > /dev/null 2>&1 + /sbin/chkconfig --del pazpar2 +fi + +%description -n pazpar2-js +This package includes the Java Script library pz2.js. It also adds an +Alias for Apache2 so that this library and other demo portals are +available. + +%posttrans -n pazpar2-js +if [ -d /etc/httpd/conf.d ]; then + ln -sf /etc/pazpar2/ap2pazpar2-js.cfg /etc/httpd/conf.d/pazpar2-js.conf +fi +%preun -n pazpar2-js +if [ $1 = 0 ]; then + if [ -L /etc/httpd/conf.d/pazpar2-js.conf ]; then + rm /etc/httpd/conf.d/pazpar2-js.conf + fi +fi +%package -n pazpar2-doc +Summary: pazpar2 documentation +Group: Data + +%description -n pazpar2-doc +This package includes documentation for Pazpar2 - the metasearcher. + +%prep +%setup + +%build + +CFLAGS="$RPM_OPT_FLAGS" \ + ./configure --prefix=%{_prefix} --libdir=%{_libdir} --mandir=%{_mandir} \ + --with-yaz=/usr/bin +make CFLAGS="$RPM_OPT_FLAGS" + +%install +rm -fr ${RPM_BUILD_ROOT} +make prefix=${RPM_BUILD_ROOT}/%{_prefix} mandir=${RPM_BUILD_ROOT}/%{_mandir} \ + libdir=${RPM_BUILD_ROOT}/%{_libdir} install +mkdir -p ${RPM_BUILD_ROOT}/etc/pazpar2 +mkdir -p ${RPM_BUILD_ROOT}/etc/pazpar2/settings +mkdir -p ${RPM_BUILD_ROOT}/etc/pazpar2/services-enabled +mkdir -p ${RPM_BUILD_ROOT}/etc/pazpar2/services-available +cp etc/server.xml ${RPM_BUILD_ROOT}/etc/pazpar2/ +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 etc/*.xsl ${RPM_BUILD_ROOT}/etc/pazpar2/ +mkdir -p ${RPM_BUILD_ROOT}/etc/rc.d/init.d +install -m755 src/pazpar2.rpm.init ${RPM_BUILD_ROOT}/etc/rc.d/init.d/pazpar2 +echo "Alias /pazpar2 /usr/share/pazpar2" >${RPM_BUILD_ROOT}/etc/pazpar2/ap2pazpar2-js.cfg +mkdir -p ${RPM_BUILD_ROOT}/etc/logrotate.d +install -m644 src/pazpar2.rpm.logrotate ${RPM_BUILD_ROOT}/etc/logrotate.d/pazpar2 + +%clean +rm -fr ${RPM_BUILD_ROOT} + +%files +%defattr(-,root,root) +%doc README LICENSE NEWS +%{_sbindir}/pazpar2 +%dir %{_sysconfdir}/pazpar2 +%dir %{_sysconfdir}/pazpar2/settings +%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/services-available/*.xml +%config %{_sysconfdir}/rc.d/init.d/pazpar2 +%config(noreplace) /etc/logrotate.d/pazpar2 +%{_mandir}/man5/pazpar2* +%{_mandir}/man7/pazpar2* +%{_mandir}/man8/pazpar2* + +%files -n pazpar2-js +%defattr(-,root,root) +%{_datadir}/pazpar2/js/pz2.js +%config %{_sysconfdir}/pazpar2/ap2pazpar2-js.cfg + +%files -n pazpar2-doc +%defattr(-,root,root) +%{_defaultdocdir}/pazpar2 diff --git a/perf/bash/.gitignore b/perf/bash/.gitignore index 0da406c..c5413bf 100644 --- a/perf/bash/.gitignore +++ b/perf/bash/.gitignore @@ -1,2 +1,4 @@ *.log *.xml +*.time +run* diff --git a/perf/bash/client.sh b/perf/bash/client.sh index c48e89e..ecf2e6f 100755 --- a/perf/bash/client.sh +++ b/perf/bash/client.sh @@ -8,11 +8,18 @@ PORT=$2 if test -z "$PORT"; then PORT=9004 fi - - +SERVICE=$3 +if test -z "$SERVICE"; then + SERVICE=perf +fi +SETTINGS=$4 +WHAT=water H="http://localhost:${PORT}/search.pz2" -wget -q -O $OF.init.xml "$H/?command=init&service=perf&extra=$OF" +wget -q -O $OF.init.xml "$H/?command=init&service=${SERVICE}&extra=$OF" S=`xsltproc get_session.xsl $OF.init.xml` -wget -q -O $OF.search.xml "$H?command=search&query=100&session=$S" +if [ "$SETTINGS" != "" ] ; then + wget -q -O $OF.settings.xml "$H?command=settings&session=$S&$SETTINGS" +fi +wget -q -O $OF.search.xml "$H?command=search&query=$WHAT&session=$S" sleep 1 -wget -q -O $OF.show.xml "$H?command=show&session=$S&num=100&block=1" +wget -q -O $OF.show.xml "$H?command=show&session=$S&sort=relevance&start=0&num=100&block=1" diff --git a/perf/bash/client_termlist.sh b/perf/bash/client_termlist.sh new file mode 100755 index 0000000..43b9196 --- /dev/null +++ b/perf/bash/client_termlist.sh @@ -0,0 +1,26 @@ +#!/bin/bash +OF=$1 +if test -z "$OF"; then + OF=1 +fi + +PORT=$2 +if test -z "$PORT"; then + PORT=9004 +fi +SERVICE=$3 +if test -z "$SERVICE"; then + SERVICE=perf +fi +SETTINGS=$4 +WHAT=water +H="http://localhost:${PORT}/search.pz2" +wget -q -O $OF.init.xml "$H/?command=init&service=${SERVICE}&extra=$OF" +S=`xsltproc get_session.xsl $OF.init.xml` +if [ "$SETTINGS" != "" ] ; then + wget -q -O $OF.settings.xml "$H?command=settings&session=$S&$SETTINGS" +fi +wget -q -O $OF.search.xml "$H?command=search&query=$WHAT&session=$S" +sleep 1 +#wget -q -O $OF.show.xml "$H?command=termlist&session=$S&sort=relevance&start=0&num=100&block=1" +wget -q -O $OF.termlist.xml "$H?command=termlist&name=xtargets%2Csubject%2Cauthor&session=$S" diff --git a/perf/bash/client_timed.sh b/perf/bash/client_timed.sh index 7757947..61fc9ab 100755 --- a/perf/bash/client_timed.sh +++ b/perf/bash/client_timed.sh @@ -9,21 +9,39 @@ if test -z "$PORT"; then PORT=9004 fi +SERVICE=$3 +if test -z "$SERVICE"; then + SERVICE=perf_t +fi + +RECORDS=40 QUERY=100 -SERVICE=perf_t +NUM=20 +H="http://127.0.0.1:${PORT}/search.pz2" -H="http://localhost:${PORT}/search.pz2" +declare -i MAX_WAIT=2 +/usr/bin/time --format "$OF, init, %e" wget -q -O ${TMP_DIR}$OF.init.xml "$H/?command=init&service=${SERVICE}&extra=$OF" 2> ${TMP_DIR}$OF.init.time +S=`xsltproc get_session.xsl ${TMP_DIR}$OF.init.xml` +/usr/bin/time --format "$OF, search, %e" wget -q -O ${TMP_DIR}$OF.search.xml "$H?command=search&query=${QUERY}&session=$S" 2> ${TMP_DIR}$OF.search.time -/usr/bin/time --format "$OF, init, %e" wget -q -O $OF.init.xml "$H/?command=init&service=${SERVICE}&extra=$OF" 2> $OF.init.time -S=`xsltproc get_session.xsl $OF.init.xml` -/usr/bin/time --format "$OF, search, %e" wget -q -O $OF.search.xml "$H?command=search&query=${QUERY}&session=$S" 2> $OF.search.time -sleep 1 -# First show -/usr/bin/time --format "$OF, show, %e" wget -q -O $OF.show.xml "$H?command=show&session=$S" 2> $OF.show.time -AC=`xsltproc get_activeclients.xsl ${OF}.show.xml` -echo "Active clients: $AC " -if [ "${AC}" != "0" ] ; then - echo "Active clients: ${AC}" - /usr/bin/time --format "$OF, show2, %e" wget -q -O $OF.show.xml "$H?command=show&session=$S" 2>> $OF.show.time - AC=`xsltproc get_session.xsl $OF.show.xml` -fi +let r=0 +DO_DISPLAY=true +while [ ${DO_DISPLAY} ] ; do + SLEEP=$[ ($RANDOM % $MAX_WAIT ) ] + echo "show in $SLEEP" + sleep $SLEEP + /usr/bin/time --format "$OF, show2, %e" wget -q -O ${TMP_DIR}$OF.show.$r.xml "$H?command=show&session=$S&start=$r&num=${NUM}&block=1" 2>> ${TMP_DIR}$OF.show.time + AC=`xsltproc get_activeclients.xsl ${TMP_DIR}${OF}.show.$r.xml` + if [ "$AC" != "0" ] ; then + echo "Active clients: ${AC}" +# else +# DO_DISPLAY=false +# break + fi + let r=$r+$NUM + if [ $r -ge $RECORDS ] ; then + DO_DISPLAY=false + break; + fi +done +/usr/bin/time --format "$OF, termlist, %e" wget -q -O ${TMP_DIR}$OF.termlist.$r.xml "$H?command=termlist&session=$S&name=xtargets%2Csubject%2Cauthor" 2>> ${TMP_DIR}$OF.termlist.time diff --git a/perf/bash/exit.sh b/perf/bash/exit.sh new file mode 100755 index 0000000..d1cc0e3 --- /dev/null +++ b/perf/bash/exit.sh @@ -0,0 +1,9 @@ +#!/bin/bash +PORT=$1 +if test -z "$PORT"; then + PORT=9004 +fi + + +H="http://localhost:${PORT}/search.pz2" +wget -q -O $OF.show.xml "$H?command=exit" diff --git a/perf/bash/forever.sh b/perf/bash/forever.sh new file mode 100644 index 0000000..39bf32f --- /dev/null +++ b/perf/bash/forever.sh @@ -0,0 +1 @@ +while true ; do sh range.sh 1 25 9005 perf_t ; done diff --git a/perf/bash/generate_plot.sh b/perf/bash/generate_plot.sh new file mode 100644 index 0000000..73a0904 --- /dev/null +++ b/perf/bash/generate_plot.sh @@ -0,0 +1,31 @@ + +if [ "$1" != "" ] ; then + echo "set terminal $1" > range.gnuplot + echo "set terminal $1" > init.gnuplot + echo "set terminal $1" > search.gnuplot + echo "set terminal $1" > show.gnuplot +else + echo "" > range.gnuplot + echo "" > init.gnuplot + echo "" > search.gnuplot + echo "" > show.gnuplot +fi + +echo "plot 'range.stat' using 1:2 title 'init', 'range.stat'using 1:3 title 'search', 'range.stat'using 1:4 title 'show'" >> range.gnuplot +echo "plot 'init.stat' using 1:2 title 'init'" >> init.gnuplot +echo "plot 'search.stat' using 1:2 title 'Search'" >> search.gnuplot +echo "plot 'search.stat' using 1:2 title 'Show'" >> show.gnuplot + +if [ "$1" != "" ] ; then + gnuplot < range.gnuplot > range.$1 + gnuplot < init.gnuplot > init.$1 + gnuplot < search.gnuplot > search.$1 + gnuplot < show.gnuplot > show.$1 +else + gnuplot < range.gnuplot + gnuplot < init.gnuplot + gnuplot < search.gnuplot + gnuplot < show.gnuplot +fi + +cat range.gnuplot init.gnuplot search.gnuplot show.gnuplot > all.gnuplot diff --git a/perf/bash/get_activeclients.xsl b/perf/bash/get_activeclients.xsl new file mode 100644 index 0000000..6e5d966 --- /dev/null +++ b/perf/bash/get_activeclients.xsl @@ -0,0 +1,13 @@ + + + + + + + + + + diff --git a/perf/bash/par.config.dennis b/perf/bash/par.config.dennis new file mode 100644 index 0000000..03c4736 --- /dev/null +++ b/perf/bash/par.config.dennis @@ -0,0 +1,23 @@ +DELAY=0.0001 +WAIT=5 +NUMBER=10 +ROUNDS=2 +PORT=9005 +#SERVICE=perf_t +SHUTDOWN=0 +SETTINGS="use_url_proxy%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=0\ +&pz%3Acclmap%3Asu%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=1%3D21+s%3Dal\ +&secondary_request_syntax%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=OPAC\ +&pz%3Arequestsyntax%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=OPAC\ +&pz%3Acclmap%3Adate%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=1%3D30+r%3Dr\ +&pz%3Anativesyntax%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=txml\ +&category%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=JA%2Cid_subscription\ +&pz%3Aname%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=Cornell+University+Library\ +&pz%3Aelements%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=F\ +&pz%3Acclmap%3Ati%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=1%3D4+s%3Dal\ +&pz%3Acclmap%3Aau%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=1%3D1004+s%3Dal\ +&pz%3Axslt%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=opac_turbomarc.xsl\ +&pz%3Acclmap%3Aterm%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=1%3D1016+t%3Dl%2Cr+s%3Dal\ +&pz%3Acclmap%3Aisbn%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=1%3D7\ +&pz%3Aqueryencoding%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=UTF-8\ +&url_recipe%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=http%3A%2F%2Fcatalog.library.cornell.edu%2Fcgi-bin%2FPwebrecon.cgi%3FDB%3Dlocal%26v1%3D1%26BBRecID%3D%24%7Bmd-id%7D" \ No newline at end of file diff --git a/perf/bash/par.config.threaded b/perf/bash/par.config.threaded new file mode 100644 index 0000000..ede31b6 --- /dev/null +++ b/perf/bash/par.config.threaded @@ -0,0 +1,23 @@ +DELAY=0.0001 +WAIT=5 +NUMBER=10 +ROUNDS=100 +PORT=9005 +SERVICE=long +SHUTDOWN=0 +SETTINGS="use_url_proxy%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=0\ +&pz%3Acclmap%3Asu%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=1%3D21+s%3Dal\ +&secondary_request_syntax%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=OPAC\ +&pz%3Arequestsyntax%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=OPAC\ +&pz%3Acclmap%3Adate%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=1%3D30+r%3Dr\ +&pz%3Anativesyntax%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=txml\ +&category%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=JA%2Cid_subscription\ +&pz%3Aname%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=Cornell+University+Library\ +&pz%3Aelements%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=F\ +&pz%3Acclmap%3Ati%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=1%3D4+s%3Dal\ +&pz%3Acclmap%3Aau%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=1%3D1004+s%3Dal\ +&pz%3Axslt%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=opac_turbomarc.xsl\ +&pz%3Acclmap%3Aterm%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=1%3D1016+t%3Dl%2Cr+s%3Dal\ +&pz%3Acclmap%3Aisbn%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=1%3D7\ +&pz%3Aqueryencoding%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=UTF-8\ +&url_recipe%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=http%3A%2F%2Fcatalog.library.cornell.edu%2Fcgi-bin%2FPwebrecon.cgi%3FDB%3Dlocal%26v1%3D1%26BBRecID%3D%24%7Bmd-id%7D" \ No newline at end of file diff --git a/perf/bash/par.sh b/perf/bash/par.sh index b01a265..7072a3f 100755 --- a/perf/bash/par.sh +++ b/perf/bash/par.sh @@ -1,22 +1,35 @@ #!/bin/bash DELAY=0.001 WAIT=5 -NUMBER=40 +NUMBER=5 ROUNDS=5 +PORT=9004 +SERVICE=perf_t +SHUTDOWN=1 +HOST=127.0.0.1 if test -n "$1"; then . $1 fi let r=0 +if [ "$SETTINGS" != "" ] ; then + SETTINGS_OPT="--settings=\"$SETTINGS\" " + echo $SETTINGS_OPT +else + unset SETTINGS_OPT +fi + while test $r -lt $ROUNDS; do echo "$r" let i=0 while test $i -lt $NUMBER; do - ./client.sh $r.$i >$r.$i.log 2>&1 & - sleep $DELAY - let i=$i+1 + ./pp2client.sh --outfile=$r.$i --prefix=http://$HOST:${PORT}/search.pz2 --service=$SERVICE $SETTINGS_OPT >$r.$i.log 2>&1 & + sleep $DELAY + let i=$i+1 done sleep $WAIT let r=$r+1 done wait -wget -O x 'http://localhost:9004/?command=exit' +if [ "$SHUTDOWN" == "1" ] ; then + wget -O x "http://localhost:${PORT}/search.pz2?command=exit" +fi diff --git a/perf/bash/par_fixed_clients.sh b/perf/bash/par_fixed_clients.sh index a885aae..04d8524 100755 --- a/perf/bash/par_fixed_clients.sh +++ b/perf/bash/par_fixed_clients.sh @@ -4,29 +4,36 @@ if [ -z "$NUMBER" ] ; then NUMBER=20 fi -DELAY=0.001 -WAIT=1 -#NUMBER=100 -ROUNDS=2 +MAX_DELAY=1 +CLIENT_WAIT=2 +ROUNDS=10 let r=0 -PORT=9005 +PORT=$2 +SERVICE=$3 CLIENT_SCRIPT="client_timed.sh" +rm -f *.time +export TMP_DIR=run_`date +"%Y%m%d_%H%M%S"`/ +mkdir ${TMP_DIR} +rm -f latest +ln -s ${TMP_DIR} latest while test $r -lt $ROUNDS; do - echo "$r" - i=0 - while test $i -lt $NUMBER; do - ./${CLIENT_SCRIPT} $r.$i $PORT >$r.$i.log 2>&1 & - CLIENTS=`ps -ef |grep -c ${CLIENT_SCRIPT}` - while test $CLIENTS -ge $NUMBER ; do - sleep $WAIT - CLIENTS=`ps -ef |grep -c ${CLIENT_SCRIPT}` - echo "Active $CLIENTS" - done - let i=$i+1 + echo "$r" + i=0 + while test $i -lt $NUMBER; do + ./${CLIENT_SCRIPT} $r.$i $PORT $SERVICE >$r.$i.log 2>&1 & + SLEEP=$[ ( $RANDOM % $MAX_DELAY ) ] + sleep $SLEEP + CLIENTS=`ps -ef |grep ${CLIENT_SCRIPT} | grep -cv grep` + while test $CLIENTS -ge $NUMBER ; do + sleep $CLIENT_WAIT + CLIENTS=`ps -ef |grep ${CLIENT_SCRIPT} |grep -cv grep ` + echo "Active $CLIENTS" done - let r=$r+1 + let i=$i+1 + done + let r=$r+1 done wait -cat *.time > timed.$NUMBER.log +cat ${TMP_DIR}*.time >> ${TMP_DIR}timed.$SERVICE.$NUMBER.log #wget --tries=1 -O x "http://localhost:${PORT}/?command=exit" -sleep 5 \ No newline at end of file + diff --git a/perf/bash/par_fixed_count.sh b/perf/bash/par_fixed_count.sh new file mode 100644 index 0000000..461ce06 --- /dev/null +++ b/perf/bash/par_fixed_count.sh @@ -0,0 +1,16 @@ + +if [ "$2" == "" ] ; then + echo "Missing range" + exit 1 +fi + +LOOP=$3 +if [ "$3" == "" ] ; then + LOOP=1 +fi + +for e in `seq $LOOP` ; do + for d in `seq $1 $2` ; do + sh ./par_fixed_clients.sh $d 9005 perf_t ; sleep 120 ; + done +done diff --git a/perf/bash/par_forever.sh b/perf/bash/par_forever.sh new file mode 100644 index 0000000..8f9de2f --- /dev/null +++ b/perf/bash/par_forever.sh @@ -0,0 +1,3 @@ +while true; do + sh par.sh par.config.dennis +done \ No newline at end of file diff --git a/perf/bash/par_timed_forever.sh b/perf/bash/par_timed_forever.sh new file mode 100644 index 0000000..fe3a7ee --- /dev/null +++ b/perf/bash/par_timed_forever.sh @@ -0,0 +1 @@ +while true ; do sh par_fixed_clients.sh 20 9005 perf_t ; done diff --git a/perf/bash/plot_combine_runs.sh b/perf/bash/plot_combine_runs.sh new file mode 100644 index 0000000..e2a6665 --- /dev/null +++ b/perf/bash/plot_combine_runs.sh @@ -0,0 +1,7 @@ +echo set terminal pdf +echo set output \"combined_init.pdf\" +echo "plot '../run_20100511_150215/range.stat' using 1:2 title 'init(marcxml)', '../run_20100511_152140/range.stat' using 1:2 title 'init(turbomarc)' " +echo set output \"combined_search.pdf\" +echo "plot '../run_20100511_150215/range.stat' using 1:3 title 'search(marcxml)', '../run_20100511_152140/range.stat' using 1:3 title 'search(turbomarc)' " +echo set output \"combined_show.pdf\" +echo "plot '../run_20100511_150215/range.stat' using 1:4 title 'show(marcxml)', '../run_20100511_152140/range.stat' using 1:4 title 'show(turbomarc)' " diff --git a/perf/bash/pp2client.sh b/perf/bash/pp2client.sh new file mode 100755 index 0000000..611c0dc --- /dev/null +++ b/perf/bash/pp2client.sh @@ -0,0 +1,72 @@ +#!/bin/sh + +usage() +{ + cat <> $RANGE.stat + let r=$r+1 +done + +DIR=run_`date +"%Y%m%d_%H%M%S"` +mkdir $DIR +mv *.stat *.log *.time $DIR + +#mv init.stat $PID.init.stat +#mv search.stat $PID.search.stat +#mv show.stat $PID.show.stat +#mv $RANGE.stat $PID.show.stat diff --git a/perf/bash/range_plot.sh b/perf/bash/range_plot.sh new file mode 100644 index 0000000..a87e071 --- /dev/null +++ b/perf/bash/range_plot.sh @@ -0,0 +1,12 @@ + +if [ "$2" != "" ] ; then + echo "set terminal $2" +fi + +if [ "$1" != "" ] ; then + RANGE=$1 +else + RANGE=range +fi + +echo "plot '$RANGE.stat' using 1:2 title 'init', '$RANGE.stat'using 1:3 title 'search', '$RANGE.stat'using 1:4 title 'show' " diff --git a/perf/bash/show.gnuplot b/perf/bash/show.gnuplot new file mode 100644 index 0000000..0d6e18b --- /dev/null +++ b/perf/bash/show.gnuplot @@ -0,0 +1,3 @@ +set terminal png +plot 'show.stat' using 1:2 title 'Show' + diff --git a/perf/bash/stat_file.sh b/perf/bash/stat_file.sh index 20452bf..14e164a 100644 --- a/perf/bash/stat_file.sh +++ b/perf/bash/stat_file.sh @@ -1,8 +1,4 @@ -FILE=timed.$1.log -TEMP=${FILE/timed./} -USERS=${TEMP/.log/} -#echo $USERS $FILE stat_word () { WORD=$1 @@ -18,7 +14,22 @@ stat_word () { echo "$AVG" } -INIT=`stat_word "init" ` -SEARCH=`stat_word "search"` -SHOW=`stat_word "show"` -echo "$USERS $INIT $SEARCH $SHOW" +SERVICE=perf_t +if [ "$2" != "" ] ; then + SERVICE=$2 +fi +FILE=timed.$SERVICE.$1.log +USERS=$1 +if [ -f $FILE ] ; then + INIT=`stat_word "init" ` + grep init $FILE | sed -e "s/^.*,/$USERS /" >> init.stat + SEARCH=`stat_word "search"` + grep search $FILE | sed -e "s/^.*,/$USERS /" >> search.stat + SHOW=`stat_word "show"` + grep show $FILE | sed -e "s/^.*,/$USERS /" >> show.stat + + echo "$1 $INIT $SEARCH $SHOW" +else + echo "# no such file $FILE" +fi + diff --git a/solr/.gitignore b/solr/.gitignore new file mode 100644 index 0000000..41134d6 --- /dev/null +++ b/solr/.gitignore @@ -0,0 +1,3 @@ +index.log +part*.dat.gz.* +data \ No newline at end of file diff --git a/solr/loc.sh b/solr/loc.sh new file mode 100755 index 0000000..e561896 --- /dev/null +++ b/solr/loc.sh @@ -0,0 +1,63 @@ +#!/bin/bash +LOG=index.log +MARCDUMP="yaz-marcdump" + +if [ "$SOLR_URL" == "" ] ; then + DEF_HOST=-Durl="http://localhost:8983/solr/update" +else + DEF_HOST=-Durl="$SOLR_URL" +fi + +if [ -d "./data" ] ; then + LOCDATA="./data" +else + LOCDATA=/extra/heikki/locdata +fi + +if [ ! -d "$LOCDATA" ] ; then + echo "$LOCDATA not a directory" + exit 1 +fi + +if [ "$1" == "" ] ; then + FILES="$LOCDATA/part*" +else + FILES="$*" +fi +#echo $FILES + +rm -f $LOG + +function convert() +{ + FILE=$2 + echo "zcat $1 > $FILE.mrc" + zcat $1 > $FILE.mrc + $MARCDUMP -f marc8 -t utf-8 -o turbomarc $FILE.mrc > $FILE.xml + xsltproc ../test/tmarc.xsl $FILE.xml > $FILE.pz + xsltproc ../etc/pz2-solr.xsl $FILE.pz > $FILE.solr + ls -l $FILE.* >> $LOG +} + +if [ "$TWO_PASS" == "1" ] ; then + for d in ${FILES} ; do + date "+%c converting $d" >>$LOG + FILE=`basename $1` + convert $d $FILE + done +fi + +for d in ${FILES} ; do + date "+%c converting $d" >>$LOG + BASE=`basename $d` + FILE=$BASE.solr + if [ ! -f "$FILE" ] ; then + convert $d $BASE + fi + date "+%c indexing $d" >>$LOG + java $DEF_HOST -jar post.jar $FILE + date "+%c indexing $d ended" >>$LOG + #rm tmp.* +done +date "+%c All done" >>$LOG +exit 0 diff --git a/solr/post.jar b/solr/post.jar new file mode 100644 index 0000000..c1aff38 Binary files /dev/null and b/solr/post.jar differ diff --git a/solr/schema.xml b/solr/schema.xml new file mode 100644 index 0000000..7fdc2b8 --- /dev/null +++ b/solr/schema.xml @@ -0,0 +1,633 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id + + + text + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Makefile.am b/src/Makefile.am index 54292be..5ff1aa8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,6 +2,8 @@ sbin_PROGRAMS = pazpar2 +EXTRA_DIST = pazpar2.rpm.init pazpar2.rpm.logrotate + check_PROGRAMS = \ test_sel_thread \ test_normalize @@ -10,8 +12,6 @@ TESTS = $(check_PROGRAMS) noinst_LIBRARIES = libpazpar2.a -MAINTAINERCLEANFILES = Makefile.in cconfig.h - CONFIG_CLEAN_FILES=*.log AM_CFLAGS = $(YAZINC) diff --git a/src/charsets.c b/src/charsets.c index f867b6f..7bbe102 100644 --- a/src/charsets.c +++ b/src/charsets.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -51,6 +51,7 @@ struct pp2_charset_s { #endif }; +static const char *pp2_relevance_token_null(pp2_relevance_token_t prt); static const char *pp2_relevance_token_a_to_z(pp2_relevance_token_t prt); static const char *pp2_get_sort_ascii(pp2_relevance_token_t prt); @@ -109,11 +110,18 @@ void pp2_charset_incref(pp2_charset_t pct) (pct->ref_count)++; } -pp2_charset_t pp2_charset_create(struct icu_chain * icu_chn) +pp2_charset_t pp2_charset_create_a_to_z(void) +{ + pp2_charset_t pct = pp2_charset_create(0); + pct->token_next_handler = pp2_relevance_token_a_to_z; + return pct; +} + +pp2_charset_t pp2_charset_create(struct icu_chain *icu_chn) { pp2_charset_t pct = xmalloc(sizeof(*pct)); - pct->token_next_handler = pp2_relevance_token_a_to_z; + pct->token_next_handler = pp2_relevance_token_null; pct->get_sort_handler = pp2_get_sort_ascii; pct->ref_count = 1; #if YAZ_HAVE_ICU @@ -272,6 +280,16 @@ static const char *pp2_get_sort_ascii(pp2_relevance_token_t prt) } } +static const char *pp2_relevance_token_null(pp2_relevance_token_t prt) +{ + const char *cp = prt->cp; + + prt->last_cp = *cp ? cp : 0; + while (*cp) + cp++; + prt->cp = cp; + return prt->last_cp; +} #if YAZ_HAVE_ICU static const char *pp2_relevance_token_icu(pp2_relevance_token_t prt) diff --git a/src/charsets.h b/src/charsets.h index fbc6193..2d688eb 100644 --- a/src/charsets.h +++ b/src/charsets.h @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -34,6 +34,8 @@ typedef struct pp2_relevance_token_s *pp2_relevance_token_t; pp2_charset_t pp2_charset_create_xml(xmlNode *xml_node); pp2_charset_t pp2_charset_create(struct icu_chain * icu_chn); +pp2_charset_t pp2_charset_create_a_to_z(void); + void pp2_charset_destroy(pp2_charset_t pct); void pp2_charset_incref(pp2_charset_t pct); diff --git a/src/client.c b/src/client.c index c238f0a..ad5f44a 100644 --- a/src/client.c +++ b/src/client.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -24,7 +24,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #if HAVE_CONFIG_H #include #endif -#include #include #include #include @@ -52,6 +51,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include #include +#include #define USE_TIMING 0 #if USE_TIMING @@ -67,23 +67,26 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "relevance.h" #include "incref.h" -/* client counting (1) , disable client counting (0) */ -#if 1 static YAZ_MUTEX g_mutex = 0; static int no_clients = 0; -static void client_use(int delta) +static int client_use(int delta) { + int clients; if (!g_mutex) yaz_mutex_create(&g_mutex); yaz_mutex_enter(g_mutex); no_clients += delta; + clients = no_clients; yaz_mutex_leave(g_mutex); - yaz_log(YLOG_LOG, "%s clients=%d", delta > 0 ? "INC" : "DEC", no_clients); + yaz_log(YLOG_DEBUG, "%s clients=%d", delta == 0 ? "" : (delta > 0 ? "INC" : "DEC"), clients); + return clients; } -#else -#define client_use(x) -#endif + +int clients_count(void) { + return client_use(0); +} + /** \brief Represents client state for a connection to one search target */ struct client { @@ -97,11 +100,14 @@ struct client { int maxrecs; int startrecs; int diagnostic; + int preferred; enum client_state state; struct show_raw *show_raw; ZOOM_resultset resultset; YAZ_MUTEX mutex; int ref_count; + /* copy of database->url */ + char *url; }; struct show_raw { @@ -137,17 +143,23 @@ enum client_state client_get_state(struct client *cl) void client_set_state(struct client *cl, enum client_state st) { + int was_active = 0; + if (client_is_active(cl)) + was_active = 1; cl->state = st; - /* no need to check for all client being non-active if this one - already is. Note that session_active_clients also LOCKS session */ -#if 0 - if (!client_is_active(cl) && cl->session) + /* If client is going from being active to inactive and all clients + are now idle we fire a watch for the session . The assumption is + that session is not mutex locked if client is already active */ + if (was_active && !client_is_active(cl) && cl->session) { + int no_active = session_active_clients(cl->session); - if (no_active == 0) + yaz_log(YLOG_DEBUG, "%s: releasing watches on zero active: %d", client_get_url(cl), no_active); + if (no_active == 0) { session_alert_watch(cl->session, SESSION_WATCH_SHOW); + session_alert_watch(cl->session, SESSION_WATCH_SHOW_PREF); + } } -#endif } static void client_show_raw_error(struct client *cl, const char *addinfo); @@ -394,6 +406,33 @@ static int nativesyntax_to_type(struct session_database *sdb, char *type, } } +/** + * TODO Consider thread safety!!! + * + */ +int client_report_facets(struct client *cl, ZOOM_resultset rs) { + int facet_idx; + ZOOM_facet_field *facets = ZOOM_resultset_facets(rs); + int facet_num; + struct session *se = client_get_session(cl); + facet_num = ZOOM_resultset_facets_size(rs); + yaz_log(YLOG_DEBUG, "client_report_facets: %d", facet_num); + + for (facet_idx = 0; facet_idx < facet_num; facet_idx++) { + const char *name = ZOOM_facet_field_name(facets[facet_idx]); + size_t term_idx; + size_t term_num = ZOOM_facet_field_term_count(facets[facet_idx]); + for (term_idx = 0; term_idx < term_num; term_idx++ ) { + int freq; + const char *term = ZOOM_facet_field_get_term(facets[facet_idx], term_idx, &freq); + if (term) + add_facet(se, name, term, freq); + } + } + + return 0; +} + static void ingest_raw_record(struct client *cl, ZOOM_record rec) { const char *buf; @@ -413,12 +452,33 @@ static void ingest_raw_record(struct client *cl, ZOOM_record rec) client_show_raw_dequeue(cl); } +void client_check_preferred_watch(struct client *cl) +{ + struct session *se = cl->session; + yaz_log(YLOG_DEBUG, "client_check_preferred_watch: %s ", client_get_url(cl)); + if (se) + { + client_unlock(cl); + if (session_is_preferred_clients_ready(se)) { + session_alert_watch(se, SESSION_WATCH_SHOW_PREF); + } + else + yaz_log(YLOG_DEBUG, "client_check_preferred_watch: Still locked on preferred targets."); + + client_lock(cl); + } + else + yaz_log(YLOG_WARN, "client_check_preferred_watch: %s. No session!", client_get_url(cl)); + +} + void client_search_response(struct client *cl) { struct connection *co = cl->connection; struct session *se = cl->session; ZOOM_connection link = connection_get_link(co); ZOOM_resultset resultset = cl->resultset; + const char *error, *addinfo = 0; if (ZOOM_connection_error(link, &error, &addinfo)) @@ -430,10 +490,16 @@ void client_search_response(struct client *cl) } else { + yaz_log(YLOG_DEBUG, "client_search_response: hits " + ODR_INT_PRINTF, cl->hits); + client_report_facets(cl, resultset); cl->record_offset = cl->startrecs; cl->hits = ZOOM_resultset_size(resultset); - if (se) + if (se) { se->total_hits += cl->hits; + yaz_log(YLOG_DEBUG, "client_search_response: total hits " + ODR_INT_PRINTF, se->total_hits); + } } } @@ -526,6 +592,63 @@ void client_record_response(struct client *cl) } } +static int client_set_facets_request(struct client *cl, ZOOM_connection link) +{ + struct session_database *sdb = client_get_database(cl); + const char *opt_facet_term_sort = session_setting_oneval(sdb, PZ_TERMLIST_TERM_SORT); + const char *opt_facet_term_count = session_setting_oneval(sdb, PZ_TERMLIST_TERM_COUNT); + + /* Future record filtering on target */ + /* const char *opt_facet_record_filter = session_setting_oneval(sdb, PZ_RECORDFILTER); */ + + /* Disable when no count is set */ + /* TODO Verify: Do we need to reset the ZOOM facets if a ZOOM Connection is being reused??? */ + if (opt_facet_term_count && *opt_facet_term_count) + { + int index = 0; + struct session *session = client_get_session(cl); + struct conf_service *service = session->service; + int num = service->num_metadata; + WRBUF wrbuf = wrbuf_alloc(); + yaz_log(YLOG_DEBUG, "Facet settings, sort: %s count: %s", + opt_facet_term_sort, opt_facet_term_count); + for (index = 0; index < num; index++) + { + struct conf_metadata *conf_meta = &service->metadata[index]; + if (conf_meta->termlist) + { + if (wrbuf_len(wrbuf)) + wrbuf_puts(wrbuf, ", "); + wrbuf_printf(wrbuf, "@attr 1=%s", conf_meta->name); + + if (opt_facet_term_sort && *opt_facet_term_sort) + wrbuf_printf(wrbuf, " @attr 2=%s", opt_facet_term_sort); + wrbuf_printf(wrbuf, " @attr 3=%s", opt_facet_term_count); + } + } + if (wrbuf_len(wrbuf)) + { + yaz_log(YLOG_LOG, "Setting ZOOM facets option: %s", wrbuf_cstr(wrbuf)); + ZOOM_connection_option_set(link, "facets", wrbuf_cstr(wrbuf)); + return 1; + } + } + return 0; +} + +int client_has_facet(struct client *cl, const char *name) { + ZOOM_facet_field facet_field; + if (!cl || !cl->resultset || !name) { + return 0; + } + facet_field = ZOOM_resultset_get_facet_field(cl->resultset, name); + if (facet_field) { + return 1; + } + return 0; +} + + void client_start_search(struct client *cl) { struct session_database *sdb = client_get_database(cl); @@ -533,13 +656,15 @@ void client_start_search(struct client *cl) ZOOM_connection link = connection_get_link(co); ZOOM_resultset rs; char *databaseName = sdb->database->databases[0]; - const char *opt_piggyback = session_setting_oneval(sdb, PZ_PIGGYBACK); - const char *opt_queryenc = session_setting_oneval(sdb, PZ_QUERYENCODING); - const char *opt_elements = session_setting_oneval(sdb, PZ_ELEMENTS); - const char *opt_requestsyn = session_setting_oneval(sdb, PZ_REQUESTSYNTAX); - const char *opt_maxrecs = session_setting_oneval(sdb, PZ_MAXRECS); - const char *opt_sru = session_setting_oneval(sdb, PZ_SRU); - const char *opt_sort = session_setting_oneval(sdb, PZ_SORT); + const char *opt_piggyback = session_setting_oneval(sdb, PZ_PIGGYBACK); + const char *opt_queryenc = session_setting_oneval(sdb, PZ_QUERYENCODING); + const char *opt_elements = session_setting_oneval(sdb, PZ_ELEMENTS); + const char *opt_requestsyn = session_setting_oneval(sdb, PZ_REQUESTSYNTAX); + const char *opt_maxrecs = session_setting_oneval(sdb, PZ_MAXRECS); + const char *opt_sru = session_setting_oneval(sdb, PZ_SRU); + const char *opt_sort = session_setting_oneval(sdb, PZ_SORT); + const char *opt_preferred = session_setting_oneval(sdb, PZ_PREFERRED); + const char *extra_args = session_setting_oneval(sdb, PZ_EXTRA_ARGS); char maxrecs_str[24], startrecs_str[24]; assert(link); @@ -547,6 +672,15 @@ void client_start_search(struct client *cl) cl->hits = -1; cl->record_offset = 0; cl->diagnostic = 0; + + if (extra_args && *extra_args) + ZOOM_connection_option_set(link, "extraArgs", extra_args); + + if (opt_preferred) { + cl->preferred = atoi(opt_preferred); + if (cl->preferred) + yaz_log(YLOG_LOG, "Target %s has preferred status: %d", sdb->database->url, cl->preferred); + } client_set_state(cl, Client_Working); if (*opt_piggyback) @@ -562,18 +696,19 @@ void client_start_search(struct client *cl) if (*opt_requestsyn) ZOOM_connection_option_set(link, "preferredRecordSyntax", opt_requestsyn); - if (!*opt_maxrecs) + if (opt_maxrecs && *opt_maxrecs) { - sprintf(maxrecs_str, "%d", cl->maxrecs); - opt_maxrecs = maxrecs_str; + cl->maxrecs = atoi(opt_maxrecs); } - ZOOM_connection_option_set(link, "count", opt_maxrecs); + /* convert back to string representation used in ZOOM API */ + sprintf(maxrecs_str, "%d", cl->maxrecs); + ZOOM_connection_option_set(link, "count", maxrecs_str); - if (atoi(opt_maxrecs) > 20) + if (cl->maxrecs > 20) ZOOM_connection_option_set(link, "presentChunk", "20"); else - ZOOM_connection_option_set(link, "presentChunk", opt_maxrecs); + ZOOM_connection_option_set(link, "presentChunk", maxrecs_str); sprintf(startrecs_str, "%d", cl->startrecs); ZOOM_connection_option_set(link, "start", startrecs_str); @@ -581,13 +716,17 @@ void client_start_search(struct client *cl) if (databaseName) ZOOM_connection_option_set(link, "databaseName", databaseName); + /* TODO Verify does it break something for CQL targets(non-SOLR) ? */ + /* facets definition is in PQF */ + client_set_facets_request(cl, link); + if (cl->cqlquery) { ZOOM_query q = ZOOM_query_create(); yaz_log(YLOG_LOG, "Search %s CQL: %s", sdb->database->url, cl->cqlquery); ZOOM_query_cql(q, cl->cqlquery); - if (*opt_sort) - ZOOM_query_sortby(q, opt_sort); + if (*opt_sort) + ZOOM_query_sortby(q, opt_sort); rs = ZOOM_connection_search(link, q); ZOOM_query_destroy(q); } @@ -603,27 +742,28 @@ void client_start_search(struct client *cl) struct client *client_create(void) { - struct client *r = xmalloc(sizeof(*r)); - r->maxrecs = 100; - r->startrecs = 0; - r->pquery = 0; - r->cqlquery = 0; - r->database = 0; - r->connection = 0; - r->session = 0; - r->hits = 0; - r->record_offset = 0; - r->diagnostic = 0; - r->state = Client_Disconnected; - r->show_raw = 0; - r->resultset = 0; - r->mutex = 0; - pazpar2_mutex_create(&r->mutex, "client"); - - r->ref_count = 1; + struct client *cl = xmalloc(sizeof(*cl)); + cl->maxrecs = 100; + cl->startrecs = 0; + cl->pquery = 0; + cl->cqlquery = 0; + cl->database = 0; + cl->connection = 0; + cl->session = 0; + cl->hits = 0; + cl->record_offset = 0; + cl->diagnostic = 0; + cl->state = Client_Disconnected; + cl->show_raw = 0; + cl->resultset = 0; + cl->mutex = 0; + pazpar2_mutex_create(&cl->mutex, "client"); + cl->preferred = 0; + cl->ref_count = 1; + cl->url = 0; client_use(1); - return r; + return cl; } void client_lock(struct client *c) @@ -639,7 +779,7 @@ void client_unlock(struct client *c) void client_incref(struct client *c) { pazpar2_incref(&c->ref_count, c->mutex); - yaz_log(YLOG_LOG, "client_incref c=%p %s cnt=%d", + yaz_log(YLOG_DEBUG, "client_incref c=%p %s cnt=%d", c, client_get_url(c), c->ref_count); } @@ -647,7 +787,7 @@ int client_destroy(struct client *c) { if (c) { - yaz_log(YLOG_LOG, "client_destroy c=%p %s cnt=%d", + yaz_log(YLOG_DEBUG, "client_destroy c=%p %s cnt=%d", c, client_get_url(c), c->ref_count); if (!pazpar2_decref(&c->ref_count, c->mutex)) { @@ -655,9 +795,13 @@ int client_destroy(struct client *c) c->pquery = 0; xfree(c->cqlquery); c->cqlquery = 0; + xfree(c->url); assert(!c->connection); - assert(!c->resultset); - + + if (c->resultset) + { + ZOOM_resultset_destroy(c->resultset); + } yaz_mutex_destroy(&c->mutex); xfree(c); client_use(-1); @@ -670,10 +814,7 @@ int client_destroy(struct client *c) void client_set_connection(struct client *cl, struct connection *con) { if (cl->resultset) - { - ZOOM_resultset_destroy(cl->resultset); - cl->resultset = 0; - } + ZOOM_resultset_release(cl->resultset); if (con) { assert(cl->connection == 0); @@ -755,6 +896,34 @@ static char *make_cqlquery(struct client *cl) return r; } +// returns a xmalloced SOLR query corresponding to the pquery in client +// TODO Could prob. be merge with the similar make_cqlquery +static char *make_solrquery(struct client *cl) +{ + solr_transform_t sqlt = solr_transform_create(); + Z_RPNQuery *zquery; + char *r; + WRBUF wrb = wrbuf_alloc(); + int status; + ODR odr_out = odr_createmem(ODR_ENCODE); + + zquery = p_query_rpn(odr_out, cl->pquery); + yaz_log(YLOG_LOG, "PQF: %s", cl->pquery); + if ((status = solr_transform_rpn2solr_wrbuf(sqlt, wrb, zquery))) + { + yaz_log(YLOG_WARN, "Failed to generate SOLR query, code=%d", status); + r = 0; + } + else + { + r = xstrdup(wrbuf_cstr(wrb)); + } + wrbuf_destroy(wrb); + odr_destroy(odr_out); + solr_transform_close(sqlt); + return r; +} + // Parse the query given the settings specific to this client int client_parse_query(struct client *cl, const char *query) { @@ -766,7 +935,7 @@ int client_parse_query(struct client *cl, const char *query) const char *sru = session_setting_oneval(sdb, PZ_SRU); const char *pqf_prefix = session_setting_oneval(sdb, PZ_PQF_PREFIX); const char *pqf_strftime = session_setting_oneval(sdb, PZ_PQF_STRFTIME); - + const char *query_syntax = session_setting_oneval(sdb, PZ_QUERY_SYNTAX); if (!ccl_map) return -1; @@ -775,7 +944,7 @@ int client_parse_query(struct client *cl, const char *query) if (!cn) { client_set_state(cl, Client_Error); - yaz_log(YLOG_WARN, "Failed to parse CCL query %s for %s", + session_log(se, YLOG_WARN, "Failed to parse CCL query '%s' for %s", query, client_get_database(cl)->database->url); return -1; @@ -810,14 +979,25 @@ int client_parse_query(struct client *cl, const char *query) cl->pquery = xstrdup(wrbuf_cstr(se->wrbuf)); xfree(cl->cqlquery); - if (*sru) + + /* Support for PQF on SRU targets. + * TODO Refactor */ + yaz_log(YLOG_DEBUG, "Query syntax: %s", query_syntax); + if (strcmp(query_syntax, "pqf") != 0 && *sru) { - if (!(cl->cqlquery = make_cqlquery(cl))) - return -1; + if (!strcmp(sru, "solr")) { + if (!(cl->cqlquery = make_solrquery(cl))) + return -1; + } + else { + if (!(cl->cqlquery = make_cqlquery(cl))) + return -1; + } } else cl->cqlquery = 0; + /* TODO FIX Not thread safe */ if (!se->relevance) { // Initialize relevance structure with query terms @@ -845,6 +1025,19 @@ int client_is_active(struct client *cl) return 0; } +int client_is_active_preferred(struct client *cl) +{ + /* only count if this is a preferred target. */ + if (!cl->preferred) + return 0; + /* TODO No sure this the condition that Seb wants */ + if (cl->connection && (cl->state == Client_Connecting || + cl->state == Client_Working)) + return 1; + return 0; +} + + Odr_int client_get_hits(struct client *cl) { return cl->hits; @@ -868,6 +1061,10 @@ int client_get_diagnostic(struct client *cl) void client_set_database(struct client *cl, struct session_database *db) { cl->database = db; + /* Copy the URL for safe logging even after session is gone */ + if (db) { + cl->url = xstrdup(db->database->url); + } } struct host *client_get_host(struct client *cl) @@ -877,9 +1074,10 @@ struct host *client_get_host(struct client *cl) const char *client_get_url(struct client *cl) { - if (cl->database) - return client_get_database(cl)->database->url; + if (cl->url) + return cl->url; else + /* This must not happen anymore, as the url is present until destruction of client */ return "NOURL"; } @@ -888,11 +1086,22 @@ void client_set_maxrecs(struct client *cl, int v) cl->maxrecs = v; } +int client_get_maxrecs(struct client *cl) +{ + return cl->maxrecs; +} + void client_set_startrecs(struct client *cl, int v) { cl->startrecs = v; } +void client_set_preferred(struct client *cl, int v) +{ + cl->preferred = v; +} + + /* * Local variables: * c-basic-offset: 4 diff --git a/src/client.h b/src/client.h index 4d23481..52c8691 100644 --- a/src/client.h +++ b/src/client.h @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -73,10 +73,11 @@ void client_disconnect(struct client *cl); int client_prep_connection(struct client *cl, int operation_timeout, int session_timeout, iochan_man_t iochan, - const struct timespec *abstime); + const struct timeval *abstime); void client_start_search(struct client *cl); void client_set_session(struct client *cl, struct session *se); int client_is_active(struct client *cl); +int client_is_active_preferred(struct client *cl); struct client *client_next_in_session(struct client *cl); int client_parse_query(struct client *cl, const char *query); @@ -88,12 +89,17 @@ void client_set_database(struct client *cl, struct session_database *db); struct host *client_get_host(struct client *cl); const char *client_get_url(struct client *cl); void client_set_maxrecs(struct client *cl, int v); +int client_get_maxrecs(struct client *cl); void client_set_startrecs(struct client *cl, int v); void client_remove_from_session(struct client *c); void client_incref(struct client *c); void client_got_records(struct client *c); void client_lock(struct client *c); void client_unlock(struct client *c); + +int client_has_facet(struct client *cl, const char *name); +void client_check_preferred_watch(struct client *cl); + #endif /* diff --git a/src/connection.c b/src/connection.c index f95beb1..012d994 100644 --- a/src/connection.c +++ b/src/connection.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -78,7 +78,8 @@ struct connection { enum { Conn_Resolving, Conn_Connecting, - Conn_Open + Conn_Open, + Conn_Dead } state; int operation_timeout; int session_timeout; @@ -133,14 +134,13 @@ static void connection_destroy(struct connection *co) ZOOM_connection_destroy(co->link); iochan_destroy(co->iochan); } - yaz_log(YLOG_DEBUG, "Connection destroy %s", co->host->hostport); + yaz_log(YLOG_DEBUG, "%p Connection destroy %s", co, co->host->hostport); if (co->client) { client_disconnect(co->client); } - remove_connection_from_host(co); xfree(co->zproxy); xfree(co); connection_use(-1); @@ -194,23 +194,27 @@ static void non_block_events(struct connection *co) continue; ev = ZOOM_connection_last_event(link); -#if 0 - yaz_log(YLOG_LOG, "ZOOM_EVENT_%s", ZOOM_get_event_str(ev)); +#if 1 + yaz_log(YLOG_DEBUG, "%p Connection ZOOM_EVENT_%s", co, ZOOM_get_event_str(ev)); #endif switch (ev) { case ZOOM_EVENT_END: { const char *error, *addinfo; - int err; + int err; if ((err = ZOOM_connection_error(link, &error, &addinfo))) { yaz_log(YLOG_LOG, "Error %s from %s", error, client_get_url(cl)); + client_set_diagnostic(cl, err); + client_set_state(cl, Client_Error); + } + else + { + iochan_settimeout(iochan, co->session_timeout); + client_set_state(cl, Client_Idle); } - iochan_settimeout(iochan, co->session_timeout); - client_set_diagnostic(cl, err); - client_set_state(cl, Client_Idle); yaz_cond_broadcast(co->host->cond_ready); } break; @@ -247,6 +251,7 @@ static void non_block_events(struct connection *co) struct client *cl = co->client; if (cl) { + client_check_preferred_watch(cl); client_got_records(cl); } } @@ -275,28 +280,28 @@ static void connection_handler(IOCHAN iochan, int event) a closed connection from the target.. Or, perhaps, an unexpected package.. We will just close the connection */ yaz_log(YLOG_LOG, "timeout connection %p event=%d", co, event); - connection_destroy(co); + remove_connection_from_host(co); yaz_mutex_leave(host->mutex); + connection_destroy(co); } else if (event & EVENT_TIMEOUT) { if (co->state == Conn_Connecting) { - yaz_log(YLOG_WARN, "connect timeout %s", client_get_url(cl)); + yaz_log(YLOG_WARN, "%p connect timeout %s", co, client_get_url(cl)); client_set_state(cl, Client_Error); - connection_destroy(co); - } - else if (client_get_state(co->client) == Client_Idle) - { - yaz_log(YLOG_LOG, "idle timeout %s", client_get_url(cl)); + remove_connection_from_host(co); + yaz_mutex_leave(host->mutex); connection_destroy(co); } else { - yaz_log(YLOG_LOG, "ignore timeout %s", client_get_url(cl)); + yaz_log(YLOG_LOG, "%p Connection idle timeout %s", co, client_get_url(cl)); + remove_connection_from_host(co); + yaz_mutex_leave(host->mutex); + connection_destroy(co); } - yaz_mutex_leave(host->mutex); } else { @@ -343,6 +348,7 @@ start: { if (!host->ipport) /* unresolved */ { + remove_connection_from_host(con); yaz_mutex_leave(host->mutex); connection_destroy(con); goto start; @@ -350,6 +356,7 @@ start: } else if (!con->client) { + remove_connection_from_host(con); yaz_mutex_leave(host->mutex); connection_destroy(con); /* start all over .. at some point it will be NULL */ @@ -416,7 +423,6 @@ static int connection_connect(struct connection *con, iochan_man_t iochan_man) if ((sru_version = session_setting_oneval(sdb, PZ_SRU_VERSION)) && *sru_version) ZOOM_options_set(zoptions, "sru_version", sru_version); - if (!(link = ZOOM_connection_create(zoptions))) { yaz_log(YLOG_FATAL|YLOG_ERRNO, "Failed to create ZOOM Connection"); @@ -431,11 +437,13 @@ static int connection_connect(struct connection *con, iochan_man_t iochan_man) strcat(http_hostport, host->hostport); ZOOM_connection_connect(link, http_hostport, 0); } + else if (zproxy && *zproxy) + ZOOM_connection_connect(link, host->hostport, 0); else ZOOM_connection_connect(link, host->ipport, 0); con->link = link; - con->iochan = iochan_create(0, connection_handler, 0, "connection_socket"); + con->iochan = iochan_create(-1, connection_handler, 0, "connection_socket"); con->state = Conn_Connecting; iochan_settimeout(con->iochan, con->operation_timeout); iochan_setdata(con->iochan, con); @@ -451,7 +459,7 @@ static int connection_connect(struct connection *con, iochan_man_t iochan_man) int client_prep_connection(struct client *cl, int operation_timeout, int session_timeout, iochan_man_t iochan_man, - const struct timespec *abstime) + const struct timeval *abstime) { struct connection *co; struct host *host = client_get_host(cl); @@ -470,12 +478,18 @@ int client_prep_connection(struct client *cl, if (!co) { - int max_connections = 30; + int max_connections = 0; + int reuse_connections = 1; const char *v = session_setting_oneval(client_get_database(cl), PZ_MAX_CONNECTIONS); if (v && *v) max_connections = atoi(v); - + + v = session_setting_oneval(client_get_database(cl), + PZ_REUSE_CONNECTIONS); + if (v && *v) + reuse_connections = atoi(v); + // See if someone else has an idle connection // We should look at timestamps here to select the longest-idle connection yaz_mutex_enter(host->mutex); @@ -484,27 +498,28 @@ int client_prep_connection(struct client *cl, int num_connections = 0; for (co = host->connections; co; co = co->next) num_connections++; - for (co = host->connections; co; co = co->next) - { - if (connection_is_idle(co) && - (!co->client || client_get_state(co->client) == Client_Idle) && - !strcmp(ZOOM_connection_option_get(co->link, "user"), - session_setting_oneval(client_get_database(cl), - PZ_AUTHENTICATION))) + if (reuse_connections) { + for (co = host->connections; co; co = co->next) { - if (zproxy == 0 && co->zproxy == 0) - break; - if (zproxy && co->zproxy && !strcmp(zproxy, co->zproxy)) - break; + if (connection_is_idle(co) && + (!co->client || client_get_state(co->client) == Client_Idle) && + !strcmp(ZOOM_connection_option_get(co->link, "user"), + session_setting_oneval(client_get_database(cl), + PZ_AUTHENTICATION))) + { + if (zproxy == 0 && co->zproxy == 0) + break; + if (zproxy && co->zproxy && !strcmp(zproxy, co->zproxy)) + break; + } + } + if (co) + { + yaz_log(YLOG_LOG, "num_connections = %d (reusing)", num_connections); + break; } } - if (co) - { - yaz_log(YLOG_LOG, "num_connections = %d (reusing)", - num_connections); - break; - } - if (num_connections < max_connections) + if (max_connections <= 0 || num_connections < max_connections) { yaz_log(YLOG_LOG, "num_connections = %d (new); max = %d", num_connections, max_connections); @@ -522,6 +537,7 @@ int client_prep_connection(struct client *cl, } if (co) { + yaz_log(YLOG_LOG, "%p Connection reuse. state: %d", co, co->state); connection_release(co); client_set_connection(cl, co); co->client = cl; diff --git a/src/connection.h b/src/connection.h index 3fd40ed..6b61047 100644 --- a/src/connection.h +++ b/src/connection.h @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free diff --git a/src/database.c b/src/database.c index da26ed0..5a312f5 100644 --- a/src/database.c +++ b/src/database.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -168,6 +168,7 @@ struct database *new_database(const char *id, NMEM nmem) struct database *db; char hostport[256]; char *dbname; + char *db_comment; struct setting *idset; if (strlen(id) > 255) @@ -177,6 +178,9 @@ struct database *new_database(const char *id, NMEM nmem) *(dbname++) = '\0'; else dbname = ""; + db_comment = strchr(dbname, '#'); + if (db_comment) + *db_comment = '\0'; db = nmem_malloc(nmem, sizeof(*db)); memset(db, 0, sizeof(*db)); db->host = 0; diff --git a/src/database.h b/src/database.h index 4aaad87..22df499 100644 --- a/src/database.h +++ b/src/database.h @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free diff --git a/src/eventl.c b/src/eventl.c index f9f0dc2..ab738a6 100644 --- a/src/eventl.c +++ b/src/eventl.c @@ -1,26 +1,26 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data -Pazpar2 is free software; you can redistribute it and/or modify it under -the terms of the GNU General Public License as published by the Free -Software Foundation; either version 2, or (at your option) any later -version. + Pazpar2 is free software; you can redistribute it and/or modify it under + the terms of the GNU General Public License as published by the Free + Software Foundation; either version 2, or (at your option) any later + version. -Pazpar2 is distributed in the hope that it will be useful, but WITHOUT ANY -WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -for more details. + Pazpar2 is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -*/ + */ /* * Based on ParaZ - a simple tool for harvesting performance data for * parallel operations using Z39.50. - * Copyright (C) 2006-2010 Index Data ApS + * Copyright (C) 2006-2011 Index Data ApS * See LICENSE file for details. */ @@ -53,6 +53,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include #include +#include +#include #include "eventl.h" #include "sel_thread.h" @@ -62,55 +64,58 @@ struct iochan_man_s { int sel_fd; int no_threads; int log_level; + YAZ_MUTEX iochan_mutex; }; -iochan_man_t iochan_man_create(int no_threads) -{ +iochan_man_t iochan_man_create(int no_threads) { iochan_man_t man = xmalloc(sizeof(*man)); man->channel_list = 0; man->sel_thread = 0; /* can't create sel_thread yet because we may fork */ man->sel_fd = -1; man->no_threads = no_threads; man->log_level = yaz_log_module_level("iochan"); - + man->iochan_mutex = 0; + yaz_mutex_create(&man->iochan_mutex); return man; } -void iochan_man_destroy(iochan_man_t *mp) -{ - if (*mp) - { +void iochan_man_destroy(iochan_man_t *mp) { + if (*mp) { IOCHAN c; if ((*mp)->sel_thread) sel_thread_destroy((*mp)->sel_thread); - + + yaz_mutex_enter((*mp)->iochan_mutex); c = (*mp)->channel_list; - while (c) - { + (*mp)->channel_list = NULL; + yaz_mutex_leave((*mp)->iochan_mutex); + while (c) { IOCHAN c_next = c->next; xfree(c->name); xfree(c); c = c_next; } + yaz_mutex_destroy(&(*mp)->iochan_mutex); xfree(*mp); *mp = 0; } } -void iochan_add(iochan_man_t man, IOCHAN chan) -{ +void iochan_add(iochan_man_t man, IOCHAN chan) { chan->man = man; + yaz_mutex_enter(man->iochan_mutex); + yaz_log(man->log_level, "iochan_add : chan=%p channel list=%p", chan, + man->channel_list); chan->next = man->channel_list; man->channel_list = chan; + yaz_mutex_leave(man->iochan_mutex); } -IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags, - const char *name) -{ +IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags, const char *name) { IOCHAN new_iochan; - if (!(new_iochan = (IOCHAN)xmalloc(sizeof(*new_iochan)))) - return 0; + if (!(new_iochan = (IOCHAN) xmalloc(sizeof(*new_iochan)))) + return 0; new_iochan->destroyed = 0; new_iochan->fd = fd; new_iochan->flags = flags; @@ -123,13 +128,12 @@ IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags, return new_iochan; } -static void work_handler(void *work_data) -{ +static void work_handler(void *work_data) { IOCHAN p = work_data; yaz_log(p->man->log_level, "eventl: work begin chan=%p name=%s event=%d", p, p->name ? p->name : "", p->this_event); - + if (!p->destroyed && (p->this_event & EVENT_TIMEOUT)) (*p->fun)(p, EVENT_TIMEOUT); if (!p->destroyed && (p->this_event & EVENT_INPUT)) @@ -139,62 +143,74 @@ static void work_handler(void *work_data) if (!p->destroyed && (p->this_event & EVENT_EXCEPT)) (*p->fun)(p, EVENT_EXCEPT); - yaz_log(p->man->log_level, "eventl: work end chan=%p name=%s event=%d", - p, p->name ? p->name : "", p->this_event); + yaz_log(p->man->log_level, "eventl: work end chan=%p name=%s event=%d", p, + p->name ? p->name : "", p->this_event); } -static void run_fun(iochan_man_t man, IOCHAN p) -{ - if (p->this_event) - { - if (man->sel_thread) - { - yaz_log(man->log_level, "eventl: work add chan=%p name=%s event=%d", - p, p->name ? p->name : "", p->this_event); +static void run_fun(iochan_man_t man, IOCHAN p) { + if (p->this_event) { + if (man->sel_thread) { + yaz_log(man->log_level, + "eventl: work add chan=%p name=%s event=%d", p, + p->name ? p->name : "", p->this_event); p->thread_users++; sel_thread_add(man->sel_thread, p); - } - else + } else work_handler(p); } } -static int event_loop(iochan_man_t man, IOCHAN *iochans) -{ +static int event_loop(iochan_man_t man, IOCHAN *iochans) { do /* loop as long as there are active associations to process */ { - IOCHAN p, *nextp; - fd_set in, out, except; - int res, max; - static struct timeval to; - struct timeval *timeout; - - FD_ZERO(&in); - FD_ZERO(&out); - FD_ZERO(&except); - timeout = &to; /* hang on select */ - to.tv_sec = 300; - to.tv_usec = 0; - max = 0; - for (p = *iochans; p; p = p->next) - { + IOCHAN p, *nextp; + IOCHAN start; + IOCHAN inv_start; + fd_set in, out, except; + int res, max; + static struct timeval to; + struct timeval *timeout; + +// struct yaz_poll_fd *fds; + int no_fds = 0; + FD_ZERO(&in); + FD_ZERO(&out); + FD_ZERO(&except); + timeout = &to; /* hang on select */ + to.tv_sec = 300; + to.tv_usec = 0; + + // INV: start must no change through the loop + + yaz_mutex_enter(man->iochan_mutex); + start = man->channel_list; + yaz_mutex_leave(man->iochan_mutex); + inv_start = start; + for (p = start; p; p = p->next) { + no_fds++; + } +// fds = (struct yaz_poll_fd *) xmalloc(no_fds * sizeof(*fds)); + + max = 0; + for (p = start; p; p = p->next) { if (p->thread_users > 0) continue; if (p->max_idle && p->max_idle < to.tv_sec) to.tv_sec = p->max_idle; if (p->fd < 0) continue; - if (p->flags & EVENT_INPUT) - FD_SET(p->fd, &in); - if (p->flags & EVENT_OUTPUT) - FD_SET(p->fd, &out); - if (p->flags & EVENT_EXCEPT) - FD_SET(p->fd, &except); - if (p->fd > max) - max = p->fd; - } - if (man->sel_fd != -1) - { + if (p->flags & EVENT_INPUT) + FD_SET(p->fd, &in); + if (p->flags & EVENT_OUTPUT) + FD_SET(p->fd, &out); + if (p->flags & EVENT_EXCEPT) + FD_SET(p->fd, &except); + if (p->fd > max) + max = p->fd; + } + yaz_log(man->log_level, "max=%d sel_fd=%d", max, man->sel_fd); + + if (man->sel_fd != -1) { if (man->sel_fd > max) max = man->sel_fd; FD_SET(man->sel_fd, &in); @@ -202,111 +218,99 @@ static int event_loop(iochan_man_t man, IOCHAN *iochans) yaz_log(man->log_level, "select begin nofds=%d", max); res = select(max + 1, &in, &out, &except, timeout); yaz_log(man->log_level, "select returned res=%d", res); - if (res < 0) - { - if (errno == EINTR) - continue; - else - { - yaz_log(YLOG_ERRNO|YLOG_WARN, "select"); + if (res < 0) { + if (errno == EINTR) + continue; + else { + yaz_log(YLOG_ERRNO | YLOG_WARN, "select"); return 0; } - } - if (man->sel_fd != -1) - { - if (FD_ISSET(man->sel_fd, &in)) - { + } + if (man->sel_fd != -1) { + if (FD_ISSET(man->sel_fd, &in)) { IOCHAN chan; yaz_log(man->log_level, "eventl: sel input on sel_fd=%d", man->sel_fd); - while ((chan = sel_thread_result(man->sel_thread))) - { - yaz_log(man->log_level, "eventl: got thread result chan=%p name=%s", - chan, chan->name ? chan->name : ""); + while ((chan = sel_thread_result(man->sel_thread))) { + yaz_log(man->log_level, + "eventl: got thread result chan=%p name=%s", chan, + chan->name ? chan->name : ""); chan->thread_users--; } } } - if (man->log_level) - { + if (man->log_level) { int no = 0; - for (p = *iochans; p; p = p->next) + for (p = start; p; p = p->next) { no++; + } yaz_log(man->log_level, "%d channels", no); } - for (p = *iochans; p; p = p->next) - { + for (p = start; p; p = p->next) { time_t now = time(0); - - if (p->destroyed) - { - yaz_log(man->log_level, "eventl: skip destroyed chan=%p name=%s", p, p->name ? p->name : ""); + + if (p->destroyed) { + yaz_log(man->log_level, + "eventl: skip destroyed chan=%p name=%s", p, + p->name ? p->name : ""); continue; } - if (p->thread_users > 0) - { - yaz_log(man->log_level, "eventl: skip chan=%p name=%s users=%d", p, p->name ? p->name : "", p->thread_users); + if (p->thread_users > 0) { + yaz_log(man->log_level, + "eventl: skip chan=%p name=%s users=%d", p, + p->name ? p->name : "", p->thread_users); continue; } p->this_event = 0; - if (p->max_idle && now - p->last_event > p->max_idle) - { + if (p->max_idle && now - p->last_event > p->max_idle) { p->last_event = now; p->this_event |= EVENT_TIMEOUT; } - if (p->fd >= 0) - { - if (FD_ISSET(p->fd, &in)) - { + if (p->fd >= 0) { + if (FD_ISSET(p->fd, &in)) { p->last_event = now; p->this_event |= EVENT_INPUT; } - if (FD_ISSET(p->fd, &out)) - { + if (FD_ISSET(p->fd, &out)) { p->last_event = now; p->this_event |= EVENT_OUTPUT; } - if (FD_ISSET(p->fd, &except)) - { + if (FD_ISSET(p->fd, &except)) { p->last_event = now; p->this_event |= EVENT_EXCEPT; } } run_fun(man, p); - } - for (nextp = iochans; *nextp; ) - { + } + assert(inv_start == start); + yaz_mutex_enter(man->iochan_mutex); + for (nextp = iochans; *nextp;) { IOCHAN p = *nextp; - if (p->destroyed && p->thread_users == 0) - { + if (p->destroyed && p->thread_users == 0) { *nextp = p->next; xfree(p->name); xfree(p); - } - else + } else nextp = &p->next; } - } - while (*iochans); + yaz_mutex_leave(man->iochan_mutex); + } while (*iochans); return 0; } -void iochan_man_events(iochan_man_t man) -{ - if (man->no_threads > 0 && !man->sel_thread) - { - man->sel_thread = sel_thread_create( - work_handler, 0 /*work_destroy */, &man->sel_fd, man->no_threads); +void iochan_man_events(iochan_man_t man) { + if (man->no_threads > 0 && !man->sel_thread) { + man->sel_thread = sel_thread_create(work_handler, 0 /*work_destroy */, + &man->sel_fd, man->no_threads); yaz_log(man->log_level, "iochan_man_events. Using %d threads", man->no_threads); } event_loop(man, &man->channel_list); } -void pazpar2_sleep(double d) -{ +void pazpar2_sleep(double d) { #ifdef WIN32 Sleep( (DWORD) (d * 1000)); #else diff --git a/src/eventl.h b/src/eventl.h index 785ba9d..de189a6 100644 --- a/src/eventl.h +++ b/src/eventl.h @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free diff --git a/src/getaddrinfo.c b/src/getaddrinfo.c index 6632b90..52a489f 100644 --- a/src/getaddrinfo.c +++ b/src/getaddrinfo.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free diff --git a/src/host.h b/src/host.h index 5409f73..4ab7fe8 100644 --- a/src/host.h +++ b/src/host.h @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free diff --git a/src/http.c b/src/http.c index aec3593..d93c874 100644 --- a/src/http.c +++ b/src/http.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -95,7 +95,12 @@ static void http_server_incref(http_server_t hs); struct http_server { struct http_buf *http_buf_freelist; + int http_buf_freelist_count; + int http_buf_freelist_max; + struct http_channel *http_channel_freelist; + int http_channel_freelist_count; + int http_channel_freelist_max; YAZ_MUTEX mutex; int listener_socket; int ref_count; @@ -130,6 +135,7 @@ static struct http_buf *http_buf_create(http_server_t hs) { r = hs->http_buf_freelist; hs->http_buf_freelist = hs->http_buf_freelist->next; + hs->http_buf_freelist_count--; } yaz_mutex_leave(hs->mutex); if (!r) @@ -143,8 +149,22 @@ static struct http_buf *http_buf_create(http_server_t hs) static void http_buf_destroy(http_server_t hs, struct http_buf *b) { yaz_mutex_enter(hs->mutex); - b->next = hs->http_buf_freelist; - hs->http_buf_freelist = b; + if (hs->http_buf_freelist_max > 0 && hs->http_buf_freelist_count >= hs->http_buf_freelist_max) { + xfree(b); + while ((b = hs->http_buf_freelist)) { + xfree(b); + hs->http_buf_freelist = hs->http_buf_freelist->next; + } + hs->http_buf_freelist_count = 0; + } + else { + b->next = hs->http_buf_freelist; + hs->http_buf_freelist = b; + hs->http_buf_freelist_count++; +#if 0 + yaz_log(YLOG_DEBUG, "Free %d http buffers on server.", hs->http_buf_freelist_count); +#endif + } yaz_mutex_leave(hs->mutex); } @@ -1098,8 +1118,21 @@ static void http_channel_destroy(IOCHAN i) http_server = s->http_server; /* save it for destroy (decref) */ yaz_mutex_enter(s->http_server->mutex); - s->next = s->http_server->http_channel_freelist; - s->http_server->http_channel_freelist = s; + if (s->http_server->http_channel_freelist_max > 0 && s->http_server->http_channel_freelist_count >= s->http_server->http_channel_freelist_max) { + while ((s->next = s->http_server->http_channel_freelist)) { + nmem_destroy(s->next->nmem); + wrbuf_destroy(s->next->wrbuf); + xfree(s->next); + s->http_server->http_channel_freelist = s->http_server->http_channel_freelist->next; + } + s->http_server->http_channel_freelist_count = 0; + } + else { + s->next = s->http_server->http_channel_freelist; + s->http_server->http_channel_freelist = s; + s->http_server->http_channel_freelist_count++; + yaz_log(YLOG_DEBUG, "Free %d channels on server.", s->http_server->http_channel_freelist_count); + } yaz_mutex_leave(s->http_server->mutex); http_server_destroy(http_server); @@ -1120,8 +1153,10 @@ static struct http_channel *http_channel_create(http_server_t hs, yaz_mutex_enter(hs->mutex); r = hs->http_channel_freelist; - if (r) + if (r) { hs->http_channel_freelist = r->next; + hs->http_channel_freelist_count--; + } yaz_mutex_leave(hs->mutex); if (r) @@ -1369,9 +1404,17 @@ http_server_t http_server_create(void) hs->mutex = 0; hs->proxy_addr = 0; hs->ref_count = 1; - hs->http_buf_freelist = 0; - hs->http_channel_freelist = 0; hs->http_sessions = 0; + + hs->http_channel_freelist = 0; + hs->http_channel_freelist_count = 0; + /* Disable max check */ + hs->http_channel_freelist_max = 0; + + hs->http_buf_freelist = 0; + hs->http_buf_freelist_count = 0; + /* Disable max check */ + hs->http_buf_freelist_max = 0; return hs; } diff --git a/src/http.h b/src/http.h index 01c0e20..9a00fee 100644 --- a/src/http.h +++ b/src/http.h @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free diff --git a/src/http_command.c b/src/http_command.c index 9b1825d..e8bba87 100644 --- a/src/http_command.c +++ b/src/http_command.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -61,14 +61,33 @@ struct http_session { struct http_sessions { struct http_session *session_list; YAZ_MUTEX mutex; + int log_level; }; +static YAZ_MUTEX g_http_session_mutex = 0; +static int g_http_sessions = 0; + +int http_session_use(int delta) +{ + int sessions; + if (!g_http_session_mutex) + yaz_mutex_create(&g_http_session_mutex); + yaz_mutex_enter(g_http_session_mutex); + g_http_sessions += delta; + sessions = g_http_sessions; + yaz_mutex_leave(g_http_session_mutex); + yaz_log(YLOG_DEBUG, "%s sesions=%d", delta == 0 ? "" : (delta > 0 ? "INC" : "DEC"), sessions); + return sessions; + +} + http_sessions_t http_sessions_create(void) { http_sessions_t hs = xmalloc(sizeof(*hs)); hs->session_list = 0; hs->mutex = 0; pazpar2_mutex_create(&hs->mutex, "http_sessions"); + hs->log_level = yaz_log_module_level("HTTP"); return hs; } @@ -107,7 +126,7 @@ struct http_session *http_session_create(struct conf_service *service, char tmp_str[50]; sprintf(tmp_str, "session#%u", sesid); - r->psession = new_session(nmem, service, tmp_str); + r->psession = new_session(nmem, service, sesid); r->session_id = sesid; r->timestamp = 0; r->nmem = nmem; @@ -121,31 +140,26 @@ struct http_session *http_session_create(struct conf_service *service, r->timeout_iochan = iochan_create(-1, session_timeout, 0, "http_session_timeout"); iochan_setdata(r->timeout_iochan, r); - yaz_log(YLOG_LOG, "timeout=%d", service->session_timeout); + yaz_log(http_sessions->log_level, "%p Session %u created. timeout chan=%p timeout=%d", r, sesid, r->timeout_iochan, service->session_timeout); iochan_settimeout(r->timeout_iochan, service->session_timeout); iochan_add(service->server->iochan_man, r->timeout_iochan); + http_session_use(1); return r; } void http_session_destroy(struct http_session *s) { - int must_destroy = 1; + int must_destroy = 0; http_sessions_t http_sessions = s->http_sessions; - yaz_log(YLOG_LOG, "http_session_destroy %u", s->session_id); + yaz_log(http_sessions->log_level, "%p HTTP Session %u destroyed", s, s->session_id); yaz_mutex_enter(http_sessions->mutex); - - /* only if http_session destroy was already called, we will allow it - to be destroyed */ - if (s->destroy_counter != s->activity_counter) - must_destroy = 0; - - s->destroy_counter = s->activity_counter = 0; - if (must_destroy) - { + /* only if http_session has no active http sessions on it can be destroyed */ + if (s->destroy_counter == s->activity_counter) { struct http_session **p = 0; + must_destroy = 1; for (p = &http_sessions->session_list; *p; p = &(*p)->next) if (*p == s) { @@ -156,13 +170,15 @@ void http_session_destroy(struct http_session *s) yaz_mutex_leave(http_sessions->mutex); if (must_destroy) { /* destroying for real */ - yaz_log(YLOG_LOG, "Destroying session %u", s->session_id); + yaz_log(http_sessions->log_level, "%p HTTP Session %u destroyed", s, s->session_id); iochan_destroy(s->timeout_iochan); destroy_session(s->psession); + http_session_use(-1); nmem_destroy(s->nmem); } else { - yaz_log(YLOG_LOG, "Active clients on session %u. Waiting for new timeout.", s->session_id); + yaz_log(http_sessions->log_level, "%p HTTP Session %u destroyed delayed. Active clients (%d-%d). Waiting for new timeout.", + s, s->session_id, s->activity_counter, s->destroy_counter); } } @@ -282,6 +298,15 @@ static struct http_session *locate_session(struct http_channel *c) return p; } +// Call after use of locate_session, in order to increment the destroy_counter +static void release_session(struct http_channel *c, struct http_session *session) { + http_sessions_t http_sessions = c->http_sessions; + yaz_mutex_enter(http_sessions->mutex); + if (session) + session->destroy_counter++; + yaz_mutex_leave(http_sessions->mutex); +} + // Decode settings parameters and apply to session // Syntax: setting[target]=value static int process_settings(struct session *se, struct http_request *rq, @@ -362,11 +387,11 @@ static void cmd_init(struct http_channel *c) sesid = make_sessionid(); s = http_session_create(service, c->http_sessions, sesid); - yaz_log(YLOG_DEBUG, "HTTP Session init"); + yaz_log(c->http_sessions->log_level, "%p Session init %u ", s, sesid); if (!clear || *clear == '0') session_init_databases(s->psession); else - yaz_log(YLOG_LOG, "No databases preloaded"); + yaz_log(YLOG_LOG, "HTTP Session %u init: No databases preloaded", sesid); if (process_settings(s->psession, c->request, c->response) < 0) return; @@ -420,10 +445,13 @@ static void cmd_settings(struct http_channel *c) xmlFreeDoc(doc); } - if (process_settings(s->psession, rq, rs) < 0) + if (process_settings(s->psession, rq, rs) < 0) { + release_session(c,s); return; + } rs->payload = HTTP_COMMAND_RESPONSE_PREFIX "OK"; http_send_response(c); + release_session(c,s); } // Compares two hitsbytarget nodes by hitcount @@ -435,7 +463,7 @@ static int cmp_ht(const void *p1, const void *p2) } // This implements functionality somewhat similar to 'bytarget', but in a termlist form -static void targets_termlist(WRBUF wrbuf, struct session *se, int num, +static int targets_termlist(WRBUF wrbuf, struct session *se, int num, NMEM nmem) { struct hitsbytarget *ht; @@ -472,6 +500,7 @@ static void targets_termlist(WRBUF wrbuf, struct session *se, int num, ht[i].diagnostic); wrbuf_puts(wrbuf, "\n"); } + return count; } static void cmd_termlist(struct http_channel *c) @@ -486,6 +515,7 @@ static void cmd_termlist(struct http_channel *c) const char *nums = http_argbyname(rq, "num"); int num = 15; int status; + WRBUF debug_log = wrbuf_alloc(); if (!s) return; @@ -512,16 +542,19 @@ static void cmd_termlist(struct http_channel *c) tp = name + strlen(name); strncpy(tname, name, tp - name); tname[tp - name] = '\0'; - wrbuf_puts(c->wrbuf, "wrbuf, tname); wrbuf_puts(c->wrbuf, "\">\n"); - if (!strcmp(tname, "xtargets")) - targets_termlist(c->wrbuf, s->psession, num, c->nmem); + if (!strcmp(tname, "xtargets")) { + int targets = targets_termlist(c->wrbuf, s->psession, num, c->nmem); + wrbuf_printf(debug_log, " xtargets: %d", targets); + } else { p = termlist(s->psession, tname, &len); - if (p) + if (p && len) + wrbuf_printf(debug_log, " %s: %d", tname, len); + if (p) { for (i = 0; i < len && i < num; i++){ // prevnt sending empty term elements if (!p[i]->term || !p[i]->term[0]) @@ -537,6 +570,7 @@ static void cmd_termlist(struct http_channel *c) p[i]->frequency); wrbuf_puts(c->wrbuf, "\n"); } + } } wrbuf_puts(c->wrbuf, "\n"); name = tp; @@ -544,8 +578,82 @@ static void cmd_termlist(struct http_channel *c) name++; } wrbuf_puts(c->wrbuf, "\n"); + yaz_log(YLOG_DEBUG, "termlist response: %s ", wrbuf_cstr(debug_log)); + wrbuf_destroy(debug_log); rs->payload = nmem_strdup(rq->channel->nmem, wrbuf_cstr(c->wrbuf)); http_send_response(c); + release_session(c,s); +} + +size_t session_get_memory_status(struct session *session); + +static void session_status(struct http_channel *c, struct http_session *s) +{ + size_t session_nmem; + wrbuf_printf(c->wrbuf, "%u\n", s->activity_counter); + wrbuf_printf(c->wrbuf, "%zu\n", nmem_total(s->nmem) ); + session_nmem = session_get_memory_status(s->psession); + wrbuf_printf(c->wrbuf, "%zu\n", session_nmem); +} + +static void cmd_session_status(struct http_channel *c) { + struct http_response *rs = c->response; + struct http_session *s = locate_session(c); + if (!s) + return; + + wrbuf_rewind(c->wrbuf); + wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "OK\n"); + session_status(c, s); + wrbuf_puts(c->wrbuf, "\n"); + rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf)); + http_send_response(c); + release_session(c,s); + +} + +int sessions_count(void); +int clients_count(void); +#ifdef HAVE_RESULTSETS_COUNT +int resultsets_count(void); +#else +#define resultsets_count() 0 +#endif + +static void cmd_server_status(struct http_channel *c) +{ + struct http_response *rs = c->response; + int sessions = sessions_count(); + int clients = clients_count(); + int resultsets = resultsets_count(); + wrbuf_rewind(c->wrbuf); + wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "\n"); + wrbuf_printf(c->wrbuf, " %u\n", sessions); + wrbuf_printf(c->wrbuf, " %u\n", clients); + /* Only works if yaz has been compiled with enabling of this */ + wrbuf_printf(c->wrbuf, " %u\n",resultsets); + +/* TODO add all sessions status */ +/* http_sessions_t http_sessions = c->http_sessions; */ +/* struct http_session *p; */ +/* + yaz_mutex_enter(http_sessions->mutex); + for (p = http_sessions->session_list; p; p = p->next) { + p->activity_counter++; + wrbuf_puts(c->wrbuf, "\n"); + wrbuf_printf(c->wrbuf, "%s\n", p->session_id); + yaz_mutex_leave(http_sessions->mutex); + session_status(c, p); + wrbuf_puts(c->wrbuf, "\n"); + yaz_mutex_enter(http_sessions->mutex); + p->activity_counter--; + } + yaz_mutex_leave(http_sessions->mutex); +*/ + wrbuf_puts(c->wrbuf, "\n"); + rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf)); + http_send_response(c); + xmalloc_trav(0); } @@ -599,6 +707,7 @@ static void cmd_bytarget(struct http_channel *c) wrbuf_puts(c->wrbuf, ""); rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf)); http_send_response(c); + release_session(c,s); } static void write_metadata(WRBUF w, struct conf_service *service, @@ -741,6 +850,7 @@ static void cmd_record(struct http_channel *c) { error(rs, PAZPAR2_RECORD_MISSING, idstr); } + release_session(c, s); return; } if (offsetstr) @@ -808,6 +918,7 @@ static void cmd_record(struct http_channel *c) http_send_response(c); } show_single_stop(s->psession, rec); + release_session(c, s); } static void cmd_record_ready(void *data) @@ -849,6 +960,7 @@ static void show_records(struct http_channel *c, int active) if (!(sp = reclist_parse_sortparms(c->nmem, sort, s->psession->service))) { error(rs, PAZPAR2_MALFORMED_PARAMETER_VALUE, "sort"); + release_session(c, s); return; } @@ -890,6 +1002,7 @@ static void show_records(struct http_channel *c, int active) wrbuf_puts(c->wrbuf, "\n"); rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf)); http_send_response(c); + release_session(c, s); } static void show_records_ready(void *data) @@ -913,19 +1026,32 @@ static void cmd_show(struct http_channel *c) if (block) { - if (status && reclist_get_num_records(s->psession->reclist) == 0) + if (!strcmp(block, "preferred") && !session_is_preferred_clients_ready(s->psession) && reclist_get_num_records(s->psession->reclist) == 0) { + // if there is already a watch/block. we do not block this one + if (session_set_watch(s->psession, SESSION_WATCH_SHOW_PREF, + show_records_ready, c, c) != 0) + { + yaz_log(c->http_sessions->log_level, + "%p Session %u: Blocking on cmd_show. Waiting for preferred targets", s, s->session_id); + } + release_session(c,s); + return; + + } + else if (status && reclist_get_num_records(s->psession->reclist) == 0) { // if there is already a watch/block. we do not block this one if (session_set_watch(s->psession, SESSION_WATCH_SHOW, show_records_ready, c, c) != 0) { - yaz_log(YLOG_DEBUG, "Blocking on cmd_show"); + yaz_log(c->http_sessions->log_level, "%p Session %u: Blocking on cmd_show", s, s->session_id); } + release_session(c,s); return; } } - show_records(c, status); + release_session(c,s); } static void cmd_ping(struct http_channel *c) @@ -936,6 +1062,7 @@ static void cmd_ping(struct http_channel *c) return; rs->payload = HTTP_COMMAND_RESPONSE_PREFIX "OK"; http_send_response(c); + release_session(c, s); } static int utf_8_valid(const char *str) @@ -980,21 +1107,25 @@ static void cmd_search(struct http_channel *c) if (!query) { error(rs, PAZPAR2_MISSING_PARAMETER, "query"); + release_session(c,s); return; } if (!utf_8_valid(query)) { error(rs, PAZPAR2_MALFORMED_PARAMETER_ENCODING, "query"); + release_session(c,s); return; } code = search(s->psession, query, startrecs, maxrecs, filter, &addinfo); if (code) { error(rs, code, addinfo); + release_session(c,s); return; } rs->payload = HTTP_COMMAND_RESPONSE_PREFIX "OK"; http_send_response(c); + release_session(c,s); } @@ -1033,6 +1164,7 @@ static void cmd_stat(struct http_channel *c) wrbuf_puts(c->wrbuf, ""); rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf)); http_send_response(c); + release_session(c,s); } static void cmd_info(struct http_channel *c) @@ -1043,7 +1175,7 @@ static void cmd_info(struct http_channel *c) wrbuf_rewind(c->wrbuf); wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "\n"); wrbuf_puts(c->wrbuf, " \n"); - wrbuf_puts(c->wrbuf, "wrbuf, " wrbuf, " sha1=\"%s\"", PAZPAR2_VERSION_SHA1); #endif @@ -1061,6 +1193,8 @@ static void cmd_info(struct http_channel *c) wrbuf_puts(c->wrbuf, " \n"); + info_services(c->server, c->wrbuf); + wrbuf_puts(c->wrbuf, ""); rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf)); http_send_response(c); @@ -1078,6 +1212,8 @@ struct { { "search", cmd_search }, { "termlist", cmd_termlist }, { "exit", cmd_exit }, + { "session-status", cmd_session_status }, + { "server-status", cmd_server_status }, { "ping", cmd_ping }, { "record", cmd_record }, { "info", cmd_info }, diff --git a/src/incref.c b/src/incref.c index 2996fe2..1fb6a54 100644 --- a/src/incref.c +++ b/src/incref.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free diff --git a/src/incref.h b/src/incref.h index 144eac1..0bfe2f5 100644 --- a/src/incref.h +++ b/src/incref.h @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free diff --git a/src/jenkins_hash.c b/src/jenkins_hash.c index 73ad411..738c97a 100644 --- a/src/jenkins_hash.c +++ b/src/jenkins_hash.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free diff --git a/src/jenkins_hash.h b/src/jenkins_hash.h index 108c6e6..ec80133 100644 --- a/src/jenkins_hash.h +++ b/src/jenkins_hash.h @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free diff --git a/src/marchash.c b/src/marchash.c index ea25f6f..49b814d 100644 --- a/src/marchash.c +++ b/src/marchash.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free diff --git a/src/marchash.h b/src/marchash.h index 3f0418f..3917fd9 100644 --- a/src/marchash.h +++ b/src/marchash.h @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free diff --git a/src/marcmap.c b/src/marcmap.c index 7b62c1e..5fa579c 100644 --- a/src/marcmap.c +++ b/src/marcmap.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free diff --git a/src/marcmap.h b/src/marcmap.h index 96c51b3..2c39583 100644 --- a/src/marcmap.h +++ b/src/marcmap.h @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free diff --git a/src/normalize7bit.c b/src/normalize7bit.c index 83d52ec..b4e38f9 100644 --- a/src/normalize7bit.c +++ b/src/normalize7bit.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free diff --git a/src/normalize7bit.h b/src/normalize7bit.h index 9056c3e..a8992fd 100644 --- a/src/normalize7bit.h +++ b/src/normalize7bit.h @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free diff --git a/src/normalize_cache.c b/src/normalize_cache.c index e99f576..862a258 100644 --- a/src/normalize_cache.c +++ b/src/normalize_cache.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free diff --git a/src/normalize_cache.h b/src/normalize_cache.h index 09b0c48..46b55ad 100644 --- a/src/normalize_cache.h +++ b/src/normalize_cache.h @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free diff --git a/src/normalize_record.c b/src/normalize_record.c index fa39da2..e2c28cf 100644 --- a/src/normalize_record.c +++ b/src/normalize_record.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -121,34 +121,35 @@ void normalize_record_destroy(normalize_record_t nt) } int normalize_record_transform(normalize_record_t nt, xmlDoc **doc, - const char **parms) + const char **parms) { - struct normalize_step *m; - if (nt) { + if (nt) + { + struct normalize_step *m; for (m = nt->steps; m; m = m->next) { xmlNodePtr root = 0; - xmlDoc *new; + xmlDoc *ndoc; if (m->stylesheet) - { - new = xsltApplyStylesheet(m->stylesheet, *doc, parms); - } + ndoc = xsltApplyStylesheet(m->stylesheet, *doc, parms); else if (m->marcmap) - { - new = marcmap_apply(m->marcmap, *doc); - } - - root = xmlDocGetRootElement(new); - + ndoc = marcmap_apply(m->marcmap, *doc); + else + ndoc = 0; xmlFreeDoc(*doc); - if (!new || !root || !root->children) + *doc = 0; + + if (ndoc) + root = xmlDocGetRootElement(ndoc); + + if (ndoc && root && root->children) + *doc = ndoc; + else { - if (new) - xmlFreeDoc(new); - *doc = 0; + if (ndoc) + xmlFreeDoc(ndoc); return -1; } - *doc = new; } } return 0; diff --git a/src/normalize_record.h b/src/normalize_record.h index a928d78..06c953c 100644 --- a/src/normalize_record.h +++ b/src/normalize_record.h @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free diff --git a/src/parameters.h b/src/parameters.h index abeaca6..59a1222 100644 --- a/src/parameters.h +++ b/src/parameters.h @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free diff --git a/src/pazpar2.c b/src/pazpar2.c index cb69a5e..6680662 100644 --- a/src/pazpar2.c +++ b/src/pazpar2.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free diff --git a/src/pazpar2.rpm.init b/src/pazpar2.rpm.init new file mode 100755 index 0000000..da5d642 --- /dev/null +++ b/src/pazpar2.rpm.init @@ -0,0 +1,82 @@ +#!/bin/bash +# +# pazpar2 Startup script for Pazpar2 +# +# chkconfig: - 85 15 +# description: Pazpar2 Metasearcher +# processname: pazpar2 +# config: /etc/pazpar2/server.xml +# config: /etc/sysconfig/pazpar2 +# pidfile: /var/run/pazpar2.pid + +# Source function library. +OPTIONS="-l /var/log/pazpar2.log -f /etc/pazpar2/server.xml" +. /etc/rc.d/init.d/functions + +if [ -f /etc/sysconfig/pazpar2 ]; then + . /etc/sysconfig/pazpar2 +fi + +# Path to the apachectl script, server binary, and short-form for messages. +DAEMON=${DAEMON-/usr/sbin/pazpar2} +prog=pazpar2 +pidfile=${PIDFILE-/var/run/pazpar2.pid} +lockfile=${LOCKFILE-/var/lock/subsys/pazpar2} +RETVAL=0 + +start() { + echo -n $"Starting $prog: " + daemon --pidfile=${pidfile} $DAEMON $OPTIONS -D -p ${pidfile} + RETVAL=$? + echo + [ $RETVAL = 0 ] && touch ${lockfile} + return $RETVAL +} + +stop() { + echo -n $"Stopping $prog: " + killproc -p ${pidfile} -d 10 $DAEMON + RETVAL=$? + echo + [ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile} +} +reload() { + stop + start +} + +# See how we were called. +case "$1" in + start) + start + ;; + stop) + stop + ;; + status) + status -p ${pidfile} $DAEMON + RETVAL=$? + ;; + restart) + stop + start + ;; + condrestart) + if [ -f ${pidfile} ] ; then + stop + start + fi + ;; + reload) + reload + ;; + configtest) + $DAEMON $OPTIONS -t + RETVAL=$? + ;; + *) + echo $"Usage: $prog {start|stop|restart|help|configtest}" + exit 1 +esac + +exit $RETVAL diff --git a/src/pazpar2.rpm.logrotate b/src/pazpar2.rpm.logrotate new file mode 100644 index 0000000..b2bd6fb --- /dev/null +++ b/src/pazpar2.rpm.logrotate @@ -0,0 +1,13 @@ +/var/log/pazpar2.log { + weekly + missingok + rotate 4 + compress + delaycompress + notifempty + postrotate + if [ -f /var/run/pazpar2.pid ]; then + /sbin/service pazpar2 restart > /dev/null + fi + endscript +} diff --git a/src/pazpar2_config.c b/src/pazpar2_config.c index ec87caf..740ac9c 100644 --- a/src/pazpar2_config.c +++ b/src/pazpar2_config.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -131,6 +131,7 @@ static struct conf_service *service_init(struct conf_server *server, service->relevance_pct = 0; service->sort_pct = 0; service->mergekey_pct = 0; + service->facet_pct = 0; service->id = service_id ? nmem_strdup(nmem, service_id) : 0; service->num_metadata = num_metadata; @@ -249,6 +250,7 @@ void service_destroy(struct conf_service *service) pp2_charset_destroy(service->relevance_pct); pp2_charset_destroy(service->sort_pct); pp2_charset_destroy(service->mergekey_pct); + pp2_charset_destroy(service->facet_pct); yaz_mutex_destroy(&service->mutex); nmem_destroy(service->nmem); } @@ -566,6 +568,20 @@ static struct conf_service *service_create_static(struct conf_server *server, return 0; } } + else if (!strcmp((const char *) n->name, "facet")) + { + if (service->mergekey_pct) + { + yaz_log(YLOG_LOG, "facety may not repeat in service"); + return 0; + } + else + { + service->facet_pct = pp2_charset_create_xml(n); + if (!service->mergekey_pct) + return 0; + } + } else if (!strcmp((const char *) n->name, (const char *) "metadata")) { if (parse_metadata(service, n, &md_node, &sk_node)) @@ -652,7 +668,7 @@ static void inherit_server_settings(struct conf_service *s) } } - /* use relevance/sort/mergekey from server if not defined + /* use relevance/sort/mergekey/facet from server if not defined for this service.. */ if (!s->relevance_pct) { @@ -662,7 +678,7 @@ static void inherit_server_settings(struct conf_service *s) pp2_charset_incref(s->relevance_pct); } else - s->relevance_pct = pp2_charset_create(0); + s->relevance_pct = pp2_charset_create_a_to_z(); } if (!s->sort_pct) @@ -673,7 +689,7 @@ static void inherit_server_settings(struct conf_service *s) pp2_charset_incref(s->sort_pct); } else - s->sort_pct = pp2_charset_create(0); + s->sort_pct = pp2_charset_create_a_to_z(); } if (!s->mergekey_pct) @@ -684,7 +700,18 @@ static void inherit_server_settings(struct conf_service *s) pp2_charset_incref(s->mergekey_pct); } else - s->mergekey_pct = pp2_charset_create(0); + s->mergekey_pct = pp2_charset_create_a_to_z(); + } + + if (!s->facet_pct) + { + if (server->facet_pct) + { + s->facet_pct = server->facet_pct; + pp2_charset_incref(s->facet_pct); + } + else + s->facet_pct = pp2_charset_create(0); } } @@ -721,6 +748,7 @@ static struct conf_server *server_create(struct conf_config *config, server->relevance_pct = 0; server->sort_pct = 0; server->mergekey_pct = 0; + server->facet_pct = 0; server->server_settings = 0; server->http_server = 0; server->iochan_man = 0; @@ -791,6 +819,12 @@ static struct conf_server *server_create(struct conf_config *config, if (!server->mergekey_pct) return 0; } + else if (!strcmp((const char *) n->name, "facet")) + { + server->facet_pct = pp2_charset_create_xml(n); + if (!server->facet_pct) + return 0; + } else if (!strcmp((const char *) n->name, "service")) { char *service_id = (char *) @@ -899,6 +933,25 @@ struct conf_service *locate_service(struct conf_server *server, return s; } +void info_services(struct conf_server *server, WRBUF w) +{ + struct conf_service *s = server->service; + wrbuf_puts(w, " \n"); + for (; s; s = s->next) + { + wrbuf_puts(w, " id) + { + wrbuf_puts(w, " id=\""); + wrbuf_xmlputs(w, s->id); + wrbuf_puts(w, "\""); + } + wrbuf_puts(w, "/>"); + + wrbuf_puts(w, "\n"); + } + wrbuf_puts(w, " \n"); +} static int parse_config(struct conf_config *config, xmlNode *root) { @@ -1015,6 +1068,7 @@ void server_destroy(struct conf_server *server) pp2_charset_destroy(server->relevance_pct); pp2_charset_destroy(server->sort_pct); pp2_charset_destroy(server->mergekey_pct); + pp2_charset_destroy(server->facet_pct); yaz_log(YLOG_LOG, "server_destroy server=%p", server); http_server_destroy(server->http_server); } diff --git a/src/pazpar2_config.h b/src/pazpar2_config.h index 9e8f13d..0bb9cbe 100644 --- a/src/pazpar2_config.h +++ b/src/pazpar2_config.h @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -119,6 +119,7 @@ struct conf_service pp2_charset_t relevance_pct; pp2_charset_t sort_pct; pp2_charset_t mergekey_pct; + pp2_charset_t facet_pct; struct database *databases; struct conf_targetprofiles *targetprofiles; @@ -142,6 +143,8 @@ struct conf_server pp2_charset_t relevance_pct; pp2_charset_t sort_pct; pp2_charset_t mergekey_pct; + pp2_charset_t facet_pct; + struct conf_service *service; struct conf_server *next; struct conf_config *config; @@ -161,6 +164,7 @@ struct conf_targetprofiles struct conf_config *config_create(const char *fname, int verbose); void config_destroy(struct conf_config *config); void config_process_events(struct conf_config *config); +void info_services(struct conf_server *server, WRBUF w); struct conf_service *locate_service(struct conf_server *server, const char *service_id); diff --git a/src/ppmutex.c b/src/ppmutex.c index c389db4..5849fcd 100644 --- a/src/ppmutex.c +++ b/src/ppmutex.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free diff --git a/src/ppmutex.h b/src/ppmutex.h index d924e7f..f1f6e24 100644 --- a/src/ppmutex.h +++ b/src/ppmutex.h @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free diff --git a/src/reclists.c b/src/reclists.c index 7912ca2..7025af1 100644 --- a/src/reclists.c +++ b/src/reclists.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free diff --git a/src/reclists.h b/src/reclists.h index bc02f10..6f13e50 100644 --- a/src/reclists.h +++ b/src/reclists.h @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free diff --git a/src/record.c b/src/record.c index 5fb908d..c43af42 100644 --- a/src/record.c +++ b/src/record.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free diff --git a/src/record.h b/src/record.h index 5029356..3960f72 100644 --- a/src/record.h +++ b/src/record.h @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free diff --git a/src/relevance.c b/src/relevance.c index 35b7d83..680d8f6 100644 --- a/src/relevance.c +++ b/src/relevance.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free diff --git a/src/relevance.h b/src/relevance.h index 1f30b95..cb82601 100644 --- a/src/relevance.h +++ b/src/relevance.h @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free diff --git a/src/sel_thread.c b/src/sel_thread.c index 10b6d16..8a14e55 100644 --- a/src/sel_thread.c +++ b/src/sel_thread.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -24,9 +24,16 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "sel_thread.h" #include #include +#if HAVE_UNISTD_H #include +#endif +#ifdef WIN32 +#include +#endif #include -#include +#include +#include +#include #include struct work_item { @@ -55,11 +62,13 @@ static void queue_trav(struct work_item *q, void (*f)(void *data)) } struct sel_thread { - int fd[2]; + int write_fd; + int read_fd; + yaz_spipe_t spipe; NMEM nmem; - pthread_t *thread_id; - pthread_mutex_t mutex; - pthread_cond_t input_data; + yaz_thread_t *thread_id; + YAZ_MUTEX mutex; + YAZ_COND input_data; int stop_flag; int no_threads; struct work_item *input_queue; @@ -69,6 +78,8 @@ struct sel_thread { void (*work_destroy)(void *work_data); }; +static int input_queue_length = 0; + static void *sel_thread_handler(void *vp) { sel_thread_t p = (sel_thread_t) vp; @@ -77,9 +88,9 @@ static void *sel_thread_handler(void *vp) { struct work_item *work_this = 0; /* wait for some work */ - pthread_mutex_lock(&p->mutex); + yaz_mutex_enter(p->mutex); while (!p->stop_flag && !p->input_queue) - pthread_cond_wait(&p->input_data, &p->mutex); + yaz_cond_wait(p->input_data, p->mutex, 0); /* see if we were waken up because we're shutting down */ if (p->stop_flag) break; @@ -87,23 +98,31 @@ static void *sel_thread_handler(void *vp) assert(p->input_queue); work_this = queue_remove_last(&p->input_queue); + input_queue_length--; +#if 0 + yaz_log(YLOG_DEBUG, "input queue length after pop: %d", input_queue_length); +#endif assert(work_this); - pthread_mutex_unlock(&p->mutex); + yaz_mutex_leave(p->mutex); /* work on this item */ p->work_handler(work_this->data); /* put it back into output queue */ - pthread_mutex_lock(&p->mutex); + yaz_mutex_enter(p->mutex); work_this->next = p->output_queue; p->output_queue = work_this; - pthread_mutex_unlock(&p->mutex); + yaz_mutex_leave(p->mutex); /* wake up select/poll with a single byte */ - (void) write(p->fd[1], "", 1); +#ifdef WIN32 + (void) send(p->write_fd, "", 1, 0); +#else + (void) write(p->write_fd, "", 1); +#endif } - pthread_mutex_unlock(&p->mutex); + yaz_mutex_leave(p->mutex); return 0; } @@ -121,39 +140,55 @@ sel_thread_t sel_thread_create(void (*work_handler)(void *work_data), assert(no_of_threads >= 1); p->nmem = nmem; - if (pipe(p->fd)) + +#ifdef WIN32 + /* use port 12119 temporarily on Windos and hope for the best */ + p->spipe = yaz_spipe_create(12119, 0); +#else + p->spipe = yaz_spipe_create(0, 0); +#endif + if (!p->spipe) { nmem_destroy(nmem); return 0; - } - *read_fd = p->fd[0]; + } + + *read_fd = p->read_fd = yaz_spipe_get_read_fd(p->spipe); + p->write_fd = yaz_spipe_get_write_fd(p->spipe); + p->input_queue = 0; p->output_queue = 0; p->free_queue = 0; p->work_handler = work_handler; p->work_destroy = work_destroy; - + p->no_threads = 0; /* we if need to destroy */ p->stop_flag = 0; - p->no_threads = no_of_threads; - pthread_mutex_init(&p->mutex, 0); - pthread_cond_init(&p->input_data, 0); + p->mutex = 0; + yaz_mutex_create(&p->mutex); + yaz_cond_create(&p->input_data); + if (p->input_data == 0) /* condition variable could not be created? */ + { + sel_thread_destroy(p); + return 0; + } + p->no_threads = no_of_threads; p->thread_id = nmem_malloc(nmem, sizeof(*p->thread_id) * p->no_threads); for (i = 0; i < p->no_threads; i++) - pthread_create(p->thread_id + i, 0, sel_thread_handler, p); + p->thread_id[i] = yaz_thread_create(sel_thread_handler, p); return p; } void sel_thread_destroy(sel_thread_t p) { int i; - pthread_mutex_lock(&p->mutex); + yaz_mutex_enter(p->mutex); p->stop_flag = 1; - pthread_cond_broadcast(&p->input_data); - pthread_mutex_unlock(&p->mutex); + yaz_cond_broadcast(p->input_data); + yaz_mutex_leave(p->mutex); for (i = 0; i< p->no_threads; i++) - pthread_join(p->thread_id[i], 0); + yaz_thread_join(&p->thread_id[i], 0); if (p->work_destroy) { @@ -161,10 +196,9 @@ void sel_thread_destroy(sel_thread_t p) queue_trav(p->output_queue, p->work_destroy); } - close(p->fd[0]); - close(p->fd[1]); - pthread_cond_destroy(&p->input_data); - pthread_mutex_destroy(&p->mutex); + yaz_spipe_destroy(p->spipe); + yaz_cond_destroy(&p->input_data); + yaz_mutex_destroy(&p->mutex); nmem_destroy(p->nmem); } @@ -172,7 +206,7 @@ void sel_thread_add(sel_thread_t p, void *data) { struct work_item *work_p; - pthread_mutex_lock(&p->mutex); + yaz_mutex_enter(p->mutex); if (p->free_queue) { @@ -185,9 +219,12 @@ void sel_thread_add(sel_thread_t p, void *data) work_p->data = data; work_p->next = p->input_queue; p->input_queue = work_p; - - pthread_cond_signal(&p->input_data); - pthread_mutex_unlock(&p->mutex); + input_queue_length++; +#if 0 + yaz_log(YLOG_DEBUG, "sel_thread_add: Input queue length after push: %d", input_queue_length); +#endif + yaz_cond_signal(p->input_data); + yaz_mutex_leave(p->mutex); } void *sel_thread_result(sel_thread_t p) @@ -196,7 +233,7 @@ void *sel_thread_result(sel_thread_t p) void *data = 0; char read_buf[1]; - pthread_mutex_lock(&p->mutex); + yaz_mutex_enter(p->mutex); /* got something. Take the last one out of output_queue */ work_this = queue_remove_last(&p->output_queue); @@ -207,9 +244,13 @@ void *sel_thread_result(sel_thread_t p) p->free_queue = work_this; data = work_this->data; - (void) read(p->fd[0], read_buf, 1); +#ifdef WIN32 + (void) recv(p->read_fd, read_buf, 1, 0); +#else + (void) read(p->read_fd, read_buf, 1); +#endif } - pthread_mutex_unlock(&p->mutex); + yaz_mutex_leave(p->mutex); return data; } diff --git a/src/sel_thread.h b/src/sel_thread.h index 84ff5f4..b84aa27 100644 --- a/src/sel_thread.h +++ b/src/sel_thread.h @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free diff --git a/src/session.c b/src/session.c index 14b9a2c..194ab36 100644 --- a/src/session.c +++ b/src/session.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -35,9 +35,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #if HAVE_UNISTD_H #include #endif +#ifdef WIN32 +#include +#endif #include #include #include +#include #include #include @@ -52,6 +56,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include #include +#include #define USE_TIMING 0 #if USE_TIMING @@ -75,6 +80,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define MAX_CHUNK 15 +#define MAX(a,b) ((a)>(b)?(a):(b)) + // Note: Some things in this structure will eventually move to configuration struct parameters global_parameters = { @@ -87,6 +94,27 @@ struct client_list { struct client_list *next; }; +/* session counting (1) , disable client counting (0) */ +static YAZ_MUTEX g_session_mutex = 0; +static int no_sessions = 0; + +static int session_use(int delta) +{ + int sessions; + if (!g_session_mutex) + yaz_mutex_create(&g_session_mutex); + yaz_mutex_enter(g_session_mutex); + no_sessions += delta; + sessions = no_sessions; + yaz_mutex_leave(g_session_mutex); + yaz_log(YLOG_DEBUG, "%s sesions=%d", delta == 0 ? "" : (delta > 0 ? "INC" : "DEC"), no_sessions); + return sessions; +} + +int sessions_count(void) { + return session_use(0); +} + static void log_xml_doc(xmlDoc *doc) { FILE *lf = yaz_log_file(); @@ -142,32 +170,58 @@ void pull_terms(NMEM nmem, struct ccl_rpn_node *n, char **termlist, int *num) } -static void add_facet(struct session *s, const char *type, const char *value) +void add_facet(struct session *s, const char *type, const char *value, int count) { - int i; - - if (!*value) - return; - for (i = 0; i < s->num_termlists; i++) - if (!strcmp(s->termlists[i].name, type)) - break; - if (i == s->num_termlists) + struct conf_service *service = s->service; + pp2_relevance_token_t prt; + const char *facet_component; + WRBUF facet_wrbuf = wrbuf_alloc(); + prt = pp2_relevance_tokenize(service->facet_pct); + + pp2_relevance_first(prt, value, 0); + while ((facet_component = pp2_relevance_token_next(prt))) { - if (i == SESSION_MAX_TERMLISTS) + if (*facet_component) { - yaz_log(YLOG_FATAL, "Too many termlists"); - return; + if (wrbuf_len(facet_wrbuf)) + wrbuf_puts(facet_wrbuf, " "); + wrbuf_puts(facet_wrbuf, facet_component); } - - s->termlists[i].name = nmem_strdup(s->nmem, type); - s->termlists[i].termlist - = termlist_create(s->nmem, TERMLIST_HIGH_SCORE); - s->num_termlists = i + 1; } - termlist_insert(s->termlists[i].termlist, value); + pp2_relevance_token_destroy(prt); + + if (wrbuf_len(facet_wrbuf)) + { + int i; + for (i = 0; i < s->num_termlists; i++) + if (!strcmp(s->termlists[i].name, type)) + break; + if (i == s->num_termlists) + { + if (i == SESSION_MAX_TERMLISTS) + { + session_log(s, YLOG_FATAL, "Too many termlists"); + wrbuf_destroy(facet_wrbuf); + return; + } + + s->termlists[i].name = nmem_strdup(s->nmem, type); + s->termlists[i].termlist + = termlist_create(s->nmem, TERMLIST_HIGH_SCORE); + s->num_termlists = i + 1; + } + +#if 0 + session_log(s, YLOG_DEBUG, "Facets for %s: %s norm:%s (%d)", type, value, wrbuf_cstr(facet_wrbuf), count); +#endif + termlist_insert(s->termlists[i].termlist, wrbuf_cstr(facet_wrbuf), + count); + } + wrbuf_destroy(facet_wrbuf); } -static xmlDoc *record_to_xml(struct session_database *sdb, const char *rec) +static xmlDoc *record_to_xml(struct session *se, + struct session_database *sdb, const char *rec) { struct database *db = sdb->database; xmlDoc *rdoc = 0; @@ -176,14 +230,14 @@ static xmlDoc *record_to_xml(struct session_database *sdb, const char *rec) if (!rdoc) { - yaz_log(YLOG_FATAL, "Non-wellformed XML received from %s", - db->url); + session_log(se, YLOG_FATAL, "Non-wellformed XML received from %s", + db->url); return 0; } if (global_parameters.dump_records) { - yaz_log(YLOG_LOG, "Un-normalized record from %s", db->url); + session_log(se, YLOG_LOG, "Un-normalized record from %s", db->url); log_xml_doc(rdoc); } @@ -255,11 +309,12 @@ static void insert_settings_values(struct session_database *sdb, xmlDoc *doc, } } -static xmlDoc *normalize_record(struct session_database *sdb, +static xmlDoc *normalize_record(struct session *se, + struct session_database *sdb, struct conf_service *service, const char *rec, NMEM nmem) { - xmlDoc *rdoc = record_to_xml(sdb, rec); + xmlDoc *rdoc = record_to_xml(se, sdb, rec); if (rdoc) { @@ -269,7 +324,8 @@ static xmlDoc *normalize_record(struct session_database *sdb, if (normalize_record_transform(sdb->map, &rdoc, (const char **)parms)) { - yaz_log(YLOG_WARN, "Normalize failed from %s", sdb->database->url); + session_log(se, YLOG_WARN, "Normalize failed from %s", + sdb->database->url); } else { @@ -277,8 +333,8 @@ static xmlDoc *normalize_record(struct session_database *sdb, if (global_parameters.dump_records) { - yaz_log(YLOG_LOG, "Normalized record from %s", - sdb->database->url); + session_log(se, YLOG_LOG, "Normalized record from %s", + sdb->database->url); log_xml_doc(rdoc); } } @@ -330,7 +386,7 @@ static int prepare_map(struct session *se, struct session_database *sdb) if (!sdb->settings) { - yaz_log(YLOG_WARN, "No settings on %s", sdb->database->url); + session_log(se, YLOG_WARN, "No settings on %s", sdb->database->url); return -1; } if ((s = session_setting_oneval(sdb, PZ_XSLT))) @@ -356,7 +412,8 @@ static int prepare_map(struct session *se, struct session_database *sdb) } else { - yaz_log(YLOG_WARN, "No pz:requestsyntax for auto stylesheet"); + session_log(se, YLOG_WARN, + "No pz:requestsyntax for auto stylesheet"); } } sdb->map = normalize_cache_get(se->normalize_cache, @@ -374,7 +431,7 @@ static int prepare_session_database(struct session *se, { if (!sdb->settings) { - yaz_log(YLOG_WARN, + session_log(se, YLOG_WARN, "No settings associated with %s", sdb->database->url); return -1; } @@ -430,7 +487,7 @@ void session_alert_watch(struct session *s, int what) session_watchfun fun; http_remove_observer(s->watchlist[what].obs); - fun = s->watchlist[what].fun; + fun = s->watchlist[what].fun; data = s->watchlist[what].data; /* reset watch before fun is invoked - in case fun wants to set @@ -440,6 +497,8 @@ void session_alert_watch(struct session *s, int what) s->watchlist[what].obs = 0; session_leave(s); + session_log(s, YLOG_DEBUG, + "Alert Watch: %d calling function: %p", what, fun); fun(data); } else @@ -455,6 +514,7 @@ static void select_targets_callback(void *context, struct session_database *db) client_set_database(cl, db); client_set_session(cl, se); + l = xmalloc(sizeof(*l)); l->client = cl; l->next = se->clients; @@ -503,6 +563,19 @@ int session_active_clients(struct session *s) return res; } +int session_is_preferred_clients_ready(struct session *s) +{ + struct client_list *l; + int res = 0; + + for (l = s->clients; l; l = l->next) + if (client_is_active_preferred(l->client)) + res++; + session_log(s, YLOG_DEBUG, "Has %d active preferred clients.", res); + return res == 0; +} + + enum pazpar2_error_code search(struct session *se, const char *query, @@ -514,10 +587,9 @@ enum pazpar2_error_code search(struct session *se, int no_working = 0; int no_failed = 0; struct client_list *l; - struct timespec abstime; struct timeval tval; - yaz_log(YLOG_DEBUG, "Search"); + session_log(se, YLOG_DEBUG, "Search"); *addinfo = 0; @@ -538,10 +610,9 @@ enum pazpar2_error_code search(struct session *se, } se->reclist = reclist_create(se->nmem); - gettimeofday(&tval, 0); + yaz_gettimeofday(&tval); - abstime.tv_sec = tval.tv_sec + 5; - abstime.tv_nsec = tval.tv_usec * 1000; + tval.tv_sec += 5; for (l = se->clients; l; l = l->next) { @@ -561,7 +632,7 @@ enum pazpar2_error_code search(struct session *se, if (client_prep_connection(cl, se->service->z3950_operation_timeout, se->service->z3950_session_timeout, se->service->server->iochan_man, - &abstime)) + &tval)) client_start_search(cl); } } @@ -674,31 +745,47 @@ void session_apply_setting(struct session *se, char *dbname, char *setting, } } -void destroy_session(struct session *s) +void destroy_session(struct session *se) { struct session_database *sdb; + session_log(se, YLOG_DEBUG, "Destroying"); + session_use(-1); + session_remove_clients(se); - session_remove_clients(s); - - for (sdb = s->databases; sdb; sdb = sdb->next) + for (sdb = se->databases; sdb; sdb = sdb->next) session_database_destroy(sdb); - normalize_cache_destroy(s->normalize_cache); - relevance_destroy(&s->relevance); - reclist_destroy(s->reclist); - nmem_destroy(s->nmem); - service_destroy(s->service); - yaz_mutex_destroy(&s->session_mutex); - wrbuf_destroy(s->wrbuf); + normalize_cache_destroy(se->normalize_cache); + relevance_destroy(&se->relevance); + reclist_destroy(se->reclist); + nmem_destroy(se->nmem); + service_destroy(se->service); + yaz_mutex_destroy(&se->session_mutex); + wrbuf_destroy(se->wrbuf); +} + +size_t session_get_memory_status(struct session *session) { + size_t session_nmem; + if (session == 0) + return 0; + session_enter(session); + session_nmem = nmem_total(session->nmem); + session_leave(session); + return session_nmem; } + struct session *new_session(NMEM nmem, struct conf_service *service, - const char *name) + unsigned session_id) { int i; struct session *session = nmem_malloc(nmem, sizeof(*session)); - yaz_log(YLOG_DEBUG, "New Pazpar2 session"); + char tmp_str[50]; + + sprintf(tmp_str, "session#%u", session_id); + session->session_id = session_id; + session_log(session, YLOG_DEBUG, "New"); session->service = service; session->relevance = 0; session->total_hits = 0; @@ -719,8 +806,8 @@ struct session *new_session(NMEM nmem, struct conf_service *service, } session->normalize_cache = normalize_cache_create(); session->session_mutex = 0; - pazpar2_mutex_create(&session->session_mutex, name); - + pazpar2_mutex_create(&session->session_mutex, tmp_str); + session_use(1); return session; } @@ -758,19 +845,19 @@ struct hitsbytarget *hitsbytarget(struct session *se, int *count, NMEM nmem) return res; } -struct termlist_score **termlist(struct session *s, const char *name, int *num) +struct termlist_score **termlist(struct session *se, const char *name, int *num) { int i; struct termlist_score **tl = 0; - session_enter(s); - for (i = 0; i < s->num_termlists; i++) - if (!strcmp((const char *) s->termlists[i].name, name)) + session_enter(se); + for (i = 0; i < se->num_termlists; i++) + if (!strcmp((const char *) se->termlists[i].name, name)) { - tl = termlist_highscore(s->termlists[i].termlist, num); + tl = termlist_highscore(se->termlists[i].termlist, num); break; } - session_leave(s); + session_leave(se); return tl; } @@ -787,50 +874,52 @@ void report_nmem_stats(void) } #endif -struct record_cluster *show_single_start(struct session *s, const char *id, +struct record_cluster *show_single_start(struct session *se, const char *id, struct record_cluster **prev_r, struct record_cluster **next_r) { - struct record_cluster *r; + struct record_cluster *r = 0; - session_enter(s); - reclist_enter(s->reclist); + session_enter(se); *prev_r = 0; *next_r = 0; - while ((r = reclist_read_record(s->reclist))) + if (se->reclist) { - if (!strcmp(r->recid, id)) + reclist_enter(se->reclist); + while ((r = reclist_read_record(se->reclist))) { - *next_r = reclist_read_record(s->reclist); - break; + if (!strcmp(r->recid, id)) + { + *next_r = reclist_read_record(se->reclist); + break; + } + *prev_r = r; } - *prev_r = r; + reclist_leave(se->reclist); } - reclist_leave(s->reclist); if (!r) - session_leave(s); + session_leave(se); return r; } -void show_single_stop(struct session *s, struct record_cluster *rec) +void show_single_stop(struct session *se, struct record_cluster *rec) { - session_leave(s); + session_leave(se); } -struct record_cluster **show_range_start(struct session *s, +struct record_cluster **show_range_start(struct session *se, struct reclist_sortparms *sp, int start, int *num, int *total, Odr_int *sumhits) { - struct record_cluster **recs = nmem_malloc(s->nmem, *num - * sizeof(struct record_cluster *)); + struct record_cluster **recs; struct reclist_sortparms *spp; int i; #if USE_TIMING yaz_timing_t t = yaz_timing_create(); #endif - - session_enter(s); - if (!s->relevance) + session_enter(se); + recs = nmem_malloc(se->nmem, *num * sizeof(struct record_cluster *)); + if (!se->relevance) { *num = 0; *total = 0; @@ -842,17 +931,17 @@ struct record_cluster **show_range_start(struct session *s, for (spp = sp; spp; spp = spp->next) if (spp->type == Metadata_sortkey_relevance) { - relevance_prepare_read(s->relevance, s->reclist); + relevance_prepare_read(se->relevance, se->reclist); break; } - reclist_sort(s->reclist, sp); + reclist_sort(se->reclist, sp); - reclist_enter(s->reclist); - *total = reclist_get_num_records(s->reclist); - *sumhits = s->total_hits; + reclist_enter(se->reclist); + *total = reclist_get_num_records(se->reclist); + *sumhits = se->total_hits; for (i = 0; i < start; i++) - if (!reclist_read_record(s->reclist)) + if (!reclist_read_record(se->reclist)) { *num = 0; recs = 0; @@ -861,7 +950,7 @@ struct record_cluster **show_range_start(struct session *s, for (i = 0; i < *num; i++) { - struct record_cluster *r = reclist_read_record(s->reclist); + struct record_cluster *r = reclist_read_record(se->reclist); if (!r) { *num = i; @@ -869,7 +958,7 @@ struct record_cluster **show_range_start(struct session *s, } recs[i] = r; } - reclist_leave(s->reclist); + reclist_leave(se->reclist); } #if USE_TIMING yaz_timing_stop(t); @@ -881,9 +970,9 @@ struct record_cluster **show_range_start(struct session *s, return recs; } -void show_range_stop(struct session *s, struct record_cluster **recs) +void show_range_stop(struct session *se, struct record_cluster **recs) { - session_leave(s); + session_leave(se); } void statistics(struct session *se, struct statistics *stat) @@ -979,7 +1068,10 @@ static int get_mergekey_from_doc(xmlDoc *doc, xmlNode *root, const char *name, if (!strcmp((const char *) n->name, "metadata")) { xmlChar *type = xmlGetProp(n, (xmlChar *) "type"); - if (!strcmp(name, (const char *) type)) + if (type == NULL) { + yaz_log(YLOG_FATAL, "Missing type attribute on metadata element. Skipping!"); + } + else if (!strcmp(name, (const char *) type)) { xmlChar *value = xmlNodeListGetString(doc, n->children, 1); if (value) @@ -1104,9 +1196,15 @@ static int check_record_filter(xmlNode *root, struct session_database *sdb) if (type) { size_t len; - const char *eq = strchr(s, '~'); - if (eq) - len = eq - s; + int substring; + const char *eq; + + if ((eq = strchr(s, '='))) + substring = 0; + else if ((eq = strchr(s, '~'))) + substring = 1; + if (eq) + len = eq - s; else len = strlen(s); if (len == strlen((const char *)type) && @@ -1115,7 +1213,9 @@ static int check_record_filter(xmlNode *root, struct session_database *sdb) xmlChar *value = xmlNodeGetContent(n); if (value && *value) { - if (!eq || strstr((const char *) value, eq+1)) + if (!eq || + (substring && strstr((const char *) value, eq+1)) || + (!substring && !strcmp((const char *) value, eq + 1))) match = 1; } xmlFree(value); @@ -1138,6 +1238,7 @@ static int ingest_to_cluster(struct client *cl, \param cl client holds the result set for record \param rec record buffer (0 terminated) \param record_no record position (1, 2, ..) + \param nmem working NMEM \retval 0 OK \retval -1 failure */ @@ -1148,7 +1249,7 @@ int ingest_record(struct client *cl, const char *rec, int ret = 0; struct session_database *sdb = client_get_database(cl); struct conf_service *service = se->service; - xmlDoc *xdoc = normalize_record(sdb, service, rec, nmem); + xmlDoc *xdoc = normalize_record(se, sdb, service, rec, nmem); xmlNode *root; const char *mergekey_norm; @@ -1159,8 +1260,8 @@ int ingest_record(struct client *cl, const char *rec, if (!check_record_filter(root, sdb)) { - yaz_log(YLOG_WARN, "Filtered out record no %d from %s", record_no, - sdb->database->url); + session_log(se, YLOG_WARN, "Filtered out record no %d from %s", + record_no, sdb->database->url); xmlFreeDoc(xdoc); return -1; } @@ -1168,18 +1269,14 @@ int ingest_record(struct client *cl, const char *rec, mergekey_norm = get_mergekey(xdoc, cl, record_no, service, nmem); if (!mergekey_norm) { - yaz_log(YLOG_WARN, "Got no mergekey"); + session_log(se, YLOG_WARN, "Got no mergekey"); xmlFreeDoc(xdoc); return -1; } - client_unlock(cl); session_enter(se); - client_lock(cl); if (client_get_session(cl) == se) ret = ingest_to_cluster(cl, xdoc, root, record_no, mergekey_norm); - client_unlock(cl); session_leave(se); - client_lock(cl); xmlFreeDoc(xdoc); return ret; @@ -1206,11 +1303,25 @@ static int ingest_to_cluster(struct client *cl, record, mergekey_norm, &se->total_merged); + + const char *use_term_factor_str = session_setting_oneval(sdb, PZ_TERMLIST_TERM_FACTOR); + int use_term_factor = 0; + int term_factor = 1; + if (use_term_factor_str && use_term_factor_str[0] != 0) + use_term_factor = atoi(use_term_factor_str); + if (use_term_factor) { + int maxrecs = client_get_maxrecs(cl); + int hits = (int) client_get_hits(cl); + term_factor = MAX(hits, maxrecs) / MAX(1, maxrecs); + assert(term_factor >= 1); + yaz_log(YLOG_DEBUG, "Using term factor: %d (%d / %d)", term_factor, MAX(hits, maxrecs), MAX(1, maxrecs)); + } + if (!cluster) return -1; if (global_parameters.dump_records) - yaz_log(YLOG_LOG, "Cluster id %s from %s (#%d)", cluster->recid, - sdb->database->url, record_no); + session_log(se, YLOG_LOG, "Cluster id %s from %s (#%d)", cluster->recid, + sdb->database->url, record_no); relevance_newrec(se->relevance, cluster); // now parsing XML record and adding data to cluster or record metadata @@ -1246,7 +1357,7 @@ static int ingest_to_cluster(struct client *cl, { if (se->number_of_warnings_unknown_metadata == 0) { - yaz_log(YLOG_WARN, + session_log(se, YLOG_WARN, "Ignoring unknown metadata element: %s", type); } se->number_of_warnings_unknown_metadata++; @@ -1265,8 +1376,8 @@ static int ingest_to_cluster(struct client *cl, ser_md->type, n->properties); if (!rec_md) { - yaz_log(YLOG_WARN, "bad metadata data '%s' for element '%s'", - value, type); + session_log(se, YLOG_WARN, "bad metadata data '%s' " + "for element '%s'", value, type); continue; } wheretoput = &record->metadata[md_field_id]; @@ -1326,17 +1437,11 @@ static int ingest_to_cluster(struct client *cl, if (!sort_str) { sort_str = rec_md->data.text.disp; - yaz_log(YLOG_WARN, + session_log(se, YLOG_WARN, "Could not make sortkey. Bug #1858"); } cluster->sortkeys[sk_field_id]->text.sort = nmem_strdup(se->nmem, sort_str); -#if 0 - yaz_log(YLOG_LOG, "text disp=%s", - cluster->sortkeys[sk_field_id]->text.disp); - yaz_log(YLOG_LOG, "text sort=%s", - cluster->sortkeys[sk_field_id]->text.sort); -#endif pp2_relevance_token_destroy(prt); } } @@ -1373,22 +1478,24 @@ static int ingest_to_cluster(struct client *cl, (char *) value, ser_md->rank, ser_md->name); - // construct facets ... - if (ser_md->termlist) + // construct facets ... unless the client already has reported them + if (ser_md->termlist && !client_has_facet(cl, (char *) type)) { + if (ser_md->type == Metadata_type_year) { char year[64]; sprintf(year, "%d", rec_md->data.number.max); - add_facet(se, (char *) type, year); + + add_facet(se, (char *) type, year, term_factor); if (rec_md->data.number.max != rec_md->data.number.min) { sprintf(year, "%d", rec_md->data.number.min); - add_facet(se, (char *) type, year); + add_facet(se, (char *) type, year, term_factor); } } else - add_facet(se, (char *) type, (char *) value); + add_facet(se, (char *) type, (char *) value, term_factor); } // cleaning up @@ -1399,7 +1506,7 @@ static int ingest_to_cluster(struct client *cl, else { if (se->number_of_warnings_unknown_elements == 0) - yaz_log(YLOG_WARN, + session_log(se, YLOG_WARN, "Unexpected element in internal record: %s", n->name); se->number_of_warnings_unknown_elements++; } @@ -1415,6 +1522,18 @@ static int ingest_to_cluster(struct client *cl, return 0; } +void session_log(struct session *s, int level, const char *fmt, ...) +{ + char buf[1024]; + va_list ap; + va_start(ap, fmt); + + yaz_vsnprintf(buf, sizeof(buf)-30, fmt, ap); + yaz_log(level, "Session (%u): %s", s->session_id, buf); + + va_end(ap); +} + /* * Local variables: * c-basic-offset: 4 diff --git a/src/session.h b/src/session.h index e8eceb7..6f43d69 100644 --- a/src/session.h +++ b/src/session.h @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -79,7 +79,8 @@ struct session_database #define SESSION_WATCH_SHOW 0 #define SESSION_WATCH_RECORD 1 -#define SESSION_WATCH_MAX 1 +#define SESSION_WATCH_SHOW_PREF 2 +#define SESSION_WATCH_MAX 2 #define SESSION_MAX_TERMLISTS 10 @@ -119,6 +120,7 @@ struct session { int number_of_warnings_unknown_metadata; normalize_cache_t normalize_cache; YAZ_MUTEX session_mutex; + unsigned session_id; }; struct statistics { @@ -146,7 +148,7 @@ struct hitsbytarget { struct hitsbytarget *hitsbytarget(struct session *s, int *count, NMEM nmem); struct session *new_session(NMEM nmem, struct conf_service *service, - const char *name); + unsigned session_id); void destroy_session(struct session *s); void session_init_databases(struct session *s); int load_targets(struct session *s, const char *fn); @@ -167,6 +169,7 @@ void show_single_stop(struct session *s, struct record_cluster *rec); struct termlist_score **termlist(struct session *s, const char *name, int *num); int session_set_watch(struct session *s, int what, session_watchfun fun, void *data, struct http_channel *c); int session_active_clients(struct session *s); +int session_is_preferred_clients_ready(struct session *s); void session_apply_setting(struct session *se, char *dbname, char *setting, char *value); const char *session_setting_oneval(struct session_database *db, int offset); @@ -176,6 +179,12 @@ int ingest_record(struct client *cl, const char *rec, int record_no, NMEM nmem); void session_alert_watch(struct session *s, int what); void pull_terms(NMEM nmem, struct ccl_rpn_node *n, char **termlist, int *num); +void add_facet(struct session *s, const char *type, const char *value, int count); +void session_log(struct session *s, int level, const char *fmt, ...) +#ifdef __GNUC__ + __attribute__ ((format (printf, 3, 4))) +#endif + ; #endif /* diff --git a/src/settings.c b/src/settings.c index 5308eef..1355dc1 100644 --- a/src/settings.c +++ b/src/settings.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -70,6 +70,13 @@ static char *hard_settings[] = { "pz:pqf_strftime", "pz:negotiation_charset", "pz:max_connections", + "pz:reuse_connections", /* PZ_REUSE_CONNECTION */ + "pz:termlist_term_sort", /* PZ_TERMLIST_TERM_SORT */ + "pz:termlist_term_count", /* PZ_TERMLIST_TERM_COUNT */ + "pz:termlist_term_factor", /* PZ_TERMLIST_TERM_FACTOR*/ + "pz:preferred", /* PZ_PREFERRED */ + "pz:extra_args", /* PZ_EXTRA_ARGS */ + "pz:query_syntax", /* PZ_QUERY_SYNTAX */ 0 }; diff --git a/src/settings.h b/src/settings.h index 71fb326..ba871c2 100644 --- a/src/settings.h +++ b/src/settings.h @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -38,12 +38,19 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define PZ_SRU 15 #define PZ_SRU_VERSION 16 #define PZ_PQF_PREFIX 17 -#define PZ_SORT 18 +#define PZ_SORT 18 #define PZ_RECORDFILTER 19 #define PZ_PQF_STRFTIME 20 #define PZ_NEGOTIATION_CHARSET 21 -#define PZ_MAX_CONNECTIONS 22 -#define PZ_MAX_EOF 23 +#define PZ_MAX_CONNECTIONS 22 +#define PZ_REUSE_CONNECTIONS 23 +#define PZ_TERMLIST_TERM_SORT 24 +#define PZ_TERMLIST_TERM_COUNT 25 +#define PZ_TERMLIST_TERM_FACTOR 26 +#define PZ_PREFERRED 27 +#define PZ_EXTRA_ARGS 28 +#define PZ_QUERY_SYNTAX 29 +#define PZ_MAX_EOF 30 struct setting { diff --git a/src/termlists.c b/src/termlists.c index b40e5b0..c0a7c13 100644 --- a/src/termlists.c +++ b/src/termlists.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -107,7 +107,7 @@ static void update_highscore(struct termlist *tl, struct termlist_score *t) } } -void termlist_insert(struct termlist *tl, const char *term) +void termlist_insert(struct termlist *tl, const char *term, int freq) { unsigned int bucket; struct termlist_bucket **p; @@ -125,7 +125,7 @@ void termlist_insert(struct termlist *tl, const char *term) { if (!strcmp(buf, (*p)->term.term)) { - (*p)->term.frequency++; + (*p)->term.frequency += freq; update_highscore(tl, &((*p)->term)); break; } @@ -135,7 +135,7 @@ void termlist_insert(struct termlist *tl, const char *term) struct termlist_bucket *new = nmem_malloc(tl->nmem, sizeof(struct termlist_bucket)); new->term.term = nmem_strdup(tl->nmem, buf); - new->term.frequency = 1; + new->term.frequency = freq; new->next = 0; *p = new; update_highscore(tl, &new->term); diff --git a/src/termlists.h b/src/termlists.h index f7d080b..2278f2d 100644 --- a/src/termlists.h +++ b/src/termlists.h @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -31,7 +31,7 @@ struct termlist_score struct termlist; struct termlist *termlist_create(NMEM nmem, int highscore_size); -void termlist_insert(struct termlist *tl, const char *term); +void termlist_insert(struct termlist *tl, const char *term, int freq); struct termlist_score **termlist_highscore(struct termlist *tl, int *len); #endif diff --git a/src/test_normalize.c b/src/test_normalize.c index 8cd2b2a..5700097 100644 --- a/src/test_normalize.c +++ b/src/test_normalize.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free diff --git a/src/test_sel_thread.c b/src/test_sel_thread.c index 49097d6..088e325 100644 --- a/src/test_sel_thread.c +++ b/src/test_sel_thread.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free diff --git a/src/zeerex.c b/src/zeerex.c index 82ac08d..3894435 100644 --- a/src/zeerex.c +++ b/src/zeerex.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free diff --git a/src/zeerex.h b/src/zeerex.h index 0f427aa..20ad4ec 100644 --- a/src/zeerex.h +++ b/src/zeerex.h @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free diff --git a/test/Makefile.am b/test/Makefile.am index da05f87..3d10156 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,12 +1,16 @@ # This file is part of Pazpar2. -check_SCRIPTS = test_http.sh test_icu.sh test_post.sh test_settings.sh +check_SCRIPTS = test_http.sh test_icu.sh test_post.sh test_settings.sh test_turbomarcxml.sh test_facets.sh +# Need newer yaz: test_solr.sh -EXTRA_DIST = run_pazpar2.sh marc21_test.xsl z3950_indexdata_com_marc.xml \ +EXTRA_DIST = run_pazpar2.sh marc21_test.xsl tmarc.xsl \ + z3950_indexdata_com_marc.xml \ gils_service.xml marc_service.xml marc21.mmap \ - test_http.cfg test_http_urls \ - test_icu.cfg test_icu_urls \ - test_post.cfg test_post_urls \ - test_settings.cfg test_settings_urls \ + test_http.cfg test_http.urls \ + test_icu.cfg test_icu.urls \ + test_post.cfg test_post.urls \ + test_settings.cfg test_settings.urls \ + test_turbomarcxml.cfg test_turbomarcxml.urls \ + test_facets.cfg test_facets.urls \ $(check_SCRIPTS) TESTS = $(check_SCRIPTS) @@ -16,9 +20,6 @@ MAINTAINERCLEANFILES = Makefile.in CONFIG_CLEAN_FILES=*.log *.dif dist-hook: - cp ${srcdir}/test_http_*.res $(distdir) - cp ${srcdir}/test_icu_*.res $(distdir) - cp ${srcdir}/test_post_*.res $(distdir) - cp ${srcdir}/test_settings_*.res $(distdir) + cp ${srcdir}/test_*.res $(distdir) mkdir $(distdir)/set2 cp ${srcdir}/set2/*.xml $(distdir)/set2 diff --git a/test/cf.xsl b/test/cf.xsl new file mode 100644 index 0000000..6cd4ec0 --- /dev/null +++ b/test/cf.xsl @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PAZPAR2_NULL_VALUE + + + + + + + + PAZPAR2_NULL_VALUE + + + + + + + + PAZPAR2_NULL_VALUE + + + + + + + + PAZPAR2_NULL_VALUE + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/dads-pz2.xsl b/test/dads-pz2.xsl new file mode 100644 index 0000000..c2858cf --- /dev/null +++ b/test/dads-pz2.xsl @@ -0,0 +1,144 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + article + + other + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Vol. + no. + (-) + p. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/dtic-dads-sru-proxy.xml b/test/dtic-dads-sru-proxy.xml new file mode 100644 index 0000000..e21fe1b --- /dev/null +++ b/test/dtic-dads-sru-proxy.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/gbv-sru-marc.xml b/test/gbv-sru-marc.xml new file mode 100644 index 0000000..1ec7060 --- /dev/null +++ b/test/gbv-sru-marc.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/gils_service.xml b/test/gils_service.xml index 8a43910..71b4d16 100644 --- a/test/gils_service.xml +++ b/test/gils_service.xml @@ -19,9 +19,9 @@ - - + + diff --git a/test/marc21-gbv.xsl b/test/marc21-gbv.xsl new file mode 100644 index 0000000..59a5553 --- /dev/null +++ b/test/marc21-gbv.xsl @@ -0,0 +1,354 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + electronic resource + + + electronic resource + + + article + + + book + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + , + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/run_pazpar2.sh b/test/run_pazpar2.sh index 05112d7..33ce05b 100755 --- a/test/run_pazpar2.sh +++ b/test/run_pazpar2.sh @@ -9,6 +9,20 @@ # srcdir might be set by make srcdir=${srcdir:-"."} +# terminate pazpar2 if test takes more than this (in seconds) +WAIT=120 + +kill_pazpar2() +{ + if test -n "$PP2PID"; then + kill $PP2PID + fi + if test -n "$SLEEP_PID"; then + kill $SLEEP_PID + SLEEP_PID="" + fi +} + # look for curl in PATH oIFS=$IFS IFS=: @@ -39,7 +53,7 @@ if test "x${PREFIX}" = "x"; then fi CFG=${PREFIX}.cfg -URLS=${PREFIX}_urls +URLS=${PREFIX}.urls VALGRINDLOG=${PREFIX}_valgrind.log if test -n "$PAZPAR2_USE_VALGRIND"; then @@ -47,30 +61,28 @@ if test -n "$PAZPAR2_USE_VALGRIND"; then elif test -n "$SKIP_PAZPAR2"; then echo "Skipping pazpar2. Must already be running with correct config!!! " else - YAZ_LOG=zoom,zoomdetails,debug,log,fatal ../src/pazpar2 -d -X -l pazpar2.log -f ${srcdir}/${CFG} >extra_pazpar2.log 2>&1 & + YAZ_LOG=zoom,zoomdetails,debug,log,fatal ../src/pazpar2 -v all -d -X -l pazpar2.log -f ${srcdir}/${CFG} >extra_pazpar2.log 2>&1 & fi - PP2PID=$! -# Give it a chance to start properly.. -sleep 3 - -# Set to success by default.. Will be set to non-zero in case of failure -code=0 - if [ -z "$SKIP_PAZPAR2" ] ; then if ps -p $PP2PID >/dev/null 2>&1; then - : + (sleep $WAIT; kill_pazpar2 >/dev/null) & + SLEEP_PID=$! + trap kill_pazpar2 INT + trap kill_pazpar2 HUP + sleep 3 else - code=1 - PP2PID="" echo "pazpar2 failed to start" + exit 1 fi fi -# We can start test for real +# Set to success by default.. Will be set to non-zero in case of failure +code=0 +# We can start test for real testno=1 for f in `cat ${srcdir}/${URLS}`; do if echo $f | grep '^http' >/dev/null; then @@ -78,6 +90,9 @@ for f in `cat ${srcdir}/${URLS}`; do OUT2=${PREFIX}_${testno}.log DIFF=${PREFIX}_${testno}.dif rm -f $OUT2 $DIFF + if [ -n "$DEBUG" ] ; then + echo "test $testno: $f" + fi if test -n "${postfile}"; then eval $POST else @@ -102,10 +117,13 @@ for f in `cat ${srcdir}/${URLS}`; do testno=`expr $testno + 1` postfile= elif echo $f | grep '^[0-9]' >/dev/null; then + if [ -n "$DEBUG" ] ; then + echo "Sleeping $f" + fi sleep $f else - if test -f $f; then - postfile=$f + if test -f $srcdir/$f; then + postfile=$srcdir/$f else echo "File $f does not exist" code=1 @@ -116,7 +134,11 @@ for f in `cat ${srcdir}/${URLS}`; do : else IFS="$oIFS" - echo "Test $testno: pazpar2 died" + if test -n "$SLEEP_PID"; then + echo "Test $testno: pazpar2 terminated (timeout, probably)" + else + echo "Test $testno: pazpar2 died" + fi exit 1 fi fi @@ -125,10 +147,8 @@ done # Kill programs if [ -z "$SKIP_PAZPAR2" ] ; then - if test -n "$PP2PID"; then - kill $PP2PID - sleep 2 - fi + kill_pazpar2 + sleep 2 fi exit $code diff --git a/test/solr-pz2.xsl b/test/solr-pz2.xsl new file mode 100644 index 0000000..4267f99 --- /dev/null +++ b/test/solr-pz2.xsl @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/sru-gbv.de.xml b/test/sru-gbv.de.xml new file mode 100644 index 0000000..fa6459c --- /dev/null +++ b/test/sru-gbv.de.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/test_facets.cfg b/test/test_facets.cfg new file mode 100644 index 0000000..65287b7 --- /dev/null +++ b/test/test_facets.cfg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/test_facets.sh b/test/test_facets.sh new file mode 100755 index 0000000..89839e2 --- /dev/null +++ b/test/test_facets.sh @@ -0,0 +1,45 @@ +#!/bin/sh + +# srcdir might be set by make +srcdir=${srcdir:-"."} + +# look for yaz-ztest in PATH +oIFS=$IFS +IFS=: +F='' +for p in $PATH; do + if test -x $p/yaz-ztest -a -x $p/yaz-config; then + VERSION=`$p/yaz-config -V|awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` + if test $VERSION -ge 4000012; then + F=$p/yaz-ztest + break + fi + fi +done +IFS=$oIFS + +if test -z "$F"; then + echo "yaz-ztest not found that supports facets" + exit 0 +fi + +rm -f ztest.pid +$F -l ztest.log -p ztest.pid -D tcp:localhost:9999 +sleep 1 +if test ! -f ztest.pid; then + echo "yaz-ztest could not be started" + exit 0 +fi + +${srcdir}/run_pazpar2.sh test_facets +E=$? + +kill `cat ztest.pid` +rm ztest.pid +exit $E + +# Local Variables: +# mode:shell-script +# sh-indentation: 2 +# sh-basic-offset: 4 +# End: diff --git a/test/test_facets.urls b/test/test_facets.urls new file mode 100644 index 0000000..91a0f44 --- /dev/null +++ b/test/test_facets.urls @@ -0,0 +1,24 @@ +http://localhost:9763/search.pz2?command=init&clear=1 +http://localhost:9763/search.pz2?session=1&command=settings&pz:name%5Blocalhost:9999%2Fdb1%5D=db1&pz:requestsyntax%5Blocalhost:9999%2Fdb1%5D=usmarc&pz:nativesyntax%5Blocalhost:9999%2Fdb1%5D=txml&pz:xslt%5Blocalhost:9999%2Fdb1%5D=tmarc.xsl&pz:termlist_term_count%5Blocalhost:9999%2Fdb1%5D=0 +http://localhost:9763/search.pz2?session=1&command=search&query=7+and+computer +http://localhost:9763/search.pz2?session=1&command=show&block=1 +http://localhost:9763/search.pz2?session=1&command=bytarget +4 http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate%2Cmedium +http://localhost:9763/search.pz2?session=1&command=settings&pz:name%5Blocalhost:9999%2Fdb1%5D=db1&pz:requestsyntax%5Blocalhost:9999%2Fdb1%5D=usmarc&pz:nativesyntax%5Blocalhost:9999%2Fdb1%5D=txml&pz:xslt%5Blocalhost:9999%2Fdb1%5D=tmarc.xsl&pz:termlist_term_count%5Blocalhost:9999%2Fdb1%5D=5&pz:maxrecs%5Blocalhost:9999%2Fdb1%5D=2 +http://localhost:9763/search.pz2?session=1&command=search&query=4+and+computer +http://localhost:9763/search.pz2?session=1&command=show&block=1 +http://localhost:9763/search.pz2?session=1&command=bytarget +http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate%2Cmedium +http://localhost:9763/search.pz2?session=1&command=search&query=8+and+computer +http://localhost:9763/search.pz2?session=1&command=show&block=1 +http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate%2Cmedium +http://localhost:9763/search.pz2?session=1&command=search&query=6+and+computer +http://localhost:9763/search.pz2?session=1&command=show +http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate%2Cmedium +10 http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate%2Cmedium +http://localhost:9763/search.pz2?session=1&command=bytarget +http://localhost:9763/search.pz2?command=init +http://localhost:9763/search.pz2?session=2&command=settings&pz:name%5Blocalhost:9999%2Fdb1%5D=db1&pz:requestsyntax%5Blocalhost:9999%2Fdb1%5D=usmarc&pz:nativesyntax%5Blocalhost:9999%2Fdb1%5D=txml&pz:xslt%5Blocalhost:9999%2Fdb1%5D=tmarc.xsl&pz:apdulog%5Blocalhost:9999%2Fdb1%5D=1 +http://localhost:9763/search.pz2?session=2&command=search&query=9+and+computer +2 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 diff --git a/test/test_facets_1.res b/test/test_facets_1.res new file mode 100644 index 0000000..81ff9ff --- /dev/null +++ b/test/test_facets_1.res @@ -0,0 +1,2 @@ + +OK11 \ No newline at end of file diff --git a/test/test_facets_10.res b/test/test_facets_10.res new file mode 100644 index 0000000..44f1bb9 --- /dev/null +++ b/test/test_facets_10.res @@ -0,0 +1,9 @@ + +OK +localhost:9999/db1 +db1 +4 +0 +2 +Client_Idle + \ No newline at end of file diff --git a/test/test_facets_11.res b/test/test_facets_11.res new file mode 100644 index 0000000..64048ad --- /dev/null +++ b/test/test_facets_11.res @@ -0,0 +1,35 @@ + +0 + + +localhost:9999/db1 +db1 +4 +Client_Idle +0 + + + +author0100 +author190 +author280 +author370 +author460 + + +subject0100 +subject190 +subject280 +subject370 +subject460 + + +date0100 +date190 +date280 +date370 +date460 + + + + diff --git a/test/test_facets_12.res b/test/test_facets_12.res new file mode 100644 index 0000000..ab63fe6 --- /dev/null +++ b/test/test_facets_12.res @@ -0,0 +1,2 @@ + +OK \ No newline at end of file diff --git a/test/test_facets_13.res b/test/test_facets_13.res new file mode 100644 index 0000000..f3c7728 --- /dev/null +++ b/test/test_facets_13.res @@ -0,0 +1,22 @@ + + +OK +0 +1 +8 +0 +1 + + +How to program a computer +Jack Collins +How to program a computer +Jack Collins + +How to program a computer +Jack Collins +2 +240000 +title how to program a computer author jack collins + + diff --git a/test/test_facets_14.res b/test/test_facets_14.res new file mode 100644 index 0000000..0cf8475 --- /dev/null +++ b/test/test_facets_14.res @@ -0,0 +1,35 @@ + +0 + + +localhost:9999/db1 +db1 +8 +Client_Idle +0 + + + +author0100 +author190 +author280 +author370 +author460 + + +subject0100 +subject190 +subject280 +subject370 +subject460 + + +date0100 +date190 +date280 +date370 +date460 + + + + diff --git a/test/test_facets_15.res b/test/test_facets_15.res new file mode 100644 index 0000000..ab63fe6 --- /dev/null +++ b/test/test_facets_15.res @@ -0,0 +1,2 @@ + +OK \ No newline at end of file diff --git a/test/test_facets_16.res b/test/test_facets_16.res new file mode 100644 index 0000000..95f4261 --- /dev/null +++ b/test/test_facets_16.res @@ -0,0 +1,22 @@ + + +OK +0 +1 +6 +0 +1 + + +How to program a computer +Jack Collins +How to program a computer +Jack Collins + +How to program a computer +Jack Collins +2 +240000 +title how to program a computer author jack collins + + diff --git a/test/test_facets_17.res b/test/test_facets_17.res new file mode 100644 index 0000000..e988091 --- /dev/null +++ b/test/test_facets_17.res @@ -0,0 +1,35 @@ + +0 + + +localhost:9999/db1 +db1 +6 +Client_Idle +0 + + + +author0100 +author190 +author280 +author370 +author460 + + +subject0100 +subject190 +subject280 +subject370 +subject460 + + +date0100 +date190 +date280 +date370 +date460 + + + + diff --git a/test/test_facets_18.res b/test/test_facets_18.res new file mode 100644 index 0000000..e988091 --- /dev/null +++ b/test/test_facets_18.res @@ -0,0 +1,35 @@ + +0 + + +localhost:9999/db1 +db1 +6 +Client_Idle +0 + + + +author0100 +author190 +author280 +author370 +author460 + + +subject0100 +subject190 +subject280 +subject370 +subject460 + + +date0100 +date190 +date280 +date370 +date460 + + + + diff --git a/test/test_facets_19.res b/test/test_facets_19.res new file mode 100644 index 0000000..b91448e --- /dev/null +++ b/test/test_facets_19.res @@ -0,0 +1,9 @@ + +OK +localhost:9999/db1 +db1 +6 +0 +2 +Client_Idle + \ No newline at end of file diff --git a/test/test_facets_2.res b/test/test_facets_2.res new file mode 100644 index 0000000..42534e3 --- /dev/null +++ b/test/test_facets_2.res @@ -0,0 +1,2 @@ + +OK \ No newline at end of file diff --git a/test/test_facets_20.res b/test/test_facets_20.res new file mode 100644 index 0000000..2b3989e --- /dev/null +++ b/test/test_facets_20.res @@ -0,0 +1,2 @@ + +OK21 \ No newline at end of file diff --git a/test/test_facets_21.res b/test/test_facets_21.res new file mode 100644 index 0000000..42534e3 --- /dev/null +++ b/test/test_facets_21.res @@ -0,0 +1,2 @@ + +OK \ No newline at end of file diff --git a/test/test_facets_22.res b/test/test_facets_22.res new file mode 100644 index 0000000..ab63fe6 --- /dev/null +++ b/test/test_facets_22.res @@ -0,0 +1,2 @@ + +OK \ No newline at end of file diff --git a/test/test_facets_23.res b/test/test_facets_23.res new file mode 100644 index 0000000..6d2e235 --- /dev/null +++ b/test/test_facets_23.res @@ -0,0 +1,108 @@ + + +OK +0 +8 +9 +0 +8 + + +How to program a computer +Jack Collins +How to program a computer +Jack Collins + +How to program a computer +Jack Collins +2 +28267 +title how to program a computer author jack collins + + + +Computer science & technology +proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976 +1977 +Computer science & technology +proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976 +1977 +23556 +title computer science technology + + + +The Computer Bible +1973-1980 +Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates +The Computer Bible +1973-1980 +Hebrew and Greek; introductions in English +Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates +23556 +title the computer bible + + + +Washington metropolitan area rail computer feasibility study; +final report +1971 +Englund, Carl R +"Contract DOT-UT-10003." +Washington metropolitan area rail computer feasibility study; +final report +1971 +Englund, Carl R +"Contract DOT-UT-10003." +10095 +title washington metropolitan area rail computer feasibility study author englund carl r + + + +The Puget Sound Region +a portfolio of thematic computer maps +1974 +Mairs, John W +Scale of maps ca. 1:1,000,000 +The Puget Sound Region +a portfolio of thematic computer maps +1974 +Mairs, John W +Scale of maps ca. 1:1,000,000 +9815 +title the puget sound region author mairs john w + + + +Computer processing of dynamic images from an Anger scintillation camera +the proceedings of a workshop +1974 +Computer processing of dynamic images from an Anger scintillation camera +the proceedings of a workshop +1974 +7067 +title computer processing of dynamic images from an anger scintillation camera + + + +The use of passwords for controlled access to computer resources +1977 +Wood, Helen M +The use of passwords for controlled access to computer resources +1977 +Wood, Helen M +7067 +title the use of passwords for controlled access to computer resources author wood helen m + + + +Reconstruction tomography in diagnostic radiology and nuclear medicine +proceedings of the workshop +1977 +Reconstruction tomography in diagnostic radiology and nuclear medicine +proceedings of the workshop +1977 +0 +title reconstruction tomography in diagnostic radiology and nuclear medicine + + diff --git a/test/test_facets_24.res b/test/test_facets_24.res new file mode 100644 index 0000000..a8f2b85 --- /dev/null +++ b/test/test_facets_24.res @@ -0,0 +1,35 @@ + +0 + + +localhost:9999/db1 +db1 +9 +Client_Idle +0 + + + +author0100 +author190 +author280 +author370 +author460 + + +subject0100 +subject190 +subject280 +subject370 +subject460 + + +date0100 +date190 +date280 +date370 +date460 + + + + diff --git a/test/test_facets_3.res b/test/test_facets_3.res new file mode 100644 index 0000000..ab63fe6 --- /dev/null +++ b/test/test_facets_3.res @@ -0,0 +1,2 @@ + +OK \ No newline at end of file diff --git a/test/test_facets_4.res b/test/test_facets_4.res new file mode 100644 index 0000000..1e4328b --- /dev/null +++ b/test/test_facets_4.res @@ -0,0 +1,82 @@ + + +OK +0 +6 +7 +0 +6 + + +How to program a computer +Jack Collins +How to program a computer +Jack Collins + +How to program a computer +Jack Collins +2 +36996 +title how to program a computer author jack collins + + + +Computer science & technology +proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976 +1977 +Computer science & technology +proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976 +1977 +30830 +title computer science technology + + + +The Computer Bible +1973-1980 +Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates +The Computer Bible +1973-1980 +Hebrew and Greek; introductions in English +Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates +30830 +title the computer bible + + + +The Puget Sound Region +a portfolio of thematic computer maps +1974 +Mairs, John W +Scale of maps ca. 1:1,000,000 +The Puget Sound Region +a portfolio of thematic computer maps +1974 +Mairs, John W +Scale of maps ca. 1:1,000,000 +12845 +title the puget sound region author mairs john w + + + +Computer processing of dynamic images from an Anger scintillation camera +the proceedings of a workshop +1974 +Computer processing of dynamic images from an Anger scintillation camera +the proceedings of a workshop +1974 +9249 +title computer processing of dynamic images from an anger scintillation camera + + + +Reconstruction tomography in diagnostic radiology and nuclear medicine +proceedings of the workshop +1977 +Reconstruction tomography in diagnostic radiology and nuclear medicine +proceedings of the workshop +1977 +0 +title reconstruction tomography in diagnostic radiology and nuclear medicine + + diff --git a/test/test_facets_5.res b/test/test_facets_5.res new file mode 100644 index 0000000..8b8a807 --- /dev/null +++ b/test/test_facets_5.res @@ -0,0 +1,9 @@ + +OK +localhost:9999/db1 +db1 +7 +0 +7 +Client_Idle + \ No newline at end of file diff --git a/test/test_facets_6.res b/test/test_facets_6.res new file mode 100644 index 0000000..8230a4b --- /dev/null +++ b/test/test_facets_6.res @@ -0,0 +1,35 @@ + +0 + + +localhost:9999/db1 +db1 +7 +Client_Idle +0 + + + +Jack Collins2 +Mairs, John W1 + + +Radioisotope scanning1 +Scintillation cameras1 +Imaging systems in medicine1 +Bible. O.T1 +Bible1 +Cartography1 +Puget Sound region (Wash.)1 +Tomography1 +Optical pattern recognition1 + + +19742 +19772 +19801 +19731 + + + + diff --git a/test/test_facets_7.res b/test/test_facets_7.res new file mode 100644 index 0000000..42534e3 --- /dev/null +++ b/test/test_facets_7.res @@ -0,0 +1,2 @@ + +OK \ No newline at end of file diff --git a/test/test_facets_8.res b/test/test_facets_8.res new file mode 100644 index 0000000..ab63fe6 --- /dev/null +++ b/test/test_facets_8.res @@ -0,0 +1,2 @@ + +OK \ No newline at end of file diff --git a/test/test_facets_9.res b/test/test_facets_9.res new file mode 100644 index 0000000..1ef9b8e --- /dev/null +++ b/test/test_facets_9.res @@ -0,0 +1,22 @@ + + +OK +0 +1 +4 +0 +1 + + +How to program a computer +Jack Collins +How to program a computer +Jack Collins + +How to program a computer +Jack Collins +2 +240000 +title how to program a computer author jack collins + + diff --git a/test/test_gbv_de.urls b/test/test_gbv_de.urls new file mode 100644 index 0000000..e0d8137 --- /dev/null +++ b/test/test_gbv_de.urls @@ -0,0 +1,14 @@ +http://localhost:9763/search.pz2?command=init&clear=1 +http://localhost:9763/search.pz2?session=1&command=settings&pz:sru%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=solr&pz%3Aname%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=SOLR+Test&pz%3Acclmap%3Ati%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dtitle&pz%3Acclmap%3Asu%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dsubject&pz%3Acclmap%3Aau%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dauthor&pz%3Acclmap%3Aisbn%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Disbn&pz%3Acclmap%3Aterm%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dtitle&pz%3Axslt%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=solr-pz2.xsl&pz%3Aqueryencoding%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=UTF-8&pz%3Aapdulog%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1 +http://localhost:9763/search.pz2?session=1&command=search&query=su%3D%22computer%22 +4 http://localhost:9763/search.pz2?session=1&command=show&block=1 +http://localhost:9763/search.pz2?session=1&command=bytarget +http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate +http://localhost:9763/search.pz2?command=init&clear=1 +http://localhost:9763/search.pz2?session=2&command=settings&pz:sru%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=solr&pz%3Aname%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=SOLR+Test&pz%3Acclmap%3Ati%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dtitle&pz%3Acclmap%3Asu%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dsubject&pz%3Acclmap%3Aau%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dauthor&pz%3Acclmap%3Aisbn%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Disbn&pz%3Acclmap%3Aterm%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dtitle&pz%3Axslt%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=solr-pz2.xsl&pz%3Aqueryencoding%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=UTF-8&pz%3Aapdulog%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1&pz:termlist_term_count%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=5&pz:preferred%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1 +http://localhost:9763/search.pz2?session=2&command=search&query=su%3D%22computer%22 +http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate +http://localhost:9763/search.pz2?session=2&command=show&block=preferred +http://localhost:9763/search.pz2?session=2&command=search&query=su%3D%22xyzy%22 +http://localhost:9763/search.pz2?session=2&command=show&block=preferred +http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate diff --git a/test/test_http.urls b/test/test_http.urls new file mode 100644 index 0000000..e94d528 --- /dev/null +++ b/test/test_http.urls @@ -0,0 +1,57 @@ +http://localhost:9763/search.pz2?command=init&pz:elements%5Bz3950.indexdata.com%2Fmarc%5D=F&pz:elements%5Bz3950.indexdata.com%2Fgils%5D=F +http://localhost:9763/search.pz2?session=1&command=stat +http://localhost:9763/search.pz2?session=1&command=ping +http://localhost:9763/search.pz2?session=1&command=search&query=computer +2 http://localhost:9763/search.pz2?session=1&command=show&block=1 +http://localhost:9763/search.pz2?session=1&command=record&id=title+how+to+program+a+computer+author+jack+collins+medium+book +http://localhost:9763/search.pz2?session=1&command=record&id=title+how+to+program+a+computer+author+jack+collins+medium+book&offset=0 +http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1&sort=title:0 +http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1&sort=title:1 +http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1&sort=date:0 +http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1&sort=date:1 +http://localhost:9763/search.pz2?command=search&query=function%20()%20%7B%250A%20%20%20%20var%20ccl%20=%20%22%22;%250A%20%20%20%20if%20(this.simpleQuery%20!=%20%22%22)%20%7B%250A%20%20%20%20%20%20%20%20ccl%20=%20this.simpleQuery;%250A%20%20%20%20%7D%250A%20%20%20%20for%20(var%20i%20=%200;%20i%20%3C%20this.advTerms.length;%20i++)%20%7B%250A%20%20%20%20%20%20%20%20if%20(ccl%20!=%20%22%22)%20%7B%250A%20%20%20%20%20%20%20%20%20%20%20%20ccl%20=%20ccl%20+%20%22%20and%20%22;%250A%20%20%20%20%20%20%20%20%7D%250A%20%20%20%20%20%20%20%20ccl%20=%20ccl%20+%20this.advTerms%5Bi%5D.field%20+%20%22=%5C%22%22%20+%20this.advTerms%5Bi%5D.value%20+%20%22%5C%22%22;%250A%20%20%20%20%7D%250A%20%20%20%20return%20ccl;%250A%7D&session=1&filter=function%20()%20%7B%250A%20%20%20%20if%20(this.singleFilter%20!=%20null)%20%7B%250A%20%20%20%20%20%20%20%20return%20%22pz:id=%22%20+%20this.singleFilter.id;%250A%20%20%20%20%7D%20else%20if%20(this.filterNums%20%3C=%200)%20%7B%250A%20%20%20%20%20%20%20%20return%20undefined;%250A%20%20%20%20%7D%250A%20%20%20%20var%20filter%20=%20%22pz:id=%22;%250A%20%20%20%20for%20(var%20i%20=%200;%20i%20%3C%20this.filterHash.length;%20i++)%20%7B%250A%20%20%20%20%20%20%20%20if%20(this.filterHash%5Bi%5D%20==%20undefined)%20%7B%250A%20%20%20%20%20%20%20%20%20%20%20%20continue;%250A%20%20%20%20%20%20%20%20%7D%250A%20%20%20%20%20%20%20%20if%20(filter%20%3E%20%22pz:id=%22)%20%7B%250A%20%20%20%20%20%20%20%20%20%20%20%20filter%20=%20filter%20+%20%22%7C%22;%250A%20%20%20%20%20%20%20%20%7D%250A%20%20%20%20%20%20%20%20filter%20+=%20this.filterHash%5Bi%5D.id;%250A%20%20%20%20%7D%250A%20%20%20%20return%20filter;%250A%7D +http://localhost:9763/search.pz2?session=1&command=show&sort=date:1&block=1 +http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1 +http://localhost:9763/search.pz2?command=init&clear=1 +http://localhost:9763/search.pz2?session=2&command=settings&pz:name%5Bz3950.indexdata.com%2Fgils%23DUMMY%5D=gils&pz:requestsyntax%5Bz3950.indexdata.com%2Fgils%23DUMMY%5D=usmarc&pz:nativesyntax%23DUMMY%5Bz3950.indexdata.com%2Fgils%23DUMMY%5D=iso2709&pz:xslt%5Bz3950.indexdata.com%2Fgils%23DUMMY%5D=marc21%5Ftest.xsl +http://localhost:9763/search.pz2?session=2&command=search&query=computer +2 http://localhost:9763/search.pz2?session=2&command=show&block=1 +http://localhost:9763/search.pz2?session=2&command=search&query=kubiak%20stanis%C5%82aw +http://localhost:9763/search.pz2?session=2&command=search&query=kubiak%20sts%C5%82aw +2 http://localhost:9763/search.pz2?session=2&command=bytarget +http://localhost:9763/search.pz2?session=1&command=search&query=computer +1 http://localhost:9763/search.pz2?session=1&command=record&id=title+how+to+program+a+computer+author+jack+collins+medium+book +http://localhost:9763/search.pz2?session=1&command=record&id=title+how+to+program+a+computer+author+jack+collins+medium+book&offset=0&binary=1 +http://localhost:9763/search.pz2?session=1&command=record&id=title+how+to+program+a+computer+author+jack+collins+medium+book&offset=0&binary=1&syntax=usmarc +http://localhost:9763/search.pz2?command=init&service=gils +http://localhost:9763/search.pz2?session=3&command=search&query=utah +2 http://localhost:9763/search.pz2?session=3&command=show&block=1 +http://localhost:9763/search.pz2?command=init&clear=1 +http://localhost:9763/search.pz2?session=4&command=settings&pz:name%5Bz3950.indexdata.com%2Fgils%5D=gils&pz:requestsyntax%5Bz3950.indexdata.com%2Fgils%5D=usmarc&pz:nativesyntax%5Bz3950.indexdata.com%2Fgils%5D=iso2709&pz:xslt%5Bz3950.indexdata.com%2Fgils%5D=marc21.mmap +http://localhost:9763/search.pz2?session=4&command=search&query=computer +2 http://localhost:9763/search.pz2?session=4&command=show&block=1 +http://localhost:9763/search.pz2?command=init +http://localhost:9763/search.pz2?session=5&command=settings&pz:name%5Bz3950.indexdata.com%2Fmarc%5D=marc&pz:requestsyntax%5Bz3950.indexdata.com%2Fmarc%5D=usmarc&pz:nativesyntax%5Bz3950.indexdata.com%2Fmarc%5D=iso2709&pz:xslt%5Bz3950.indexdata.com%2Fmarc%5D=marc21%5Ftest.xsl&pz:recordfilter%5Bz3950.indexdata.com%2Fmarc%5D=date +http://localhost:9763/search.pz2?session=5&command=search&query=computer&filter=pz%3Aid%3Dz3950.indexdata.com%2Fmarc +2 http://localhost:9763/search.pz2?session=5&command=show&block=1 +http://localhost:9763/search.pz2?session=5&command=search&query=computer&filter=pz%3Aid%3Dunknown +http://localhost:9763/search.pz2?session=3&command=settings&pz:maxrecs%5Bz3950.indexdata.com%2Fgils%5D=8 +http://localhost:9763/search.pz2?session=3&command=search&query=the +http://localhost:9763/search.pz2?session=5&command=search&query=the&maxrecs=5&startrecs=2 +2 http://localhost:9763/search.pz2?session=3&command=show&block=1 +http://localhost:9763/search.pz2?session=5&command=show&block=1 +http://localhost:9763/search.pz2?command=init&pz:elements%5Bz3950.indexdata.com%2Fmarc%5D=F +1 http://localhost:9763/search.pz2?session=6&command=search&query=louis +1 http://localhost:9763/search.pz2?session=6&command=show&block=1 +http://localhost:9763/search.pz2?session=6&command=record&id=title+computer+processing+of+dynamic+images+from+an+anger+scintillation+camera+author+medium+book&offset=0 +http://localhost:9763/search.pz2?command=init&pz:elements%5Bz3950.indexdata.com%2Fmarc%5D=F +http://localhost:9763/search.pz2?session=7&command=search&query=greece +1 http://localhost:9763/search.pz2?session=7&command=show&block=1 +1 http://localhost:9763/search.pz2?session=6&command=show&block=1 +http://localhost:9763/search.pz2?session=6&command=record&id=title+computer+processing+of+dynamic+images+from+an+anger+scintillation+camera+author+medium+book&offset=0 +http://localhost:9763/search.pz2?command=init +http://localhost:9763/search.pz2?session=8&command=settings&pz:name%5Bz3950.indexdata.com%2Fmarc%5D=marc&pz:requestsyntax%5Bz3950.indexdata.com%2Fmarc%5D=usmarc&pz:nativesyntax%5Bz3950.indexdata.com%2Fmarc%5D=iso2709&pz:xslt%5Bz3950.indexdata.com%2Fmarc%5D=marc21%5Ftest.xsl&pz:recordfilter%5Bz3950.indexdata.com%2Fmarc%5D=date +http://localhost:9763/search.pz2?session=8&command=search&query=xyzzyz +2 http://localhost:9763/search.pz2?session=8&command=show&block=1 +http://localhost:9763/search.pz2?session=8&command=search&query=a+and +1 http://localhost:9763/search.pz2?session=8&command=show&block=1 diff --git a/test/test_http_18.res b/test/test_http_18.res index 77b4469..267fde6 100644 --- a/test/test_http_18.res +++ b/test/test_http_18.res @@ -9,7 +9,7 @@ BIBLIOGRAPHY OF MAINE GEOLOGY -This data base is a computer based bibliography of marine geology. It allows searching by topic and geographic location, similar to GEOREF. It is currently under development to replace the printed Bibliography of Marine Geology +This data base is a computer based bibliography of marine geology. It allows searching by topic and geographic location, similar to GEOREF. It is currently under development to replace the printed Bibliography of Marine Geology BIBLIOGRAPHY OF MAINE GEOLOGY This data base is a computer based bibliography of marine geology. It allows searching by topic and geographic location, similar to GEOREF. It is currently under development to replace the printed Bibliography of Marine Geology 1692-PRESENT @@ -21,7 +21,7 @@ GROUNDWATER RESOURCE MAPS - COUNTY SERIES -A series of 1:250,000 scale maps showing well yield, well depth, and depth to bedrock for a large number of bedrock wells inventoried by the Maine Geological Survey in the mid-to late 1970's comprises this data set. Some series also show bedrock topography and potentiometric surface. Geographic coverage is restricted to Southern Maine +A series of 1:250,000 scale maps showing well yield, well depth, and depth to bedrock for a large number of bedrock wells inventoried by the Maine Geological Survey in the mid-to late 1970's comprises this data set. Some series also show bedrock topography and potentiometric surface. Geographic coverage is restricted to Southern Maine GROUNDWATER RESOURCE MAPS - COUNTY SERIES A series of 1:250,000 scale maps showing well yield, well depth, and depth to bedrock for a large number of bedrock wells inventoried by the Maine Geological Survey in the mid-to late 1970's comprises this data set. Some series also show bedrock topography and potentiometric surface. Geographic coverage is restricted to Southern Maine 1972-1978 @@ -33,7 +33,7 @@ OIL/GAS DRILLING -This database contains information on oil and gas drilling such as well name, operator, driller, location, depth, copies of logs run, permits, samples (cuttings, core), completion records +This database contains information on oil and gas drilling such as well name, operator, driller, location, depth, copies of logs run, permits, samples (cuttings, core), completion records OIL/GAS DRILLING This database contains information on oil and gas drilling such as well name, operator, driller, location, depth, copies of logs run, permits, samples (cuttings, core), completion records 1907-PRESENT diff --git a/test/test_http_21.res b/test/test_http_21.res index 88a62fe..a156563 100644 --- a/test/test_http_21.res +++ b/test/test_http_21.res @@ -1,6 +1,6 @@ OK -z3950.indexdata.com/gils +z3950.indexdata.com/gils#DUMMY gils 0 0 diff --git a/test/test_http_24.res b/test/test_http_24.res index a2c38de..e794d1b 100644 --- a/test/test_http_24.res +++ b/test/test_http_24.res @@ -1 +1 @@ -00362nam 22001698a 4504001001300000003000400013005001700017008004100034010001300075040001300088050001200101100001700113245003000130260001200160263000900172300001100181 11224467 DLC00000000000000.0910710c19910701nju 00010 eng  a11224467 aDLCcDLC00a123-xyz10aJack Collins10aHow to program a computer1 aPenguin a8710 ap. cm. \ No newline at end of file +00366nam 22001698a 4504001001300000003000400013005001700017008004100034010001700075040001300092050001200105100001700117245003000134260001200164263000900176300001100185 11224467 DLC00000000000000.0910710c19910701nju 00010 eng  a 11224467  aDLCcDLC00a123-xyz10aJack Collins10aHow to program a computer1 aPenguin a8710 ap. cm. \ No newline at end of file diff --git a/test/test_http_25.res b/test/test_http_25.res index a2c38de..e794d1b 100644 --- a/test/test_http_25.res +++ b/test/test_http_25.res @@ -1 +1 @@ -00362nam 22001698a 4504001001300000003000400013005001700017008004100034010001300075040001300088050001200101100001700113245003000130260001200160263000900172300001100181 11224467 DLC00000000000000.0910710c19910701nju 00010 eng  a11224467 aDLCcDLC00a123-xyz10aJack Collins10aHow to program a computer1 aPenguin a8710 ap. cm. \ No newline at end of file +00366nam 22001698a 4504001001300000003000400013005001700017008004100034010001700075040001300092050001200105100001700117245003000134260001200164263000900176300001100185 11224467 DLC00000000000000.0910710c19910701nju 00010 eng  a 11224467  aDLCcDLC00a123-xyz10aJack Collins10aHow to program a computer1 aPenguin a8710 ap. cm. \ No newline at end of file diff --git a/test/test_http_28.res b/test/test_http_28.res index d9ad8e6..fdb5227 100644 --- a/test/test_http_28.res +++ b/test/test_http_28.res @@ -2,127 +2,29 @@ OK 0 -17 +3 17 0 -17 +3 UTAH GEOCHROMOMETRY UTAH GEOCHROMOMETRY -190796 +300000 title utah geochromometry author medium book -UTAH CRIB FILE -UTAH CRIB FILE -127197 -title utah crib file author medium book - - - UTAH EARTHQUAKE EPICENTERS UTAH EARTHQUAKE EPICENTERS -127197 +200000 title utah earthquake epicenters author medium book -BIBLIOGRAPHY OF UTAH GEOLOGY -BIBLIOGRAPHY OF UTAH GEOLOGY -95398 -title bibliography of utah geology author medium book - - - -UTAH GEOLOGIC MAP BIBLIOGRAPHY -UTAH GEOLOGIC MAP BIBLIOGRAPHY -95398 -title utah geologic map bibliography author medium book - - - -UTAH GEOLOGICAL ASSOCIATION PUBLICATIONS -UTAH GEOLOGICAL ASSOCIATION PUBLICATIONS -95398 -title utah geological association publications author medium book - - - -UTAH GEOLOGICAL SOCIETY PUBLICATIONS -UTAH GEOLOGICAL SOCIETY PUBLICATIONS -95398 -title utah geological society publications author medium book - - - -UTAH OIL FIELD FILE -UTAH OIL FIELD FILE -95398 -title utah oil field file author medium book - - - UTAH GEOLOGICAL AND MINERAL SURVEY PUBLICATIONS UTAH GEOLOGICAL AND MINERAL SURVEY PUBLICATIONS -63598 +100000 title utah geological and mineral survey publications author medium book - - -APPLIED GEOLOGY FILE -APPLIED GEOLOGY FILE -0 -title applied geology file author medium book - - - -COAL SAMPLE BANK -COAL SAMPLE BANK -0 -title coal sample bank author medium book - - - -ELECTRIC LOG LIBRARY -ELECTRIC LOG LIBRARY -0 -title electric log library author medium book - - - -INTERMOUNTAIN ASSOCIATION OF PETROLEUM GEOLOGISTS/GEOLOGISTS PUBLICATIONS -INTERMOUNTAIN ASSOCIATION OF PETROLEUM GEOLOGISTS/GEOLOGISTS PUBLICATIONS -0 -title intermountain association of petroleum geologists geologists publications author medium book - - - -MEASURED GEOLOGIC SECTIONS -MEASURED GEOLOGIC SECTIONS -0 -title measured geologic sections author medium book - - - -MINE MAP INDEX -MINE MAP INDEX -0 -title mine map index author medium book - - - -OIL IMPREGNATED ROCK DEPOSITS -OIL IMPREGNATED ROCK DEPOSITS -0 -title oil impregnated rock deposits author medium book - - - -WELL SAMPLE LIBRARY -WELL SAMPLE LIBRARY -0 -title well sample library author medium book - diff --git a/test/test_http_41.res b/test/test_http_41.res index b7ca6cf..ac7cb04 100644 --- a/test/test_http_41.res +++ b/test/test_http_41.res @@ -3,7 +3,7 @@ OK 0 8 -30 +31 0 8 diff --git a/test/test_http_42.res b/test/test_http_42.res index 8bd663c..9893c49 100644 --- a/test/test_http_42.res +++ b/test/test_http_42.res @@ -3,7 +3,7 @@ OK 0 5 -11 +12 0 5 diff --git a/test/test_http_43.res b/test/test_http_43.res new file mode 100644 index 0000000..b6eb00f --- /dev/null +++ b/test/test_http_43.res @@ -0,0 +1,2 @@ + +OK61 \ No newline at end of file diff --git a/test/test_http_44.res b/test/test_http_44.res new file mode 100644 index 0000000..ab63fe6 --- /dev/null +++ b/test/test_http_44.res @@ -0,0 +1,2 @@ + +OK \ No newline at end of file diff --git a/test/test_http_45.res b/test/test_http_45.res new file mode 100644 index 0000000..2b89580 --- /dev/null +++ b/test/test_http_45.res @@ -0,0 +1,25 @@ + + +OK +0 +1 +1 +0 +1 + + +Computer processing of dynamic images from an Anger scintillation camera +the proceedings of a workshop +1974 +Includes bibliographical references and index +Computer processing of dynamic images from an Anger scintillation camera +the proceedings of a workshop +1974 +Includes bibliographical references and index +XXXXXXXXXX +test-usersetting-2 data: + YYYYYYYYY +0 +title computer processing of dynamic images from an anger scintillation camera author medium book + + diff --git a/test/test_http_46.res b/test/test_http_46.res new file mode 100644 index 0000000..986955f --- /dev/null +++ b/test/test_http_46.res @@ -0,0 +1,73 @@ + + 01369nam a2200265 i 4504 + 73090924 //r82 + DLC + 19820524000000.0 + 760609s1974 nyua b 10110 eng + + 73090924 //r82 + + + DLC + DLC + DLC + + + RC71.3 + .W67 1971 + + + 616.07/575/02854 + + + Workshop on Computer Processing of Dynamic Images from an Anger Scintillation Camera, + Washington University, + 1971. + + + Computer processing of dynamic images from an Anger scintillation camera : + the proceedings of a workshop / + cosponsored by the Biomedical Computer Laboratory and the Nuclear Medicine Division, Department of Radiology, School of Medicine, Washington University, St. Louis, January 18-22, 1971 ; edited by Kenneth B. Larson, Jerome R. Cox, Jr. + + + New York : + Society of Nuclear Medicine, + [c1974] + + + xiv, p. : + ill. ; + 24 cm. + + + Includes bibliographical references and index. + + + Radioisotope scanning + Data processing + Congresses. + + + Scintillation cameras + Congresses. + + + Imaging systems in medicine + Data processing + Congresses. + + + Larson, Kenneth B. + + + Cox, Jerome R. + + + Washington University, St. Louis. + Biomedical Computer Laboratory. + + + Washington University, St. Louis. + Nuclear Medicine Division. + + diff --git a/test/test_http_47.res b/test/test_http_47.res new file mode 100644 index 0000000..7f14f96 --- /dev/null +++ b/test/test_http_47.res @@ -0,0 +1,2 @@ + +OK71 \ No newline at end of file diff --git a/test/test_http_48.res b/test/test_http_48.res new file mode 100644 index 0000000..ab63fe6 --- /dev/null +++ b/test/test_http_48.res @@ -0,0 +1,2 @@ + +OK \ No newline at end of file diff --git a/test/test_http_49.res b/test/test_http_49.res new file mode 100644 index 0000000..43fcf8b --- /dev/null +++ b/test/test_http_49.res @@ -0,0 +1,26 @@ + + +OK +0 +1 +1 +0 +1 + + +The religious teachers of Greece +1972 +Adam, James +Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures +The religious teachers of Greece +1972 +Adam, James +Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures +Includes bibliographical references +XXXXXXXXXX +test-usersetting-2 data: + YYYYYYYYY +120000 +title the religious teachers of greece author adam james medium book + + diff --git a/test/test_http_50.res b/test/test_http_50.res new file mode 100644 index 0000000..2b89580 --- /dev/null +++ b/test/test_http_50.res @@ -0,0 +1,25 @@ + + +OK +0 +1 +1 +0 +1 + + +Computer processing of dynamic images from an Anger scintillation camera +the proceedings of a workshop +1974 +Includes bibliographical references and index +Computer processing of dynamic images from an Anger scintillation camera +the proceedings of a workshop +1974 +Includes bibliographical references and index +XXXXXXXXXX +test-usersetting-2 data: + YYYYYYYYY +0 +title computer processing of dynamic images from an anger scintillation camera author medium book + + diff --git a/test/test_http_51.res b/test/test_http_51.res new file mode 100644 index 0000000..986955f --- /dev/null +++ b/test/test_http_51.res @@ -0,0 +1,73 @@ + + 01369nam a2200265 i 4504 + 73090924 //r82 + DLC + 19820524000000.0 + 760609s1974 nyua b 10110 eng + + 73090924 //r82 + + + DLC + DLC + DLC + + + RC71.3 + .W67 1971 + + + 616.07/575/02854 + + + Workshop on Computer Processing of Dynamic Images from an Anger Scintillation Camera, + Washington University, + 1971. + + + Computer processing of dynamic images from an Anger scintillation camera : + the proceedings of a workshop / + cosponsored by the Biomedical Computer Laboratory and the Nuclear Medicine Division, Department of Radiology, School of Medicine, Washington University, St. Louis, January 18-22, 1971 ; edited by Kenneth B. Larson, Jerome R. Cox, Jr. + + + New York : + Society of Nuclear Medicine, + [c1974] + + + xiv, p. : + ill. ; + 24 cm. + + + Includes bibliographical references and index. + + + Radioisotope scanning + Data processing + Congresses. + + + Scintillation cameras + Congresses. + + + Imaging systems in medicine + Data processing + Congresses. + + + Larson, Kenneth B. + + + Cox, Jerome R. + + + Washington University, St. Louis. + Biomedical Computer Laboratory. + + + Washington University, St. Louis. + Nuclear Medicine Division. + + diff --git a/test/test_http_52.res b/test/test_http_52.res new file mode 100644 index 0000000..1dc284e --- /dev/null +++ b/test/test_http_52.res @@ -0,0 +1,2 @@ + +OK81 \ No newline at end of file diff --git a/test/test_http_53.res b/test/test_http_53.res new file mode 100644 index 0000000..42534e3 --- /dev/null +++ b/test/test_http_53.res @@ -0,0 +1,2 @@ + +OK \ No newline at end of file diff --git a/test/test_http_54.res b/test/test_http_54.res new file mode 100644 index 0000000..ab63fe6 --- /dev/null +++ b/test/test_http_54.res @@ -0,0 +1,2 @@ + +OK \ No newline at end of file diff --git a/test/test_http_55.res b/test/test_http_55.res new file mode 100644 index 0000000..d3b889f --- /dev/null +++ b/test/test_http_55.res @@ -0,0 +1,9 @@ + + +OK +0 +0 +0 +0 +0 + diff --git a/test/test_http_56.res b/test/test_http_56.res new file mode 100644 index 0000000..e2db1ca --- /dev/null +++ b/test/test_http_56.res @@ -0,0 +1,2 @@ + +query \ No newline at end of file diff --git a/test/test_http_57.res b/test/test_http_57.res new file mode 100644 index 0000000..d3b889f --- /dev/null +++ b/test/test_http_57.res @@ -0,0 +1,9 @@ + + +OK +0 +0 +0 +0 +0 + diff --git a/test/test_http_7.res b/test/test_http_7.res index 838cea5..0f838d2 100644 --- a/test/test_http_7.res +++ b/test/test_http_7.res @@ -1,11 +1,11 @@ - 00362nam a22001698a 4504 + 00366nam a22001698a 4504 11224467 DLC 00000000000000.0 910710c19910701nju 00010 eng - 11224467 + 11224467 DLC diff --git a/test/test_http_urls b/test/test_http_urls deleted file mode 100644 index ed377c5..0000000 --- a/test/test_http_urls +++ /dev/null @@ -1,42 +0,0 @@ -http://localhost:9763/search.pz2?command=init&pz:elements%5Bz3950.indexdata.com%2Fmarc%5D=F&pz:elements%5Bz3950.indexdata.com%2Fgils%5D=F -http://localhost:9763/search.pz2?session=1&command=stat -http://localhost:9763/search.pz2?session=1&command=ping -http://localhost:9763/search.pz2?session=1&command=search&query=computer -2 http://localhost:9763/search.pz2?session=1&command=show&block=1 -http://localhost:9763/search.pz2?session=1&command=record&id=title+how+to+program+a+computer+author+jack+collins+medium+book -http://localhost:9763/search.pz2?session=1&command=record&id=title+how+to+program+a+computer+author+jack+collins+medium+book&offset=0 -http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1&sort=title:0 -http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1&sort=title:1 -http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1&sort=date:0 -http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1&sort=date:1 -http://localhost:9763/search.pz2?command=search&query=function%20()%20%7B%250A%20%20%20%20var%20ccl%20=%20%22%22;%250A%20%20%20%20if%20(this.simpleQuery%20!=%20%22%22)%20%7B%250A%20%20%20%20%20%20%20%20ccl%20=%20this.simpleQuery;%250A%20%20%20%20%7D%250A%20%20%20%20for%20(var%20i%20=%200;%20i%20%3C%20this.advTerms.length;%20i++)%20%7B%250A%20%20%20%20%20%20%20%20if%20(ccl%20!=%20%22%22)%20%7B%250A%20%20%20%20%20%20%20%20%20%20%20%20ccl%20=%20ccl%20+%20%22%20and%20%22;%250A%20%20%20%20%20%20%20%20%7D%250A%20%20%20%20%20%20%20%20ccl%20=%20ccl%20+%20this.advTerms%5Bi%5D.field%20+%20%22=%5C%22%22%20+%20this.advTerms%5Bi%5D.value%20+%20%22%5C%22%22;%250A%20%20%20%20%7D%250A%20%20%20%20return%20ccl;%250A%7D&session=1&filter=function%20()%20%7B%250A%20%20%20%20if%20(this.singleFilter%20!=%20null)%20%7B%250A%20%20%20%20%20%20%20%20return%20%22pz:id=%22%20+%20this.singleFilter.id;%250A%20%20%20%20%7D%20else%20if%20(this.filterNums%20%3C=%200)%20%7B%250A%20%20%20%20%20%20%20%20return%20undefined;%250A%20%20%20%20%7D%250A%20%20%20%20var%20filter%20=%20%22pz:id=%22;%250A%20%20%20%20for%20(var%20i%20=%200;%20i%20%3C%20this.filterHash.length;%20i++)%20%7B%250A%20%20%20%20%20%20%20%20if%20(this.filterHash%5Bi%5D%20==%20undefined)%20%7B%250A%20%20%20%20%20%20%20%20%20%20%20%20continue;%250A%20%20%20%20%20%20%20%20%7D%250A%20%20%20%20%20%20%20%20if%20(filter%20%3E%20%22pz:id=%22)%20%7B%250A%20%20%20%20%20%20%20%20%20%20%20%20filter%20=%20filter%20+%20%22%7C%22;%250A%20%20%20%20%20%20%20%20%7D%250A%20%20%20%20%20%20%20%20filter%20+=%20this.filterHash%5Bi%5D.id;%250A%20%20%20%20%7D%250A%20%20%20%20return%20filter;%250A%7D -http://localhost:9763/search.pz2?session=1&command=show&sort=date:1&block=1 -http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1 -http://localhost:9763/search.pz2?command=init&clear=1 -http://localhost:9763/search.pz2?session=2&command=settings&pz:name%5Bz3950.indexdata.com%2Fgils%5D=gils&pz:requestsyntax%5Bz3950.indexdata.com%2Fgils%5D=usmarc&pz:nativesyntax%5Bz3950.indexdata.com%2Fgils%5D=iso2709&pz:xslt%5Bz3950.indexdata.com%2Fgils%5D=marc21%5Ftest.xsl -http://localhost:9763/search.pz2?session=2&command=search&query=computer -2 http://localhost:9763/search.pz2?session=2&command=show&block=1 -http://localhost:9763/search.pz2?session=2&command=search&query=kubiak%20stanis%C5%82aw -http://localhost:9763/search.pz2?session=2&command=search&query=kubiak%20sts%C5%82aw -2 http://localhost:9763/search.pz2?session=2&command=bytarget -http://localhost:9763/search.pz2?session=1&command=search&query=computer -1 http://localhost:9763/search.pz2?session=1&command=record&id=title+how+to+program+a+computer+author+jack+collins+medium+book -http://localhost:9763/search.pz2?session=1&command=record&id=title+how+to+program+a+computer+author+jack+collins+medium+book&offset=0&binary=1 -http://localhost:9763/search.pz2?session=1&command=record&id=title+how+to+program+a+computer+author+jack+collins+medium+book&offset=0&binary=1&syntax=usmarc -http://localhost:9763/search.pz2?command=init&service=gils -http://localhost:9763/search.pz2?session=3&command=search&query=utah -2 http://localhost:9763/search.pz2?session=3&command=show&block=1 -http://localhost:9763/search.pz2?command=init&clear=1 -http://localhost:9763/search.pz2?session=4&command=settings&pz:name%5Bz3950.indexdata.com%2Fgils%5D=gils&pz:requestsyntax%5Bz3950.indexdata.com%2Fgils%5D=usmarc&pz:nativesyntax%5Bz3950.indexdata.com%2Fgils%5D=iso2709&pz:xslt%5Bz3950.indexdata.com%2Fgils%5D=marc21.mmap -http://localhost:9763/search.pz2?session=4&command=search&query=computer -2 http://localhost:9763/search.pz2?session=4&command=show&block=1 -http://localhost:9763/search.pz2?command=init -http://localhost:9763/search.pz2?session=5&command=settings&pz:name%5Bz3950.indexdata.com%2Fmarc%5D=marc&pz:requestsyntax%5Bz3950.indexdata.com%2Fmarc%5D=usmarc&pz:nativesyntax%5Bz3950.indexdata.com%2Fmarc%5D=iso2709&pz:xslt%5Bz3950.indexdata.com%2Fmarc%5D=marc21%5Ftest.xsl&pz:recordfilter%5Bz3950.indexdata.com%2Fmarc%5D=date -http://localhost:9763/search.pz2?session=5&command=search&query=computer&filter=pz%3Aid%3Dz3950.indexdata.com%2Fmarc -2 http://localhost:9763/search.pz2?session=5&command=show&block=1 -http://localhost:9763/search.pz2?session=5&command=search&query=computer&filter=pz%3Aid%3Dunknown -http://localhost:9763/search.pz2?session=3&command=settings&pz:maxrecs%5Bz3950.indexdata.com%2Fgils%5D=8 -http://localhost:9763/search.pz2?session=3&command=search&query=the -http://localhost:9763/search.pz2?session=5&command=search&query=the&maxrecs=5&startrecs=2 -2 http://localhost:9763/search.pz2?session=3&command=show&block=1 -http://localhost:9763/search.pz2?session=5&command=show&block=1 diff --git a/test/test_icu.cfg b/test/test_icu.cfg index f3bd2e5..0aec864 100644 --- a/test/test_icu.cfg +++ b/test/test_icu.cfg @@ -7,29 +7,36 @@ - + + - + - + + + + + + + diff --git a/test/test_icu.urls b/test/test_icu.urls new file mode 100644 index 0000000..11a5dae --- /dev/null +++ b/test/test_icu.urls @@ -0,0 +1,9 @@ +http://localhost:9763/search.pz2?command=init +http://localhost:9763/search.pz2?session=1&command=stat +http://localhost:9763/search.pz2?session=1&command=search&query=computer +2 http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1&sort=title:0 +http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1&sort=title:1 +http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1&sort=date:0 +http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1&sort=date:1 +http://localhost:9763/search.pz2?session=1&command=termlist&name=author%2Csubject +http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1 \ No newline at end of file diff --git a/test/test_icu_8.res b/test/test_icu_8.res new file mode 100644 index 0000000..2f49a59 --- /dev/null +++ b/test/test_icu_8.res @@ -0,0 +1,21 @@ + +0 + +Jack Collins2 +Mairs, John W1 +Wood, Helen M1 +Englund, Carl R1 + + +Radioisotope Scanning1 +Scintillation Cameras1 +Imaging Systems In Medicine1 +Cartography1 +Tomography1 +Optical Pattern Recognition1 +Computers1 +Railroads1 +Universities And Colleges1 +Community Colleges1 + + diff --git a/test/test_icu_9.res b/test/test_icu_9.res new file mode 100644 index 0000000..f09bc0a --- /dev/null +++ b/test/test_icu_9.res @@ -0,0 +1,154 @@ + + +OK +0 +9 +10 +0 +9 + + +The use of passwords for controlled access to computer resources +1977 +Wood, Helen M +The use of passwords for controlled access to computer resources +1977 +Wood, Helen M +XXXXXXXXXX +test-usersetting-2 data: + YYYYYYYYY +37929 +title the use of passwords for controlled access to computer resources author wood helen m medium book + + + +How to program a computer +Jack Collins +How to program a computer +Jack Collins +XXXXXXXXXX +test-usersetting-2 data: + YYYYYYYYY + +How to program a computer +Jack Collins +XXXXXXXXXX +test-usersetting-2 data: + YYYYYYYYY +2 +25286 +title how to program a computer author jack collins medium book + + + +The Computer Bible +1973-1980 +Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates +The Computer Bible +1973-1980 +Hebrew and Greek; introductions in English +Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates +XXXXXXXXXX +test-usersetting-2 data: + YYYYYYYYY +21072 +title the computer bible author medium book + + + +Computer science & technology +proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976 +1977 +Computer science & technology +proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976 +1977 +XXXXXXXXXX +test-usersetting-2 data: + YYYYYYYYY +15804 +title computer science technology author medium book + + + +A plan for community college computer development +1971 +Cover title +A plan for community college computer development +1971 +Cover title +XXXXXXXXXX +test-usersetting-2 data: + YYYYYYYYY +9030 +title a plan for community college computer development author medium book + + + +Washington metropolitan area rail computer feasibility study; +final report +1971 +Englund, Carl R +"Contract DOT-UT-10003." +Washington metropolitan area rail computer feasibility study; +final report +1971 +Englund, Carl R +"Contract DOT-UT-10003." +XXXXXXXXXX +test-usersetting-2 data: + YYYYYYYYY +9030 +title washington metropolitan area rail computer feasibility study author englund carl r medium book + + + +The Puget Sound Region +a portfolio of thematic computer maps +1974 +Mairs, John W +Scale of maps ca. 1:1,000,000 +The Puget Sound Region +a portfolio of thematic computer maps +1974 +Mairs, John W +Scale of maps ca. 1:1,000,000 +Bibliography: p. 4 +XXXXXXXXXX +test-usersetting-2 data: + YYYYYYYYY +8780 +title the puget sound region author mairs john w medium book + + + +Computer processing of dynamic images from an Anger scintillation camera +the proceedings of a workshop +1974 +Includes bibliographical references and index +Computer processing of dynamic images from an Anger scintillation camera +the proceedings of a workshop +1974 +Includes bibliographical references and index +XXXXXXXXXX +test-usersetting-2 data: + YYYYYYYYY +6321 +title computer processing of dynamic images from an anger scintillation camera author medium book + + + +Reconstruction tomography in diagnostic radiology and nuclear medicine +proceedings of the workshop +1977 +Includes bibliographical references and index +Reconstruction tomography in diagnostic radiology and nuclear medicine +proceedings of the workshop +1977 +Includes bibliographical references and index +XXXXXXXXXX +test-usersetting-2 data: + YYYYYYYYY +0 +title reconstruction tomography in diagnostic radiology and nuclear medicine author medium book + + diff --git a/test/test_icu_urls b/test/test_icu_urls deleted file mode 100644 index 57bd419..0000000 --- a/test/test_icu_urls +++ /dev/null @@ -1,7 +0,0 @@ -http://localhost:9763/search.pz2?command=init -http://localhost:9763/search.pz2?session=1&command=stat -http://localhost:9763/search.pz2?session=1&command=search&query=computer -2 http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1&sort=title:0 -http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1&sort=title:1 -http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1&sort=date:0 -http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1&sort=date:1 diff --git a/test/test_post.urls b/test/test_post.urls new file mode 100644 index 0000000..3bf0975 --- /dev/null +++ b/test/test_post.urls @@ -0,0 +1,12 @@ +marc_service.xml http://localhost:9763/search.pz2?command=init +http://localhost:9763/search.pz1?session=1&command=search&query=computer +gils_service.xml http://localhost:9763/search.pz2?command=init +http://localhost:9763/search.pz1?session=2&command=search&query=computer +gils_service.xml http://localhost:9763/search.pz2?command=init&clear=1 +z3950_indexdata_com_marc.xml +http://localhost:9763/search.pz1?session=3&command=settings +http://localhost:9763/search.pz1?session=3&command=search&query=computer +2 http://localhost:9763/search.pz1?session=1&command=show +http://localhost:9763/search.pz1?session=2&command=show +http://localhost:9763/search.pz1?session=3&command=show +http://localhost:9763/search.pz1?session=3&command=bytarget diff --git a/test/test_post_urls b/test/test_post_urls deleted file mode 100644 index 3bf0975..0000000 --- a/test/test_post_urls +++ /dev/null @@ -1,12 +0,0 @@ -marc_service.xml http://localhost:9763/search.pz2?command=init -http://localhost:9763/search.pz1?session=1&command=search&query=computer -gils_service.xml http://localhost:9763/search.pz2?command=init -http://localhost:9763/search.pz1?session=2&command=search&query=computer -gils_service.xml http://localhost:9763/search.pz2?command=init&clear=1 -z3950_indexdata_com_marc.xml -http://localhost:9763/search.pz1?session=3&command=settings -http://localhost:9763/search.pz1?session=3&command=search&query=computer -2 http://localhost:9763/search.pz1?session=1&command=show -http://localhost:9763/search.pz1?session=2&command=show -http://localhost:9763/search.pz1?session=3&command=show -http://localhost:9763/search.pz1?session=3&command=bytarget diff --git a/test/test_preferred.cfg b/test/test_preferred.cfg new file mode 100644 index 0000000..65287b7 --- /dev/null +++ b/test/test_preferred.cfg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/test_preferred.res b/test/test_preferred.res new file mode 100644 index 0000000..1fb968b --- /dev/null +++ b/test/test_preferred.res @@ -0,0 +1,3 @@ +[log] Target connect.indexdata.com:9000/mit_opencourseware has preferred status: 1 +[log] Target connect.indexdata.com:9000/mit_opencourseware has preferred status: 1 +[log] Target connect.indexdata.com:9000/mit_opencourseware has preferred status: 1 diff --git a/test/test_preferred.sh b/test/test_preferred.sh new file mode 100755 index 0000000..0d2688d --- /dev/null +++ b/test/test_preferred.sh @@ -0,0 +1,42 @@ +#!/bin/sh + +# srcdir might be set by make +srcdir=${srcdir:-"."} + +#TODO set up solr target. For now use donut +#F=../solr/client.sh +# +#rm -f solr.pid +#$F -l solr.log -p ztest.pid -D @:9999 +#sleep 1 +#if test ! -f ztest.pid; then +# echo "yaz-ztest could not be started" +# exit 0 +#fi + +${srcdir}/run_pazpar2.sh test_preferred +E=$? + +grep "has preferred" pazpar2.log | cut -f 4- -d ' ' > test_preferred.log +# +if [ -f test_preferred.res ] ; then + diff test_preferred.res test_preferred.log > test_preferred.dif + E2=$? + if [ $E2 -ne 0 ] ; then + echo "has preferred test failed!" + E=$E2 + fi +else + echo "Making test_preferred.res for first time." + mv test_preferred.log test_preferred.res +fi + +#kill `cat ztest.pid` +#rm ztest.pid +exit $E + +# Local Variables: +# mode:shell-script +# sh-indentation: 2 +# sh-basic-offset: 4 +# End: diff --git a/test/test_preferred.urls b/test/test_preferred.urls new file mode 100644 index 0000000..0e5e642 --- /dev/null +++ b/test/test_preferred.urls @@ -0,0 +1,16 @@ +http://localhost:9763/search.pz2?command=init&clear=1 +http://localhost:9763/search.pz2?session=1&command=settings&full_text_target%5Bconnect.indexdata.com%3A9000%2Fmit_opencourseware%5D=NO&use_url_proxy%5Bconnect.indexdata.com%3A9000%2Fmit_opencourseware%5D=0&pz%3Apreferred%5Bconnect.indexdata.com%3A9000%2Fmit_opencourseware%5D=1&pz%3Apiggyback%5Bconnect.indexdata.com%3A9000%2Fmit_opencourseware%5D=1&pz%3Aauthentication%5Bconnect.indexdata.com%3A9000%2Fmit_opencourseware%5D=idtest%2Fidtest36&pz%3Acclmap%3Asu%5Bconnect.indexdata.com%3A9000%2Fmit_opencourseware%5D=u%3D21+s%3Dal&use_thumbnails%5Bconnect.indexdata.com%3A9000%2Fmit_opencourseware%5D=1&pz%3Arequestsyntax%5Bconnect.indexdata.com%3A9000%2Fmit_opencourseware%5D=xml&pz%3Aname%5Bconnect.indexdata.com%3A9000%2Fmit_opencourseware%5D=MIT+OpenCourseWare&pz%3Acclmap%3Aissn%5Bconnect.indexdata.com%3A9000%2Fmit_opencourseware%5D=u%3D8&pz%3Acclmap%3Ati%5Bconnect.indexdata.com%3A9000%2Fmit_opencourseware%5D=u%3D4+s%3Dal&pz%3Acclmap%3Aau%5Bconnect.indexdata.com%3A9000%2Fmit_opencourseware%5D=u%3D1003+s%3Dal&pz%3Axslt%5Bconnect.indexdata.com%3A9000%2Fmit_opencourseware%5D=cf.xsl&pz%3Acclmap%3Aterm%5Bconnect.indexdata.com%3A9000%2Fmit_opencourseware%5D=u%3D1016+t%3Dl%2Cr+s%3Dal+2%3D102&pz%3Acclmap%3Aisbn%5Bconnect.indexdata.com%3A9000%2Fmit_opencourseware%5D=u%3D7&pz%3Aqueryencoding%5Bconnect.indexdata.com%3A9000%2Fmit_opencourseware%5D=UTF-8 +http://localhost:9763/search.pz2?session=1&command=search&query=su%3D%22computer%22 +4 http://localhost:9763/search.pz2?session=1&command=show&block=1 +http://localhost:9763/search.pz2?session=1&command=bytarget +http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate +http://localhost:9763/search.pz2?session=1&command=settings&full_text_target%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=NO&pz%3Atermlist_term_count%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=10&use_url_proxy%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=0&pz%3Apiggyback%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=1&pz%3Apreferred%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=0&pz%3Ablock_timeout%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=2&pz%3Acclmap%3Asu%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=1%3Dsubject&pz%3Asru%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=solr&use_thumbnails%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=0&pz%3Aname%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=LOC+%28SOLR%29&pz%3Acclmap%3Aissn%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=u%3D8&pz%3Acclmap%3Ati%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=1%3Dtitle&pz%3Acclmap%3Aau%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=1%3Dauthor&pz%3Axslt%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=solr-pz2.xsl&pz%3Acclmap%3Aterm%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=1%3Dtext+s%3Dal&pz%3Acclmap%3Aisbn%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=1%3Disbn&pz%3Aqueryencoding%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=UTF-8 +http://localhost:9763/search.pz2?session=1&command=search&query=su%3D%22computer%22 +4 http://localhost:9763/search.pz2?session=1&command=show&block=1 +http://localhost:9763/search.pz2?session=1&command=bytarget +http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate +http://localhost:9763/search.pz2?session=1&command=settings&full_text_target%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=NO&use_url_proxy%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=0&pz%3Apiggyback%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=1&pz%3Ablock_timeout%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=1&pz%3Acclmap%3Asu%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=1%3Dsubject&pz%3Asru%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=solr&use_thumbnails%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=0&pz%3Acclmap%3Adate%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=1%3Ddate&pz%3Aname%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=Oaister+%28SOLR%29&pz%3Acclmap%3Aissn%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=u%3D8&pz%3Acclmap%3Ati%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=1%3Dtitle&pz%3Acclmap%3Aau%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=1%3Dauthor&pz%3Axslt%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=solr-pz2.xsl&pz%3Acclmap%3Aterm%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=1%3Dtext+s%3Dal&pz%3Acclmap%3Aisbn%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=1%3Disbn&pz%3Aqueryencoding%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=UTF-8 +http://localhost:9763/search.pz2?session=1&command=search&query=su%3D%22computer%22 +4 http://localhost:9763/search.pz2?session=1&command=show&block=1 +http://localhost:9763/search.pz2?session=1&command=bytarget +http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate diff --git a/test/test_preferred_1.res b/test/test_preferred_1.res new file mode 100644 index 0000000..81ff9ff --- /dev/null +++ b/test/test_preferred_1.res @@ -0,0 +1,2 @@ + +OK11 \ No newline at end of file diff --git a/test/test_preferred_10.res b/test/test_preferred_10.res new file mode 100644 index 0000000..33578ce --- /dev/null +++ b/test/test_preferred_10.res @@ -0,0 +1,16 @@ + +OK +connect.indexdata.com:9000/mit_opencourseware +MIT OpenCourseWare +0 +114 +0 +Client_Error + +ocs-loc.indexdata.com/solr/select +LOC (SOLR) +1627 +0 +100 +Client_Idle + \ No newline at end of file diff --git a/test/test_preferred_11.res b/test/test_preferred_11.res new file mode 100644 index 0000000..d61ebc8 --- /dev/null +++ b/test/test_preferred_11.res @@ -0,0 +1,48 @@ + +0 + + +ocs-loc.indexdata.com/solr/select +LOC (SOLR) +1627 +Client_Idle +0 + + + +Pritsker, A. Alan B8 +Inman, Don7 +Engel, C. William6 +Presley, Bruce6 +Balzer, R. M5 +D'Ignazio, Fred5 +Ball, Stuart R4 +Bitter, Gary G4 +Carlson, Edward H4 +Ellis, T. O4 + + +Digital computer simulation417 +Interactive computer systems231 +Apple computer145 +Embedded computer systems126 +BASIC (Computer program language)110 +Time-sharing computer systems102 +Debugging in computer science96 +Atari computer63 +Virtual computer systems63 +Computer graphics62 + + +1984143 +198383 +198577 +198660 +198258 +197950 +197147 +197247 +197547 +199047 + + diff --git a/test/test_preferred_12.res b/test/test_preferred_12.res new file mode 100644 index 0000000..42534e3 --- /dev/null +++ b/test/test_preferred_12.res @@ -0,0 +1,2 @@ + +OK \ No newline at end of file diff --git a/test/test_preferred_13.res b/test/test_preferred_13.res new file mode 100644 index 0000000..ab63fe6 --- /dev/null +++ b/test/test_preferred_13.res @@ -0,0 +1,2 @@ + +OK \ No newline at end of file diff --git a/test/test_preferred_14.res b/test/test_preferred_14.res new file mode 100644 index 0000000..0e679ee --- /dev/null +++ b/test/test_preferred_14.res @@ -0,0 +1,325 @@ + + +OK +0 +183 +14416 +0 +20 + + +920HB5649.PDF +92_HB5584 LRB9212840AGcs 1 AN ACT concerning health information. 2 Be it enacted by the People of the State of Illinois, 3 represented in the General Assembly: 4 Section 5. The Mental Health and Developmental 5 Disabilities Administrative Act is amended by changing 6 Section 31a as follows: 7 (20 ILCS 1705/31a) (from Ch. 91 1/2, par. 100-31a) 8 Sec. 31a. Computer records. If computer printouts of the 9 Department's records are offered as evidence, the Secretary 10 shall certify that those computer records are true and exact 11 representations of records properly entered into standard 12 electronic computing equipment, in the +920HB6000.PDF +92_HB6000 LRB9212745BBmbA 1 AN ACT concerning State agencies. 2 Be it enacted by the People of the State of Illinois, 3 represented in the General Assembly: 4 Section 1. Short title. This Act may be cited as the 5 State Agency Web Site Act. 6 Section 5. Definitions. As used in this Act: 7 "Cookie" means a set of computer data or instructions 8 that is placed on a consumer's computer by a Web site server 9 to collect or store information about the consumer. 10 "State agencies" has the meaning given to that term in 11 Section 1-7 of the + +920HB6044.PDF +92_HB6044 LRB9210167RCdvA 1 AN ACT concerning criminal law. 2 Be it enacted by the People of the State of Illinois, 3 represented in the General Assembly: 4 Section 5. The Criminal Code of 1961 is amended by 5 changing Section 11-20.2 as follows: 6 (720 ILCS 5/11-20.2) (from Ch. 38, par. 11-20.2) 7 Sec. 11-20.2. Image of child under 18 engaged in certain 8 acts; report to peace officer. 9 (a) Any commercial film and photographic print processor 10 who has knowledge of or observes, within the scope of his or 11 her professional capacity or employment, any film, 12 photograph + +920HB5584.PDF +92_HB5584 LRB9212840AGcs 1 AN ACT concerning health information. 2 Be it enacted by the People of the State of Illinois, 3 represented in the General Assembly: 4 Section 5. The Mental Health and Developmental 5 Disabilities Administrative Act is amended by changing 6 Section 31a as follows: 7 (20 ILCS 1705/31a) (from Ch. 91 1/2, par. 100-31a) 8 Sec. 31a. Computer records. If computer printouts of the 9 Department's records are offered as evidence, the Secretary 10 shall certify that those computer records are true and exact 11 representations of records properly entered into standard 12 electronic computing equipment, in the + +920HB5855.PDF +92_HB5855 LRB9210167RCdvA 1 AN ACT concerning criminal law. 2 Be it enacted by the People of the State of Illinois, 3 represented in the General Assembly: 4 Section 5. The Criminal Code of 1961 is amended by 5 changing Section 11-20.2 as follows: 6 (720 ILCS 5/11-20.2) (from Ch. 38, par. 11-20.2) 7 Sec. 11-20.2. Image of child under 18 engaged in certain 8 acts; report to peace officer. 9 (a) Any commercial film and photographic print processor 10 who has knowledge of or observes, within the scope of his or 11 her professional capacity or employment, any film, 12 photograph + +920HB5657.PDF +92_HB5657 LRB9214602LBtm 1 AN ACT concerning criminal law. 2 Be it enacted by the People of the State of Illinois, 3 represented in the General Assembly: 4 Section 5. The Criminal Code of 1961 is amended by 5 adding Section 16D-5.1 as follows: 6 (720 ILCS 5/16D-5.1 new) 7 Sec. 16D-5.1. Facilitating theft of on-line services. 8 (a) A person commits the offense of facilitating theft 9 of on-line services who knowingly: 10 (1) makes, obtains, possesses, or uses a computer 11 or other electronic device, or computer software with the 12 capability to gain unauthorized access to a commercial or + +920HB2140.PDF +92_HB2140 LRB9206551RCcd 1 AN ACT in relation to criminal law. 2 Be it enacted by the People of the State of Illinois, 3 represented in the General Assembly: 4 Section 5. The Criminal Code of 1961 is amended by 5 adding Section 17-25 as follows: 6 (720 ILCS 5/ 17-25 new) 7 Sec. 17-25. Written approval of telephone directory 8 advertisements. 9 (a) In this Section: 10 "Advertisement" means a listing of the name, address, 11 telephone number, e-mail address, or other information 12 concerning a business. 13 "Business" means a place where a trade or occupation is 14 conducted, services + +920HB0230.PDF +92_HB0230 LRB9202519RCdv 1 AN ACT concerning criminal law. 2 Be it enacted by the People of the State of Illinois, 3 represented in the General Assembly: 4 Section 5. The Criminal Code of 1961 is amended by 5 adding Section 16D-5.1 as follows: 6 (720 ILCS 5/16D-5.1 new) 7 Sec. 16D-5.1. Facilitating theft of on-line services. 8 (a) A person commits the offense of facilitating theft 9 of on-line services who knowingly: 10 (1) Makes, obtains, possesses, or uses a computer 11 or other electronic device, or computer software with the 12 capability to gain unauthorized access to a commercial or + +920HB0219.PDF +92_HB0219 LRB9202520RCcd 1 AN ACT in relation to the transmission of drug 2 information by the Internet. 3 Be it enacted by the People of the State of Illinois, 4 represented in the General Assembly: 5 Section 5. The Cannabis Control Act is amended by adding 6 Section 5.3 as follows: 7 (720 ILCS 550/5.3 new) 8 Sec. 5.3. Illegal transmission of cannabis information 9 by the Internet. 10 (a) A person commits the offense of illegal transmission 11 of cannabis information by the Internet when he or she 12 transmits information about cannabis by the Internet knowing 13 that the + +920HB5649.PDF +92_HB5649 LRB9214598RCsb 1 AN ACT in relation to the transmission of drug 2 information by the Internet. 3 Be it enacted by the People of the State of Illinois, 4 represented in the General Assembly: 5 Section 5. The Cannabis Control Act is amended by adding 6 Section 5.3 as follows: 7 (720 ILCS 550/5.3 new) 8 Sec. 5.3. Illegal transmission of cannabis information 9 by the Internet. 10 (a) A person commits the offense of illegal transmission 11 of cannabis information by the Internet when he or she 12 transmits information about cannabis by the Internet knowing 13 that the +9 +5807151 +title hb pdf + + + +920HB5649ENG.PDF +HB5657 Engrossed LRB9214602LBtm 1 AN ACT concerning criminal law. 2 Be it enacted by the People of the State of Illinois, 3 represented in the General Assembly: 4 Section 5. The Criminal Code of 1961 is amended by 5 adding Section 16D-5.1 as follows: 6 (720 ILCS 5/16D-5.1 new) 7 Sec. 16D-5.1. Facilitating theft of on-line services. 8 (a) A person commits the offense of facilitating theft 9 of on-line services who knowingly: 10 (1) makes, obtains, possesses, or uses a computer 11 or other electronic device, or computer software with the 12 capability to gain unauthorized access to a commercial +920HB5657ENG.PDF +HB5657 Engrossed LRB9214602LBtm 1 AN ACT concerning criminal law. 2 Be it enacted by the People of the State of Illinois, 3 represented in the General Assembly: 4 Section 5. The Criminal Code of 1961 is amended by 5 adding Section 16D-5.1 as follows: 6 (720 ILCS 5/16D-5.1 new) 7 Sec. 16D-5.1. Facilitating theft of on-line services. 8 (a) A person commits the offense of facilitating theft 9 of on-line services who knowingly: 10 (1) makes, obtains, possesses, or uses a computer 11 or other electronic device, or computer software with the 12 capability to gain unauthorized access to a commercial + +920HB2140ENG.PDF +HB2140 Engrossed LRB9206551RCcd 1 AN ACT in relation to criminal law. 2 Be it enacted by the People of the State of Illinois, 3 represented in the General Assembly: 4 Section 5. The Criminal Code of 1961 is amended by 5 adding Section 17-25 as follows: 6 (720 ILCS 5/ 17-25 new) 7 Sec. 17-25. Written approval of telephone directory 8 advertisements. 9 (a) In this Section: 10 "Advertisement" means a listing of the name, address, 11 telephone number, e-mail address, or other information 12 concerning a business. 13 "Business" means a place where a trade or occupation is 14 conducted + +920HB5649ENG.PDF +HB5649 Engrossed LRB9214598RCsb 1 AN ACT in relation to the transmission of drug 2 information by the Internet. 3 Be it enacted by the People of the State of Illinois, 4 represented in the General Assembly: 5 Section 5. The Cannabis Control Act is amended by adding 6 Section 5.3 as follows: 7 (720 ILCS 550/5.3 new) 8 Sec. 5.3. Illegal transmission of cannabis information 9 by the Internet. 10 (a) A person commits the offense of illegal transmission 11 of cannabis information by the Internet when he or she 12 transmits information about cannabis by the Internet to a 13 +3 +2102532 +title hb eng pdf + + + +Mixed-Initiative Information System for Computer-Aided Training and Decision Making +1973 +Grignetti,Mario C.; Warnock,Eleanor H +AND NEWMAN INC CAMBRIDGE MASSMixed-Initiative Information System for Computer-Aided Training and Decision Making.Final rept.,FGrignetti,Mario C. ;Warnock,Eleanor H. ;F19628-72-C-0163AF-2801280104ESDTR-73-290*Information systems, *Computer programming, On line systems, Facilities, Man machine systems, Words(Language), Manuals, NetworksComputer aided instruction, ARPA computer network, SCHOLAR system, ARPANET computer network, Man computer communication, NET SCHOLAR computer program, *Computer aided training, *Computer aided decision makingThe report describes, a SCHOLAR system, NET-SCHOLAR, designed to help people use the ARPA computer Network and the facilities available through it. NET-SCHOLAR is capable of answering questions dealing with descriptional, functional, and procedural information. Previous SCHOLAR systems dealt only with static information, within the context of geography. The report includes actual on-line protocols. (Author) +Mixed-Initiative Information System for Computer-Aided Training and Decision Making +1973 +Grignetti,Mario C.; Warnock,Eleanor H +AND NEWMAN INC CAMBRIDGE MASSMixed-Initiative Information System for Computer-Aided Training and Decision Making.Final rept.,FGrignetti,Mario C. ;Warnock,Eleanor H. ;F19628-72-C-0163AF-2801280104ESDTR-73-290*Information systems, *Computer programming, On line systems, Facilities, Man machine systems, Words(Language), Manuals, NetworksComputer aided instruction, ARPA computer network, SCHOLAR system, ARPANET computer network, Man computer communication, NET SCHOLAR computer program, *Computer aided training, *Computer aided decision makingThe report describes, a SCHOLAR system, NET-SCHOLAR, designed to help people use the ARPA computer Network and the facilities available through it. NET-SCHOLAR is capable of answering questions dealing with descriptional, functional, and procedural information. Previous SCHOLAR systems dealt only with static information, within the context of geography. The report includes actual on-line protocols. (Author) +1251496 +title mixed initiative information system for computer aided training and decision making author grignetti mario c warnock eleanor h + + + +History of computer graphics and animation +Carlson,Wayne (Author) +This website complements a course titled 'A Critical History of Computer Graphics and Animation', and it contains useful material such as a substantial 'CGI historical timeline' (dated 2004, and with a strong focus on the U.S.), and a lengthy illustrated essay for each week of the course. This website is authored by the course lecturer Wayne Carlson, who is also the head of the Department of Design at Ohio State University. In the 'Resources' section the website hosts a number of full-text articles and essays authored by others, including: Carl Machover's "Personal History of CGI" (1978, IEEE); "Computer Imagery: Imitation and Representation of Realities"; and "The Digital Computer as a Creative Medium", among others. The timeline, illustrated lectures, and archived papers will all be useful for those seeking a reliable overview of the early development and entertainment applications of CGI (Computer Generated Imagery) in the U.S. There is also an essay on the 'History of CGRG/ACCAD at The Ohio State Universi[...] +History of computer graphics and animation +Carlson,Wayne (Author) +This website complements a course titled 'A Critical History of Computer Graphics and Animation', and it contains useful material such as a substantial 'CGI historical timeline' (dated 2004, and with a strong focus on the U.S.), and a lengthy illustrated essay for each week of the course. This website is authored by the course lecturer Wayne Carlson, who is also the head of the Department of Design at Ohio State University. In the 'Resources' section the website hosts a number of full-text articles and essays authored by others, including: Carl Machover's "Personal History of CGI" (1978, IEEE); "Computer Imagery: Imitation and Representation of Realities"; and "The Digital Computer as a Creative Medium", among others. The timeline, illustrated lectures, and archived papers will all be useful for those seeking a reliable overview of the early development and entertainment applications of CGI (Computer Generated Imagery) in the U.S. There is also an essay on the 'History of CGRG/ACCAD at The Ohio State Universi[...] +1207317 +title history of computer graphics and animation author carlson wayne author + + + +Computer anxiety : assessment and treatment +1997 +McInerney, Valentina; University of Western Sydney; Faculty of Arts and Social Sciences +This thesis represents the results of studies designed to investigate computer anxiety among adult learners. The existence, nature and degree of computer anxiety were investigated with a sample of teacher trainees undertaking an introductory computer training course, and the impact of this course on the anxiety and cognitions of the students were studied. Another study focussed on the evaluation of the measure of computer anxiety used in this study with a view to the design of a new computer anxiety treatment. Results showed that computer anxiety is not necessarily dissipated by completing a computer course, and is correlated with gender, computer ownership and previous computer experience. A number of faculties with different student populations were studied, and computer anxiety was high within each. Interviews with computing course coordinators indicated a range of approaches to instructional design, beliefs about the extent and causes of computer anxiety, and ways of alleviating it. Two approaches derived[...]Doctor of Philosophy (PhD) +Computer anxiety : assessment and treatment +1997 +McInerney, Valentina; University of Western Sydney; Faculty of Arts and Social Sciences +This thesis represents the results of studies designed to investigate computer anxiety among adult learners. The existence, nature and degree of computer anxiety were investigated with a sample of teacher trainees undertaking an introductory computer training course, and the impact of this course on the anxiety and cognitions of the students were studied. Another study focussed on the evaluation of the measure of computer anxiety used in this study with a view to the design of a new computer anxiety treatment. Results showed that computer anxiety is not necessarily dissipated by completing a computer course, and is correlated with gender, computer ownership and previous computer experience. A number of faculties with different student populations were studied, and computer anxiety was high within each. Interviews with computing course coordinators indicated a range of approaches to instructional design, beliefs about the extent and causes of computer anxiety, and ways of alleviating it. Two approaches derived[...]Doctor of Philosophy (PhD) + +Computer anxiety : assessment and treatment +1997 +McInerney, Valentina; University of Western Sydney; Faculty of Arts and Social Sciences +This thesis represents the results of studies designed to investigate computer anxiety among adult learners. The existence, nature and degree of computer anxiety were investigated with a sample of teacher trainees undertaking an introductory computer training course, and the impact of this course on the anxiety and cognitions of the students were studied. Another study focussed on the evaluation of the measure of computer anxiety used in this study with a view to the design of a new computer anxiety treatment. Results showed that computer anxiety is not necessarily dissipated by completing a computer course, and is correlated with gender, computer ownership and previous computer experience. A number of faculties with different student populations were studied, and computer anxiety was high within each. Interviews with computing course coordinators indicated a range of approaches to instructional design, beliefs about the extent and causes of computer anxiety, and ways of alleviating it. Two approaches derived[...]Doctor of Philosophy (PhD) +2 +1182038 +title computer anxiety assessment and treatment author mcinerney valentina university of western sydney faculty of arts and social sciences + + + +Examination of Factors that Influence Computer Technology Use for Classroom Instruction by Teachers in Ohio Public High Schools +2009 +Latio, Gambu Wani +The focus of this research was to determine the extent to which teachers in Ohio public high schools use computers in classroom instruction, and investigation of barriers to teachers’ integration of computers into classroom instruction and learning. The analyses were based on a sample of 256 teachers randomly selected from 18 randomly selected high schools across the state. About 77% of the participants considered themselves well prepared, and 83% were proficient in computer technology integration. Although the majority of the participants had attained the necessary computer skills, teachers’ use of computers for classroom learning was low and sporadic at best, averaging 1.8 times a week, a level equivalence of novice computer using teacher. Both computer proficiency and availability of computers in Ohio public high school classrooms greatly affected teachers’ extent of computer technology use in classroom learning. Only 12% of the proficient teachers taught in classrooms with five or more computers, compared[...] +Examination of Factors that Influence Computer Technology Use for Classroom Instruction by Teachers in Ohio Public High Schools +2009 +Latio, Gambu Wani +The focus of this research was to determine the extent to which teachers in Ohio public high schools use computers in classroom instruction, and investigation of barriers to teachers’ integration of computers into classroom instruction and learning. The analyses were based on a sample of 256 teachers randomly selected from 18 randomly selected high schools across the state. About 77% of the participants considered themselves well prepared, and 83% were proficient in computer technology integration. Although the majority of the participants had attained the necessary computer skills, teachers’ use of computers for classroom learning was low and sporadic at best, averaging 1.8 times a week, a level equivalence of novice computer using teacher. Both computer proficiency and availability of computers in Ohio public high school classrooms greatly affected teachers’ extent of computer technology use in classroom learning. Only 12% of the proficient teachers taught in classrooms with five or more computers, compared[...] +1068607 +title examination of factors that influence computer technology use for classroom instruction by teachers in ohio public high schools author latio gambu wani + + + +6502 assembly-language programming for Apple, Commodore, and Atari computers +1985 +Lampton, Christopher +Instructs those who have already programmed in high-level languages in programming with the more powerful and versatile assembly or machine language +6502 assembly-language programming for Apple, Commodore, and Atari computers +1985 +Lampton, Christopher +Cover title: 6502 assembly language +Series statement from jacket +Includes index +Instructs those who have already programmed in high-level languages in programming with the more powerful and versatile assembly or machine language +1020000 +title assembly language programming for apple commodore and atari computers author lampton christopher + + + +920SB0756SAM001.PDF +92_SB0756sam001 LRB9201747NTsbam 1 AMENDMENT TO SENATE BILL 756 2 AMENDMENT NO. Amend Senate Bill 756 by replacing 3 everything after the enacting clause with the following: 4 "Section 5. The School Code is amended by adding 5 Sections 10-20.35 and 34-18.22 as follows: 6 (105 ILCS 5/10-20.35 new) 7 Sec. 10-20.35. Computer access by minors; explicit 8 sexual materials. 9 (a) In this Section: 10 "Explicit sexual materials" means that which is obscene, 11 child pornography, or material harmful to minors, as defined 12 under Sections 11-20, 11-20.1, and 11-21 of the Criminal Code 13 of 1961. 14 "Public access computer" +920SB0756SAM001.PDF +92_SB0756sam001 LRB9201747NTsbam 1 AMENDMENT TO SENATE BILL 756 2 AMENDMENT NO. Amend Senate Bill 756 by replacing 3 everything after the enacting clause with the following: 4 "Section 5. The School Code is amended by adding 5 Sections 10-20.35 and 34-18.22 as follows: 6 (105 ILCS 5/10-20.35 new) 7 Sec. 10-20.35. Computer access by minors; explicit 8 sexual materials. 9 (a) In this Section: 10 "Explicit sexual materials" means that which is obscene, 11 child pornography, or material harmful to minors, as defined 12 under Sections 11-20, 11-20.1, and 11-21 of the Criminal Code 13 of 1961. 14 "Public access computer" +1007792 +title sb sam pdf + + + +General Electric computer installation, Australian General Electric Computer Information Processing Centre, 103 York Street, Sydney +Hickson, Jack +Is part of Australian Photographic Agency (APA) Collection : Sydney people, places and events, 1953-1987Australian Photographic Agency - 12965 +General Electric computer installation, Australian General Electric Computer Information Processing Centre, 103 York Street, Sydney +Hickson, Jack +Is part of Australian Photographic Agency (APA) Collection : Sydney people, places and events, 1953-1987Australian Photographic Agency - 12964 + +General Electric computer installation, Australian General Electric Computer Information Processing Centre, 103 York Street, Sydney +Hickson, Jack +Is part of Australian Photographic Agency (APA) Collection : Sydney people, places and events, 1953-1987Australian Photographic Agency - 12965 +2 +975974 +title general electric computer installation australian general electric computer information processing centre york street sydney author hickson jack + + + +Idiot's Guide to OZ: A Manual for the Complete Beginner, Introducing EMACS, the Word Processing Program, and TEX, the Text Formatting Program +1984 +Gilson,W +Idiot's Guide to OZ: A Manual for the Complete Beginner, Introducing EMACS, the Word Processing Program, and TEX, the Text Formatting Program +1984 +Gilson,W +975000 +title idiot s guide to oz a manual for the complete beginner introducing emacs the word processing program and tex the text formatting program author gilson w + + + +Let's talk Apple Turtle +1984 +Nevile, Liddy +An introduction to the LOGO computer language using hands-on activities with the Apple computer and hands-off activities which relate to other skills areas in the curriculum +Let's talk Apple Turtle +1984 +Nevile, Liddy +Cataloging based on CIP information +An introduction to the LOGO computer language using hands-on activities with the Apple computer and hands-off activities which relate to other skills areas in the curriculum + +Let's talk Apple Turtle +1984 +Nevile, Liddy +Cataloging based on CIP information +An introduction to the LOGO computer language using hands-on activities with the Apple computer and hands-off activities which relate to other skills areas in the curriculum +2 +942857 +title let s talk apple turtle author nevile liddy + + + +Proceedings of the 1999 International Conference on Web-Based Modeling and Simulation +[held as part of] 1999 Western MultiConference, San Francisco, California, January 17-20, 1999, Cathedral Hill Hotel +1999-2000 +Network modeling -- Civil applications -- Education and training -- Military applications -- Parallel and distributed simulation -- DEVS-based approaches -- Modeling and simulation environments -- High-level architecture -- Visualization and animation -- Real-time applications +Proceedings of the International Conference on Web-based Modeling and Simulation +2000 +Both conferences held as parts of the 2000 Western MultiConference, San Diego, California, January 23-27, 2000, Catamaran Resort Hotel +"Sponsored by the Society for Computer Simulation International"--T.p + +Proceedings of the 1999 International Conference on Web-Based Modeling and Simulation +[held as part of] 1999 Western MultiConference, San Francisco, California, January 17-20, 1999, Cathedral Hill Hotel +1999 +Network modeling -- Civil applications -- Education and training -- Military applications -- Parallel and distributed simulation -- DEVS-based approaches -- Modeling and simulation environments -- High-level architecture -- Visualization and animation -- Real-time applications +2 +930000 +title proceedings of the international conference on web based modeling and simulation + + + +Computer art and animation +a user's guide to Atari logo +1984 +Thornburg, David D +Explains how to use a computer to create graphic designs and animated sequences +Computer art and animation +a user's guide to Atari logo +1984 +Thornburg, David D +Includes index +Explains how to use a computer to create graphic designs and animated sequences +923076 +title computer art and animation author thornburg david d + + + +Computer to analyse audience demographics for Channel 7 +Hickson, Jack +Is part of Australian Photographic Agency (APA) Collection : Sydney people, places and events, 1953-1987Australian Photographic Agency - 37382 +Computer to analyse audience demographics for Channel 7 +Hickson, Jack +Is part of Australian Photographic Agency (APA) Collection : Sydney people, places and events, 1953-1987Australian Photographic Agency - 37381 + +Computer to analyse audience demographics for Channel 7 +Hickson, Jack +Is part of Australian Photographic Agency (APA) Collection : Sydney people, places and events, 1953-1987Australian Photographic Agency - 37382 +2 +921428 +title computer to analyse audience demographics for channel author hickson jack + + + +The Computer-Aided Analytic Process Model. Operations Handbook for the APM (Analytic Process Model) Demonstration Package. Appendix +1986 +Shapiro,Ronald G +The Computer-Aided APM Demonstration Package provides the analyst with the opportunity to perform a thorough analysis of a system while the computer keeps track of the analysis and insures that the analyst examines the parts of the data base which are of interest. This is, however, a demonstration package which can only process small data bases. Because the package is implemented on an Apple II Plus, processing is relatively slow. An explanation of the APM, listings of the data sets derived using the APM and recommendations for further development of the APM appear in the companion volume--The Analytic Process Model for System Design and Measurement: A Computer-Aided Tool for Analyzing Training Systems and Other Human-Machine Systems. A separate companion volume--The Computer-Aided Analytic Process Model: Operations Handbook for the APM Demonstration Package is also available under separate cover. This volume, which is an Appendix to the Operations Handbook, contains the actual PASCAL computer code listings. [...]Appendix to AD-A166 180 +The Computer-Aided Analytic Process Model. Operations Handbook for the APM (Analytic Process Model) Demonstration Package. Appendix +1986 +Shapiro,Ronald G +The Computer-Aided APM Demonstration Package provides the analyst with the opportunity to perform a thorough analysis of a system while the computer keeps track of the analysis and insures that the analyst examines the parts of the data base which are of interest. This is, however, a demonstration package which can only process small data bases. Because the package is implemented on an Apple II Plus, processing is relatively slow. An explanation of the APM, listings of the data sets derived using the APM and recommendations for further development of the APM appear in the companion volume--The Analytic Process Model for System Design and Measurement: A Computer-Aided Tool for Analyzing Training Systems and Other Human-Machine Systems. A separate companion volume--The Computer-Aided Analytic Process Model: Operations Handbook for the APM Demonstration Package is also available under separate cover. This volume, which is an Appendix to the Operations Handbook, contains the actual PASCAL computer code listings. [...]Appendix to AD-A166 180 +919440 +title the computer aided analytic process model operations handbook for the apm analytic process model demonstration package appendix author shapiro ronald g + + + +Random alley adventure for the Atari computer +1984 +Orkin, Michael +Programs written in BASIC for an Atari computer provide experience in games of chance which demonstrate the law of averages +Random alley adventure for the Atari computer +1984 +Orkin, Michael +"A Reston Computer Group book." +Programs written in BASIC for an Atari computer provide experience in games of chance which demonstrate the law of averages +910714 +title random alley adventure for the atari computer author orkin michael + + + +I speak BASIC to my Atari +teacher's manual +1983 +Jones, Aubrey B +An introduction to the operation and applications of computers, with practice exercises +I speak BASIC to my Atari +1983 +Jones, Aubrey B +An introduction to the operation and applications of computers, with practice exercises + +I speak BASIC to my Atari +teacher's manual +1983 +Jones, Aubrey B +An introduction to the operation and applications of computers, with practice exercises +2 +900000 +title i speak basic to my atari author jones aubrey b + + + +School days for the Atari computer +1984 +Passantino, Claire Bailey +Presents twenty programs that include games, contests, riddles, songs, and other activities to use with BASIC on the Atari computer +School days for the Atari computer +1984 +Passantino, Claire Bailey +Presents twenty programs that include games, contests, riddles, songs, and other activities to use with BASIC on the Atari computer +865000 +title school days for the atari computer author passantino claire bailey + + + +The Apple LOGO manual +1985 +Instructions for doing computer graphics on an Apple computer in LOGO +The Apple LOGO manual +1985 +Includes index +Instructions for doing computer graphics on an Apple computer in LOGO +804545 +title the apple logo manual + + + +Computer Programs for the Analysis of Spacecraft Magnetism +1973 +Lackey,Milton H +The report describes five computer programs that are being used at the Naval Ordnance Laboratory for analyzing satellite magnetism. The programs contain numerical analysis algorithms for the spherical harmonic analysis of the magnetic field emanating from a satellite. The analysis is directed at determining the components of the magnetism which correspond to the dipole moment, quadrupole moment, etc. The first three programs were devised to analyze data from magnetic field measurements around the satellite. The fourth program was devised to generate simulated measurement data for a specified system of multipole magnets. The last program is a combination of the data generation and the data analysis programs. Sample problems are included in the discussion to illustrate the techniques of using the programs with a CDC 6400 Computer including the INTERCOM time-sharing system. A brief description is also included of data acquisition techniques and of principal subprograms. (Author) +Computer Programs for the Analysis of Spacecraft Magnetism +1973 +Lackey,Milton H +The report describes five computer programs that are being used at the Naval Ordnance Laboratory for analyzing satellite magnetism. The programs contain numerical analysis algorithms for the spherical harmonic analysis of the magnetic field emanating from a satellite. The analysis is directed at determining the components of the magnetism which correspond to the dipole moment, quadrupole moment, etc. The first three programs were devised to analyze data from magnetic field measurements around the satellite. The fourth program was devised to generate simulated measurement data for a specified system of multipole magnets. The last program is a combination of the data generation and the data analysis programs. Sample problems are included in the discussion to illustrate the techniques of using the programs with a CDC 6400 Computer including the INTERCOM time-sharing system. A brief description is also included of data acquisition techniques and of principal subprograms. (Author) +804109 +title computer programs for the analysis of spacecraft magnetism author lackey milton h + + diff --git a/test/test_preferred_15.res b/test/test_preferred_15.res new file mode 100644 index 0000000..284915f --- /dev/null +++ b/test/test_preferred_15.res @@ -0,0 +1,23 @@ + +OK +connect.indexdata.com:9000/mit_opencourseware +MIT OpenCourseWare +0 +114 +0 +Client_Error + +ocs-loc.indexdata.com/solr/select +LOC (SOLR) +1627 +0 +100 +Client_Idle + +ocs-oaister.indexdata.com/solr/select +Oaister (SOLR) +12789 +0 +100 +Client_Idle + \ No newline at end of file diff --git a/test/test_preferred_16.res b/test/test_preferred_16.res new file mode 100644 index 0000000..d95257c --- /dev/null +++ b/test/test_preferred_16.res @@ -0,0 +1,70 @@ + +0 + + +ocs-oaister.indexdata.com/solr/select +Oaister (SOLR) +12789 +Client_Idle +0 + + +ocs-loc.indexdata.com/solr/select +LOC (SOLR) +1627 +Client_Idle +0 + + + +Pritsker, A. Alan B8 +Inman, Don7 +Hickson, Jack6 +Engel, C. William6 +Presley, Bruce6 +Balzer, R. M5 +D'Ignazio, Fred5 +Ball, Stuart R4 +Bitter, Gary G4 +Carlson, Edward H4 +Ellis, T. O4 +Morgado Leonel; Bulas Cruz Maria Gabriel; Kahn Ken3 +Oosterbosch, Rudy2 +McInerney, Valentina; University of Western Sydney; Faculty of Arts and Social Sciences2 +Morgado Leonel; Cristóvão-Morgado Rosa; Bulas Cruz Maria Gabriel; Kahn Ken1 + + +Digital computer simulation417 +Interactive computer systems232 +Apple computer145 +Embedded computer systems126 +BASIC (Computer program language)110 +Time-sharing computer systems102 +Debugging in computer science96 +Atari computer63 +Virtual computer systems63 +Computer graphics62 +digital full-text42 +computer components. computer memories. computer peripherals25 +dissertations the and tu/e21 +computer science: dissertations. measurement and control: dissertations21 +computer science: report series. measurement and control: report series17 + + +1984144 +198383 +198577 +198662 +198258 +197950 +197147 +197247 +197547 +199047 +20089 +20058 +20038 +20097 +20077 + + diff --git a/test/test_preferred_2.res b/test/test_preferred_2.res new file mode 100644 index 0000000..42534e3 --- /dev/null +++ b/test/test_preferred_2.res @@ -0,0 +1,2 @@ + +OK \ No newline at end of file diff --git a/test/test_preferred_3.res b/test/test_preferred_3.res new file mode 100644 index 0000000..ab63fe6 --- /dev/null +++ b/test/test_preferred_3.res @@ -0,0 +1,2 @@ + +OK \ No newline at end of file diff --git a/test/test_preferred_4.res b/test/test_preferred_4.res new file mode 100644 index 0000000..d3b889f --- /dev/null +++ b/test/test_preferred_4.res @@ -0,0 +1,9 @@ + + +OK +0 +0 +0 +0 +0 + diff --git a/test/test_preferred_5.res b/test/test_preferred_5.res new file mode 100644 index 0000000..807516c --- /dev/null +++ b/test/test_preferred_5.res @@ -0,0 +1,9 @@ + +OK +connect.indexdata.com:9000/mit_opencourseware +MIT OpenCourseWare +0 +114 +0 +Client_Error + \ No newline at end of file diff --git a/test/test_preferred_6.res b/test/test_preferred_6.res new file mode 100644 index 0000000..7e31492 --- /dev/null +++ b/test/test_preferred_6.res @@ -0,0 +1,11 @@ + +0 + + + + + + + + + diff --git a/test/test_preferred_7.res b/test/test_preferred_7.res new file mode 100644 index 0000000..42534e3 --- /dev/null +++ b/test/test_preferred_7.res @@ -0,0 +1,2 @@ + +OK \ No newline at end of file diff --git a/test/test_preferred_8.res b/test/test_preferred_8.res new file mode 100644 index 0000000..ab63fe6 --- /dev/null +++ b/test/test_preferred_8.res @@ -0,0 +1,2 @@ + +OK \ No newline at end of file diff --git a/test/test_preferred_9.res b/test/test_preferred_9.res new file mode 100644 index 0000000..4af7669 --- /dev/null +++ b/test/test_preferred_9.res @@ -0,0 +1,309 @@ + + +OK +0 +96 +1627 +0 +20 + + +6502 assembly-language programming for Apple, Commodore, and Atari computers +1985 +Lampton, Christopher +Instructs those who have already programmed in high-level languages in programming with the more powerful and versatile assembly or machine language +6502 assembly-language programming for Apple, Commodore, and Atari computers +1985 +Lampton, Christopher +Cover title: 6502 assembly language +Series statement from jacket +Includes index +Instructs those who have already programmed in high-level languages in programming with the more powerful and versatile assembly or machine language +1020000 +title assembly language programming for apple commodore and atari computers author lampton christopher + + + +Let's talk Apple Turtle +1984 +Nevile, Liddy +An introduction to the LOGO computer language using hands-on activities with the Apple computer and hands-off activities which relate to other skills areas in the curriculum +Let's talk Apple Turtle +1984 +Nevile, Liddy +Cataloging based on CIP information +An introduction to the LOGO computer language using hands-on activities with the Apple computer and hands-off activities which relate to other skills areas in the curriculum + +Let's talk Apple Turtle +1984 +Nevile, Liddy +Cataloging based on CIP information +An introduction to the LOGO computer language using hands-on activities with the Apple computer and hands-off activities which relate to other skills areas in the curriculum +2 +942857 +title let s talk apple turtle author nevile liddy + + + +Proceedings of the 1999 International Conference on Web-Based Modeling and Simulation +[held as part of] 1999 Western MultiConference, San Francisco, California, January 17-20, 1999, Cathedral Hill Hotel +1999-2000 +Network modeling -- Civil applications -- Education and training -- Military applications -- Parallel and distributed simulation -- DEVS-based approaches -- Modeling and simulation environments -- High-level architecture -- Visualization and animation -- Real-time applications +Proceedings of the International Conference on Web-based Modeling and Simulation +2000 +Both conferences held as parts of the 2000 Western MultiConference, San Diego, California, January 23-27, 2000, Catamaran Resort Hotel +"Sponsored by the Society for Computer Simulation International"--T.p + +Proceedings of the 1999 International Conference on Web-Based Modeling and Simulation +[held as part of] 1999 Western MultiConference, San Francisco, California, January 17-20, 1999, Cathedral Hill Hotel +1999 +Network modeling -- Civil applications -- Education and training -- Military applications -- Parallel and distributed simulation -- DEVS-based approaches -- Modeling and simulation environments -- High-level architecture -- Visualization and animation -- Real-time applications +2 +930000 +title proceedings of the international conference on web based modeling and simulation + + + +Computer art and animation +a user's guide to Atari logo +1984 +Thornburg, David D +Explains how to use a computer to create graphic designs and animated sequences +Computer art and animation +a user's guide to Atari logo +1984 +Thornburg, David D +Includes index +Explains how to use a computer to create graphic designs and animated sequences +923076 +title computer art and animation author thornburg david d + + + +Random alley adventure for the Atari computer +1984 +Orkin, Michael +Programs written in BASIC for an Atari computer provide experience in games of chance which demonstrate the law of averages +Random alley adventure for the Atari computer +1984 +Orkin, Michael +"A Reston Computer Group book." +Programs written in BASIC for an Atari computer provide experience in games of chance which demonstrate the law of averages +910714 +title random alley adventure for the atari computer author orkin michael + + + +I speak BASIC to my Atari +teacher's manual +1983 +Jones, Aubrey B +An introduction to the operation and applications of computers, with practice exercises +I speak BASIC to my Atari +1983 +Jones, Aubrey B +An introduction to the operation and applications of computers, with practice exercises + +I speak BASIC to my Atari +teacher's manual +1983 +Jones, Aubrey B +An introduction to the operation and applications of computers, with practice exercises +2 +900000 +title i speak basic to my atari author jones aubrey b + + + +School days for the Atari computer +1984 +Passantino, Claire Bailey +Presents twenty programs that include games, contests, riddles, songs, and other activities to use with BASIC on the Atari computer +School days for the Atari computer +1984 +Passantino, Claire Bailey +Presents twenty programs that include games, contests, riddles, songs, and other activities to use with BASIC on the Atari computer +865000 +title school days for the atari computer author passantino claire bailey + + + +The Apple LOGO manual +1985 +Instructions for doing computer graphics on an Apple computer in LOGO +The Apple LOGO manual +1985 +Includes index +Instructions for doing computer graphics on an Apple computer in LOGO +804545 +title the apple logo manual + + + +Kid-powered Logo +1984 +Fiday, David +Explains how to use the computer language LOGO to write fundamental programs and create graphics on the Apple computer +Kid-powered Logo +1984 +Fiday, David +Includes index +Explains how to use the computer language LOGO to write fundamental programs and create graphics on the Apple computer +781578 +title kid powered logo author fiday david + + + +Basic fun with graphics, the Atari computer way +1983 +Zuanich, Margaret Ann +Instructions for graphics programming on an Atari computer using BASIC +Basic fun with graphics, the Atari computer way +1983 +Zuanich, Margaret Ann +Instructions for graphics programming on an Atari computer using BASIC +780000 +title basic fun with graphics the atari computer way author zuanich margaret ann + + + +Turtlesteps, an introduction to Apple Logo and Terrapin Logo +1984 +Sharp, Pamela +Introduces computer graphics and beginning programming in Apple Logo and Terrapin Logo +Turtlesteps, an introduction to Apple Logo and Terrapin Logo +1984 +Sharp, Pamela +Includes index +Introduces computer graphics and beginning programming in Apple Logo and Terrapin Logo +775000 +title turtlesteps an introduction to apple logo and terrapin logo author sharp pamela + + + +Graphics and animation on the Atari +800, 400, 1200XL, 800XL, and 600XL +1986 +Lampton, Christopher +Instructions for creating simple and advanced graphics using BASIC on the Atari computer. Includes suggestions for projects +Graphics and animation on the Atari +800, 400, 1200XL, 800XL, and 600XL +1986 +Lampton, Christopher +Includes index +Instructions for creating simple and advanced graphics using BASIC on the Atari computer. Includes suggestions for projects +767647 +title graphics and animation on the atari author lampton christopher + + + +Apple building blocks +featuring Denby, the robot +1985 +D'Ignazio, Fred +Explains how to write fundamental programs for the Apple computer and use it to play forty-six educational games +Apple building blocks +featuring Denby, the robot +1985 +D'Ignazio, Fred +On t.p. the circled symbol "R" is superscript following "Apple" in the title +Explains how to write fundamental programs for the Apple computer and use it to play forty-six educational games +765789 +title apple building blocks author d ignazio fred + + + +Apple in wonderland +1984 +D'Ignazio, Fred +System requirements for floppy disk: Apple II with Applesoft, II+, IIe, or IIc; DOS 3.3; 1 disk drive and controller card; color TV or monitor recommended +Apple in wonderland +1984 +D'Ignazio, Fred +System requirements for floppy disk: Apple II with Applesoft, II+, IIe, or IIc; DOS 3.3; 1 disk drive and controller card; color TV or monitor recommended +Issued in plastic case +Provides programs for twenty-two learning games written in BASIC for an Apple II computer. Includes a floppy disk +765789 +title apple in wonderland author d ignazio fred + + + +Atari in Wonderland +1983 +D'Ignazio, Fred +Contains twenty-two short, simple games to use with an Atari computer on such topics as colors, sounds, multiplication, state names, spelling, fractions, and Spanish and French languages +Atari in Wonderland +1983 +D'Ignazio, Fred +Contains twenty-two short, simple games to use with an Atari computer on such topics as colors, sounds, multiplication, state names, spelling, fractions, and Spanish and French languages +685714 +title atari in wonderland author d ignazio fred + + + +BASIC is child's play, Apple edition +1984 +Grauer, Robert T +Offers instructions for computer novices in programming with BASIC on an Apple personal computer +BASIC is child's play, Apple edition +1984 +Grauer, Robert T +Includes index +Offers instructions for computer novices in programming with BASIC on an Apple personal computer +642857 +title basic is child s play apple edition author grauer robert t + + + +The Atari playground +1983 +D'Ignazio, Fred +Twenty-three learning games, grouped by subject, for use on an Atari computer. There are separate instructional sections for parents/teachers and for children +The Atari playground +1983 +D'Ignazio, Fred +Twenty-three learning games, grouped by subject, for use on an Atari computer. There are separate instructional sections for parents/teachers and for children +612500 +title the atari playground author d ignazio fred + + + +Computer software +supplying it and finding it +1983 +Tagg, W +Computer software +supplying it and finding it +1983 +Tagg, W +600000 +title computer software author tagg w + + + +Kid-powered graphics +1984 +Fiday, David +Includes index +Kid-powered graphics +1984 +Fiday, David +Includes index +600000 +title kid powered graphics author fiday david + + + +BASIC on the ATARI computer for kids +1984 +Wyner, Keith +Instructions for the elementary school student in programming BASIC on an Atari computer +BASIC on the ATARI computer for kids +1984 +Wyner, Keith +Includes index +Instructions for the elementary school student in programming BASIC on an Atari computer +558791 +title basic on the atari computer for kids author wyner keith + + diff --git a/test/test_settings.urls b/test/test_settings.urls new file mode 100644 index 0000000..82e2822 --- /dev/null +++ b/test/test_settings.urls @@ -0,0 +1,8 @@ +http://localhost:9763/search.pz2?command=init +http://localhost:9763/search.pz2?command=init&clear=1 +http://localhost:9763/search.pz2?session=1&command=settings&category%5Bz3950.indexdata.com%2Fmarc%5D=1 +http://localhost:9763/search.pz2?session=1&command=search&query=water +http://localhost:9763/search.pz2?session=2&command=settings&pz:name%5Bz3950.indexdata.com%2Fmarc%5D=1&pz:cclmap:term%5Bz3950.indexdata.com%2Fmarc%5D=u%3D1016&pz:elements%5Bz3950.indexdata.com%2Fmarc%5D=F +http://localhost:9763/search.pz2?session=2&command=search&query=water +3 http://localhost:9763/search.pz2?session=1&command=bytarget&settings=1 +http://localhost:9763/search.pz2?session=2&command=bytarget&settings=1 diff --git a/test/test_settings_7.res b/test/test_settings_7.res index fd09de2..95efcdf 100644 --- a/test/test_settings_7.res +++ b/test/test_settings_7.res @@ -5,7 +5,7 @@ 0 114 0 -Client_Idle +Client_Error diff --git a/test/test_settings_urls b/test/test_settings_urls deleted file mode 100644 index bd7de1c..0000000 --- a/test/test_settings_urls +++ /dev/null @@ -1,8 +0,0 @@ -http://localhost:9763/search.pz2?command=init -http://localhost:9763/search.pz2?command=init&clear=1 -http://localhost:9763/search.pz2?session=1&command=settings&category%5Bz3950.indexdata.com%2Fmarc%5D=1 -http://localhost:9763/search.pz2?session=1&command=search&query=water -http://localhost:9763/search.pz2?session=2&command=settings&pz:name%5Bz3950.indexdata.com%2Fmarc%5D=1&pz:cclmap:term%5Bz3950.indexdata.com%2Fmarc%5D=u%3D1016&pz:elements%5Bz3950.indexdata.com%2Fmarc%5D=F -http://localhost:9763/search.pz2?session=2&command=search&query=water -2 http://localhost:9763/search.pz2?session=1&command=bytarget&settings=1 -http://localhost:9763/search.pz2?session=2&command=bytarget&settings=1 diff --git a/test/test_solr.cfg b/test/test_solr.cfg new file mode 100644 index 0000000..65287b7 --- /dev/null +++ b/test/test_solr.cfg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/test_solr.sh b/test/test_solr.sh new file mode 100755 index 0000000..4e96d20 --- /dev/null +++ b/test/test_solr.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +# srcdir might be set by make +srcdir=${srcdir:-"."} + +#TODO set up solr target. For now use donut +#F=../solr/client.sh +# +#rm -f solr.pid +#$F -l solr.log -p ztest.pid -D @:9999 +#sleep 1 +#if test ! -f ztest.pid; then +# echo "yaz-ztest could not be started" +# exit 0 +#fi + +${srcdir}/run_pazpar2.sh test_solr +E=$? + +#kill `cat ztest.pid` +#rm ztest.pid +exit $E + +# Local Variables: +# mode:shell-script +# sh-indentation: 2 +# sh-basic-offset: 4 +# End: diff --git a/test/test_solr.urls b/test/test_solr.urls new file mode 100644 index 0000000..a8f944e --- /dev/null +++ b/test/test_solr.urls @@ -0,0 +1,15 @@ +http://localhost:9763/search.pz2?command=init&clear=1 +http://localhost:9763/search.pz2?session=1&command=settings&pz:sru%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=solr&pz%3Aname%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=SOLR+Test&pz%3Acclmap%3Ati%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dtitle&pz%3Acclmap%3Asu%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dsubject&pz%3Acclmap%3Aau%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dauthor&pz%3Acclmap%3Aisbn%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Disbn&pz%3Acclmap%3Aterm%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dtitle&pz%3Axslt%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=solr-pz2.xsl&pz%3Aqueryencoding%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=UTF-8&pz%3Aapdulog%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1 +http://localhost:9763/search.pz2?session=1&command=search&query=su%3D%22computer%22 +4 http://localhost:9763/search.pz2?session=1&command=show&block=1 +http://localhost:9763/search.pz2?session=1&command=bytarget +http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Csubject%2Cauthor%2Cdate%2Cmedium +http://localhost:9763/search.pz2?command=init&clear=1 +http://localhost:9763/search.pz2?session=2&command=settings&pz:sru%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=solr&pz%3Aname%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=SOLR+Test&pz%3Acclmap%3Ati%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dtitle&pz%3Acclmap%3Asu%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dsubject&pz%3Acclmap%3Aau%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dauthor&pz%3Acclmap%3Aisbn%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Disbn&pz%3Acclmap%3Aterm%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dtitle&pz%3Axslt%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=solr-pz2.xsl&pz%3Aqueryencoding%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=UTF-8&pz%3Aapdulog%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1&pz:termlist_term_count%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=5&pz:preferred%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1 +http://localhost:9763/search.pz2?session=2&command=search&query=su%3D%22computer%22 +http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Csubject%2Cauthor%2Cdate%2Cmedium +http://localhost:9763/search.pz2?session=2&command=show&block=preferred +http://localhost:9763/search.pz2?session=2&command=search&query=su%3D%22xyzy%22 +http://localhost:9763/search.pz2?session=2&command=show&block=preferred +http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Csubject%2Cauthor%2Cdate%2Cmedium +http://localhost:9763/search.pz2?session=2&command=termlist&name=xtargets%2Csubject%2Cauthor%2Cdate%2Cmedium \ No newline at end of file diff --git a/test/test_solr_1.res b/test/test_solr_1.res new file mode 100644 index 0000000..81ff9ff --- /dev/null +++ b/test/test_solr_1.res @@ -0,0 +1,2 @@ + +OK11 \ No newline at end of file diff --git a/test/test_solr_10.res b/test/test_solr_10.res new file mode 100644 index 0000000..c39fff4 --- /dev/null +++ b/test/test_solr_10.res @@ -0,0 +1,63 @@ + +0 + + +donut:8983/solr/select +SOLR Test +1128 +Client_Idle +0 + + + +D'Ignazio, Fred4 +Lampton, Christopher2 +Grauer, Robert T2 +Carlson, Edward H2 +Nevile, Liddy2 +Jones, Aubrey B2 +Boren, Sharon2 +Fiday, David2 +Groner, Gabriel F2 +Orkin, Michael1 +Thornburg, David D1 +Pradels, Jean Louis1 +Dietzler, Andrew John1 +Haverty, J. P1 +Eland, Dave Ronald1 + + +Apple computer40 +BASIC (Computer program language)38 +Atari computer35 +Programming (Computers)30 +Digital computer simulation20 +Computer graphics18 +LOGO (Computer program language)14 +Computer games14 +Debugging in computer science8 +Time-sharing computer systems8 +Virtual computer systems8 +Interactive computer systems8 +Embedded computer systems7 +Computers6 +Engineering6 + + +198423 +200018 +19839 +20017 +19996 +19856 +19704 +19864 +19732 +19642 +19662 +19931 +20031 +20061 +19821 + + diff --git a/test/test_solr_11.res b/test/test_solr_11.res new file mode 100644 index 0000000..03c7c0d --- /dev/null +++ b/test/test_solr_11.res @@ -0,0 +1,309 @@ + + +OK +0 +96 +1128 +0 +20 + + +6502 assembly-language programming for Apple, Commodore, and Atari computers +1985 +Lampton, Christopher +Instructs those who have already programmed in high-level languages in programming with the more powerful and versatile assembly or machine language +6502 assembly-language programming for Apple, Commodore, and Atari computers +1985 +Lampton, Christopher +Cover title: 6502 assembly language +Series statement from jacket +Includes index +Instructs those who have already programmed in high-level languages in programming with the more powerful and versatile assembly or machine language +1020000 +title assembly language programming for apple commodore and atari computers author lampton christopher + + + +Let's talk Apple Turtle +1984 +Nevile, Liddy +An introduction to the LOGO computer language using hands-on activities with the Apple computer and hands-off activities which relate to other skills areas in the curriculum +Let's talk Apple Turtle +1984 +Nevile, Liddy +Cataloging based on CIP information +An introduction to the LOGO computer language using hands-on activities with the Apple computer and hands-off activities which relate to other skills areas in the curriculum + +Let's talk Apple Turtle +1984 +Nevile, Liddy +Cataloging based on CIP information +An introduction to the LOGO computer language using hands-on activities with the Apple computer and hands-off activities which relate to other skills areas in the curriculum +2 +942857 +title let s talk apple turtle author nevile liddy + + + +Proceedings of the 1999 International Conference on Web-Based Modeling and Simulation +[held as part of] 1999 Western MultiConference, San Francisco, California, January 17-20, 1999, Cathedral Hill Hotel +1999-2000 +Network modeling -- Civil applications -- Education and training -- Military applications -- Parallel and distributed simulation -- DEVS-based approaches -- Modeling and simulation environments -- High-level architecture -- Visualization and animation -- Real-time applications +Proceedings of the International Conference on Web-based Modeling and Simulation +2000 +Both conferences held as parts of the 2000 Western MultiConference, San Diego, California, January 23-27, 2000, Catamaran Resort Hotel +"Sponsored by the Society for Computer Simulation International"--T.p + +Proceedings of the 1999 International Conference on Web-Based Modeling and Simulation +[held as part of] 1999 Western MultiConference, San Francisco, California, January 17-20, 1999, Cathedral Hill Hotel +1999 +Network modeling -- Civil applications -- Education and training -- Military applications -- Parallel and distributed simulation -- DEVS-based approaches -- Modeling and simulation environments -- High-level architecture -- Visualization and animation -- Real-time applications +2 +930000 +title proceedings of the international conference on web based modeling and simulation + + + +Computer art and animation +a user's guide to Atari logo +1984 +Thornburg, David D +Explains how to use a computer to create graphic designs and animated sequences +Computer art and animation +a user's guide to Atari logo +1984 +Thornburg, David D +Includes index +Explains how to use a computer to create graphic designs and animated sequences +923076 +title computer art and animation author thornburg david d + + + +Random alley adventure for the Atari computer +1984 +Orkin, Michael +Programs written in BASIC for an Atari computer provide experience in games of chance which demonstrate the law of averages +Random alley adventure for the Atari computer +1984 +Orkin, Michael +"A Reston Computer Group book." +Programs written in BASIC for an Atari computer provide experience in games of chance which demonstrate the law of averages +910714 +title random alley adventure for the atari computer author orkin michael + + + +I speak BASIC to my Atari +teacher's manual +1983 +Jones, Aubrey B +An introduction to the operation and applications of computers, with practice exercises +I speak BASIC to my Atari +1983 +Jones, Aubrey B +An introduction to the operation and applications of computers, with practice exercises + +I speak BASIC to my Atari +teacher's manual +1983 +Jones, Aubrey B +An introduction to the operation and applications of computers, with practice exercises +2 +900000 +title i speak basic to my atari author jones aubrey b + + + +School days for the Atari computer +1984 +Passantino, Claire Bailey +Presents twenty programs that include games, contests, riddles, songs, and other activities to use with BASIC on the Atari computer +School days for the Atari computer +1984 +Passantino, Claire Bailey +Presents twenty programs that include games, contests, riddles, songs, and other activities to use with BASIC on the Atari computer +865000 +title school days for the atari computer author passantino claire bailey + + + +The Apple LOGO manual +1985 +Instructions for doing computer graphics on an Apple computer in LOGO +The Apple LOGO manual +1985 +Includes index +Instructions for doing computer graphics on an Apple computer in LOGO +804545 +title the apple logo manual + + + +Kid-powered Logo +1984 +Fiday, David +Explains how to use the computer language LOGO to write fundamental programs and create graphics on the Apple computer +Kid-powered Logo +1984 +Fiday, David +Includes index +Explains how to use the computer language LOGO to write fundamental programs and create graphics on the Apple computer +781578 +title kid powered logo author fiday david + + + +Basic fun with graphics, the Atari computer way +1983 +Zuanich, Margaret Ann +Instructions for graphics programming on an Atari computer using BASIC +Basic fun with graphics, the Atari computer way +1983 +Zuanich, Margaret Ann +Instructions for graphics programming on an Atari computer using BASIC +780000 +title basic fun with graphics the atari computer way author zuanich margaret ann + + + +Turtlesteps, an introduction to Apple Logo and Terrapin Logo +1984 +Sharp, Pamela +Introduces computer graphics and beginning programming in Apple Logo and Terrapin Logo +Turtlesteps, an introduction to Apple Logo and Terrapin Logo +1984 +Sharp, Pamela +Includes index +Introduces computer graphics and beginning programming in Apple Logo and Terrapin Logo +775000 +title turtlesteps an introduction to apple logo and terrapin logo author sharp pamela + + + +Graphics and animation on the Atari +800, 400, 1200XL, 800XL, and 600XL +1986 +Lampton, Christopher +Instructions for creating simple and advanced graphics using BASIC on the Atari computer. Includes suggestions for projects +Graphics and animation on the Atari +800, 400, 1200XL, 800XL, and 600XL +1986 +Lampton, Christopher +Includes index +Instructions for creating simple and advanced graphics using BASIC on the Atari computer. Includes suggestions for projects +767647 +title graphics and animation on the atari author lampton christopher + + + +Apple building blocks +featuring Denby, the robot +1985 +D'Ignazio, Fred +Explains how to write fundamental programs for the Apple computer and use it to play forty-six educational games +Apple building blocks +featuring Denby, the robot +1985 +D'Ignazio, Fred +On t.p. the circled symbol "R" is superscript following "Apple" in the title +Explains how to write fundamental programs for the Apple computer and use it to play forty-six educational games +765789 +title apple building blocks author d ignazio fred + + + +Apple in wonderland +1984 +D'Ignazio, Fred +System requirements for floppy disk: Apple II with Applesoft, II+, IIe, or IIc; DOS 3.3; 1 disk drive and controller card; color TV or monitor recommended +Apple in wonderland +1984 +D'Ignazio, Fred +System requirements for floppy disk: Apple II with Applesoft, II+, IIe, or IIc; DOS 3.3; 1 disk drive and controller card; color TV or monitor recommended +Issued in plastic case +Provides programs for twenty-two learning games written in BASIC for an Apple II computer. Includes a floppy disk +765789 +title apple in wonderland author d ignazio fred + + + +Atari in Wonderland +1983 +D'Ignazio, Fred +Contains twenty-two short, simple games to use with an Atari computer on such topics as colors, sounds, multiplication, state names, spelling, fractions, and Spanish and French languages +Atari in Wonderland +1983 +D'Ignazio, Fred +Contains twenty-two short, simple games to use with an Atari computer on such topics as colors, sounds, multiplication, state names, spelling, fractions, and Spanish and French languages +685714 +title atari in wonderland author d ignazio fred + + + +BASIC is child's play, Apple edition +1984 +Grauer, Robert T +Offers instructions for computer novices in programming with BASIC on an Apple personal computer +BASIC is child's play, Apple edition +1984 +Grauer, Robert T +Includes index +Offers instructions for computer novices in programming with BASIC on an Apple personal computer +642857 +title basic is child s play apple edition author grauer robert t + + + +The Atari playground +1983 +D'Ignazio, Fred +Twenty-three learning games, grouped by subject, for use on an Atari computer. There are separate instructional sections for parents/teachers and for children +The Atari playground +1983 +D'Ignazio, Fred +Twenty-three learning games, grouped by subject, for use on an Atari computer. There are separate instructional sections for parents/teachers and for children +612500 +title the atari playground author d ignazio fred + + + +Computer software +supplying it and finding it +1983 +Tagg, W +Computer software +supplying it and finding it +1983 +Tagg, W +600000 +title computer software author tagg w + + + +Kid-powered graphics +1984 +Fiday, David +Includes index +Kid-powered graphics +1984 +Fiday, David +Includes index +600000 +title kid powered graphics author fiday david + + + +BASIC on the ATARI computer for kids +1984 +Wyner, Keith +Instructions for the elementary school student in programming BASIC on an Atari computer +BASIC on the ATARI computer for kids +1984 +Wyner, Keith +Includes index +Instructions for the elementary school student in programming BASIC on an Atari computer +558791 +title basic on the atari computer for kids author wyner keith + + diff --git a/test/test_solr_12.res b/test/test_solr_12.res new file mode 100644 index 0000000..ab63fe6 --- /dev/null +++ b/test/test_solr_12.res @@ -0,0 +1,2 @@ + +OK \ No newline at end of file diff --git a/test/test_solr_13.res b/test/test_solr_13.res new file mode 100644 index 0000000..d3b889f --- /dev/null +++ b/test/test_solr_13.res @@ -0,0 +1,9 @@ + + +OK +0 +0 +0 +0 +0 + diff --git a/test/test_solr_14.res b/test/test_solr_14.res new file mode 100644 index 0000000..7e31492 --- /dev/null +++ b/test/test_solr_14.res @@ -0,0 +1,11 @@ + +0 + + + + + + + + + diff --git a/test/test_solr_15.res b/test/test_solr_15.res new file mode 100644 index 0000000..b98d670 --- /dev/null +++ b/test/test_solr_15.res @@ -0,0 +1,13 @@ + +0 + + + + + + + + + + + diff --git a/test/test_solr_2.res b/test/test_solr_2.res new file mode 100644 index 0000000..42534e3 --- /dev/null +++ b/test/test_solr_2.res @@ -0,0 +1,2 @@ + +OK \ No newline at end of file diff --git a/test/test_solr_3.res b/test/test_solr_3.res new file mode 100644 index 0000000..ab63fe6 --- /dev/null +++ b/test/test_solr_3.res @@ -0,0 +1,2 @@ + +OK \ No newline at end of file diff --git a/test/test_solr_4.res b/test/test_solr_4.res new file mode 100644 index 0000000..03c7c0d --- /dev/null +++ b/test/test_solr_4.res @@ -0,0 +1,309 @@ + + +OK +0 +96 +1128 +0 +20 + + +6502 assembly-language programming for Apple, Commodore, and Atari computers +1985 +Lampton, Christopher +Instructs those who have already programmed in high-level languages in programming with the more powerful and versatile assembly or machine language +6502 assembly-language programming for Apple, Commodore, and Atari computers +1985 +Lampton, Christopher +Cover title: 6502 assembly language +Series statement from jacket +Includes index +Instructs those who have already programmed in high-level languages in programming with the more powerful and versatile assembly or machine language +1020000 +title assembly language programming for apple commodore and atari computers author lampton christopher + + + +Let's talk Apple Turtle +1984 +Nevile, Liddy +An introduction to the LOGO computer language using hands-on activities with the Apple computer and hands-off activities which relate to other skills areas in the curriculum +Let's talk Apple Turtle +1984 +Nevile, Liddy +Cataloging based on CIP information +An introduction to the LOGO computer language using hands-on activities with the Apple computer and hands-off activities which relate to other skills areas in the curriculum + +Let's talk Apple Turtle +1984 +Nevile, Liddy +Cataloging based on CIP information +An introduction to the LOGO computer language using hands-on activities with the Apple computer and hands-off activities which relate to other skills areas in the curriculum +2 +942857 +title let s talk apple turtle author nevile liddy + + + +Proceedings of the 1999 International Conference on Web-Based Modeling and Simulation +[held as part of] 1999 Western MultiConference, San Francisco, California, January 17-20, 1999, Cathedral Hill Hotel +1999-2000 +Network modeling -- Civil applications -- Education and training -- Military applications -- Parallel and distributed simulation -- DEVS-based approaches -- Modeling and simulation environments -- High-level architecture -- Visualization and animation -- Real-time applications +Proceedings of the International Conference on Web-based Modeling and Simulation +2000 +Both conferences held as parts of the 2000 Western MultiConference, San Diego, California, January 23-27, 2000, Catamaran Resort Hotel +"Sponsored by the Society for Computer Simulation International"--T.p + +Proceedings of the 1999 International Conference on Web-Based Modeling and Simulation +[held as part of] 1999 Western MultiConference, San Francisco, California, January 17-20, 1999, Cathedral Hill Hotel +1999 +Network modeling -- Civil applications -- Education and training -- Military applications -- Parallel and distributed simulation -- DEVS-based approaches -- Modeling and simulation environments -- High-level architecture -- Visualization and animation -- Real-time applications +2 +930000 +title proceedings of the international conference on web based modeling and simulation + + + +Computer art and animation +a user's guide to Atari logo +1984 +Thornburg, David D +Explains how to use a computer to create graphic designs and animated sequences +Computer art and animation +a user's guide to Atari logo +1984 +Thornburg, David D +Includes index +Explains how to use a computer to create graphic designs and animated sequences +923076 +title computer art and animation author thornburg david d + + + +Random alley adventure for the Atari computer +1984 +Orkin, Michael +Programs written in BASIC for an Atari computer provide experience in games of chance which demonstrate the law of averages +Random alley adventure for the Atari computer +1984 +Orkin, Michael +"A Reston Computer Group book." +Programs written in BASIC for an Atari computer provide experience in games of chance which demonstrate the law of averages +910714 +title random alley adventure for the atari computer author orkin michael + + + +I speak BASIC to my Atari +teacher's manual +1983 +Jones, Aubrey B +An introduction to the operation and applications of computers, with practice exercises +I speak BASIC to my Atari +1983 +Jones, Aubrey B +An introduction to the operation and applications of computers, with practice exercises + +I speak BASIC to my Atari +teacher's manual +1983 +Jones, Aubrey B +An introduction to the operation and applications of computers, with practice exercises +2 +900000 +title i speak basic to my atari author jones aubrey b + + + +School days for the Atari computer +1984 +Passantino, Claire Bailey +Presents twenty programs that include games, contests, riddles, songs, and other activities to use with BASIC on the Atari computer +School days for the Atari computer +1984 +Passantino, Claire Bailey +Presents twenty programs that include games, contests, riddles, songs, and other activities to use with BASIC on the Atari computer +865000 +title school days for the atari computer author passantino claire bailey + + + +The Apple LOGO manual +1985 +Instructions for doing computer graphics on an Apple computer in LOGO +The Apple LOGO manual +1985 +Includes index +Instructions for doing computer graphics on an Apple computer in LOGO +804545 +title the apple logo manual + + + +Kid-powered Logo +1984 +Fiday, David +Explains how to use the computer language LOGO to write fundamental programs and create graphics on the Apple computer +Kid-powered Logo +1984 +Fiday, David +Includes index +Explains how to use the computer language LOGO to write fundamental programs and create graphics on the Apple computer +781578 +title kid powered logo author fiday david + + + +Basic fun with graphics, the Atari computer way +1983 +Zuanich, Margaret Ann +Instructions for graphics programming on an Atari computer using BASIC +Basic fun with graphics, the Atari computer way +1983 +Zuanich, Margaret Ann +Instructions for graphics programming on an Atari computer using BASIC +780000 +title basic fun with graphics the atari computer way author zuanich margaret ann + + + +Turtlesteps, an introduction to Apple Logo and Terrapin Logo +1984 +Sharp, Pamela +Introduces computer graphics and beginning programming in Apple Logo and Terrapin Logo +Turtlesteps, an introduction to Apple Logo and Terrapin Logo +1984 +Sharp, Pamela +Includes index +Introduces computer graphics and beginning programming in Apple Logo and Terrapin Logo +775000 +title turtlesteps an introduction to apple logo and terrapin logo author sharp pamela + + + +Graphics and animation on the Atari +800, 400, 1200XL, 800XL, and 600XL +1986 +Lampton, Christopher +Instructions for creating simple and advanced graphics using BASIC on the Atari computer. Includes suggestions for projects +Graphics and animation on the Atari +800, 400, 1200XL, 800XL, and 600XL +1986 +Lampton, Christopher +Includes index +Instructions for creating simple and advanced graphics using BASIC on the Atari computer. Includes suggestions for projects +767647 +title graphics and animation on the atari author lampton christopher + + + +Apple building blocks +featuring Denby, the robot +1985 +D'Ignazio, Fred +Explains how to write fundamental programs for the Apple computer and use it to play forty-six educational games +Apple building blocks +featuring Denby, the robot +1985 +D'Ignazio, Fred +On t.p. the circled symbol "R" is superscript following "Apple" in the title +Explains how to write fundamental programs for the Apple computer and use it to play forty-six educational games +765789 +title apple building blocks author d ignazio fred + + + +Apple in wonderland +1984 +D'Ignazio, Fred +System requirements for floppy disk: Apple II with Applesoft, II+, IIe, or IIc; DOS 3.3; 1 disk drive and controller card; color TV or monitor recommended +Apple in wonderland +1984 +D'Ignazio, Fred +System requirements for floppy disk: Apple II with Applesoft, II+, IIe, or IIc; DOS 3.3; 1 disk drive and controller card; color TV or monitor recommended +Issued in plastic case +Provides programs for twenty-two learning games written in BASIC for an Apple II computer. Includes a floppy disk +765789 +title apple in wonderland author d ignazio fred + + + +Atari in Wonderland +1983 +D'Ignazio, Fred +Contains twenty-two short, simple games to use with an Atari computer on such topics as colors, sounds, multiplication, state names, spelling, fractions, and Spanish and French languages +Atari in Wonderland +1983 +D'Ignazio, Fred +Contains twenty-two short, simple games to use with an Atari computer on such topics as colors, sounds, multiplication, state names, spelling, fractions, and Spanish and French languages +685714 +title atari in wonderland author d ignazio fred + + + +BASIC is child's play, Apple edition +1984 +Grauer, Robert T +Offers instructions for computer novices in programming with BASIC on an Apple personal computer +BASIC is child's play, Apple edition +1984 +Grauer, Robert T +Includes index +Offers instructions for computer novices in programming with BASIC on an Apple personal computer +642857 +title basic is child s play apple edition author grauer robert t + + + +The Atari playground +1983 +D'Ignazio, Fred +Twenty-three learning games, grouped by subject, for use on an Atari computer. There are separate instructional sections for parents/teachers and for children +The Atari playground +1983 +D'Ignazio, Fred +Twenty-three learning games, grouped by subject, for use on an Atari computer. There are separate instructional sections for parents/teachers and for children +612500 +title the atari playground author d ignazio fred + + + +Computer software +supplying it and finding it +1983 +Tagg, W +Computer software +supplying it and finding it +1983 +Tagg, W +600000 +title computer software author tagg w + + + +Kid-powered graphics +1984 +Fiday, David +Includes index +Kid-powered graphics +1984 +Fiday, David +Includes index +600000 +title kid powered graphics author fiday david + + + +BASIC on the ATARI computer for kids +1984 +Wyner, Keith +Instructions for the elementary school student in programming BASIC on an Atari computer +BASIC on the ATARI computer for kids +1984 +Wyner, Keith +Includes index +Instructions for the elementary school student in programming BASIC on an Atari computer +558791 +title basic on the atari computer for kids author wyner keith + + diff --git a/test/test_solr_5.res b/test/test_solr_5.res new file mode 100644 index 0000000..099b86e --- /dev/null +++ b/test/test_solr_5.res @@ -0,0 +1,9 @@ + +OK +donut:8983/solr/select +SOLR Test +1128 +0 +100 +Client_Idle + \ No newline at end of file diff --git a/test/test_solr_6.res b/test/test_solr_6.res new file mode 100644 index 0000000..801e7cf --- /dev/null +++ b/test/test_solr_6.res @@ -0,0 +1,63 @@ + +0 + + +donut:8983/solr/select +SOLR Test +1128 +Client_Idle +0 + + + +D'Ignazio, Fred4 +Lampton, Christopher2 +Grauer, Robert T2 +Carlson, Edward H2 +Groner, Gabriel F2 +Jones, Aubrey B2 +Boren, Sharon2 +Fiday, David2 +Nevile, Liddy2 +Ledin, Jim1 +Tagg, W1 +Zaks, Rodnay1 +Wyner, Keith1 +Zuanich, Margaret Ann1 +Salz, Fredrick R1 + + +Apple computer40 +BASIC (Computer program language)38 +Atari computer35 +Programming (Computers)30 +Digital computer simulation20 +Computer graphics18 +LOGO (Computer program language)14 +Computer games14 +Debugging in computer science8 +Time-sharing computer systems8 +Virtual computer systems8 +Interactive computer systems8 +Embedded computer systems7 +Computers6 +Engineering6 + + +198423 +200018 +19839 +20017 +19996 +19856 +19864 +19704 +19662 +19642 +19732 +19711 +19871 +19601 +19591 + + diff --git a/test/test_solr_7.res b/test/test_solr_7.res new file mode 100644 index 0000000..2b3989e --- /dev/null +++ b/test/test_solr_7.res @@ -0,0 +1,2 @@ + +OK21 \ No newline at end of file diff --git a/test/test_solr_8.res b/test/test_solr_8.res new file mode 100644 index 0000000..42534e3 --- /dev/null +++ b/test/test_solr_8.res @@ -0,0 +1,2 @@ + +OK \ No newline at end of file diff --git a/test/test_solr_9.res b/test/test_solr_9.res new file mode 100644 index 0000000..ab63fe6 --- /dev/null +++ b/test/test_solr_9.res @@ -0,0 +1,2 @@ + +OK \ No newline at end of file diff --git a/test/test_sru-proxy.cfg b/test/test_sru-proxy.cfg new file mode 100644 index 0000000..976696c --- /dev/null +++ b/test/test_sru-proxy.cfg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/test_sru-proxy.sh b/test/test_sru-proxy.sh new file mode 100644 index 0000000..2ceb005 --- /dev/null +++ b/test/test_sru-proxy.sh @@ -0,0 +1,20 @@ +#!/bin/sh + +# srcdir might be set by make +srcdir=${srcdir:-"."} + +#TODO set up solr target. For now use donut +#F=../solr/client.sh + +${srcdir}/run_pazpar2.sh test_sru-proxy +E=$? + +#kill `cat ztest.pid` +#rm ztest.pid +exit $E + +# Local Variables: +# mode:shell-script +# sh-indentation: 2 +# sh-basic-offset: 4 +# End: diff --git a/test/test_sru-proxy.urls b/test/test_sru-proxy.urls new file mode 100644 index 0000000..0c9d239 --- /dev/null +++ b/test/test_sru-proxy.urls @@ -0,0 +1,4 @@ +http://localhost:9763/search.pz2?command=init&clear=1&service=sru-proxy +http://localhost:9763/search.pz2?session=1&command=settings&pz:sru%5Bkb.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=get&pz%3Aname%5Bkb.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=sru-proxy&pz%3Axslt%5Bkb.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=dads-pz2.xsl&pz%3Aqueryencoding%5Bkb.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=UTF-8&pz%3Aapdulog%5Bkb.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=1&pz%3Asru_version%5Bkb.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=1.1&pz%3Aextra_args%5Bkb.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=%26x-facet_def%3Ddtic_test%26x-noxsl%3D1&pz:query_syntax%5Bkb.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=pqf +http://localhost:9763/search.pz2?session=1&command=search&query=water +4 http://localhost:9763/search.pz2?session=1&command=show&block=1 diff --git a/test/test_sru-proxy_1.res b/test/test_sru-proxy_1.res new file mode 100644 index 0000000..81ff9ff --- /dev/null +++ b/test/test_sru-proxy_1.res @@ -0,0 +1,2 @@ + +OK11 \ No newline at end of file diff --git a/test/test_sru-proxy_2.res b/test/test_sru-proxy_2.res new file mode 100644 index 0000000..42534e3 --- /dev/null +++ b/test/test_sru-proxy_2.res @@ -0,0 +1,2 @@ + +OK \ No newline at end of file diff --git a/test/test_sru-proxy_3.res b/test/test_sru-proxy_3.res new file mode 100644 index 0000000..ab63fe6 --- /dev/null +++ b/test/test_sru-proxy_3.res @@ -0,0 +1,2 @@ + +OK \ No newline at end of file diff --git a/test/test_sru-proxy_4.res b/test/test_sru-proxy_4.res new file mode 100644 index 0000000..2869f2a --- /dev/null +++ b/test/test_sru-proxy_4.res @@ -0,0 +1,201 @@ + + +OK +0 +100 +2069000 +0 +20 + + +Any old iron? +The article examines research on water pollution control. The use of ferrates, which are iron-oxygen compounds which include non-transition metals, to remove pollutants from water is discussed. The high reactivity of ferrates make them both oxidizing agents and coagulants of other chemicals in water. The company Ferrate Treatment Technologies, which creates ferrates at the site of pollution control projects since they are highly unstable, is discussed +Any old iron? +The article examines research on water pollution control. The use of ferrates, which are iron-oxygen compounds which include non-transition metals, to remove pollutants from water is discussed. The high reactivity of ferrates make them both oxidizing agents and coagulants of other chemicals in water. The company Ferrate Treatment Technologies, which creates ferrates at the site of pollution control projects since they are highly unstable, is discussed +313235 +title any old iron + + + +EPA Outlines Aggressive Plan To Restore Chesapeake Bay +Hunter, Pam +The article deals with the Chesapeake Bay Total Maximum Daily Load (TMDL) launched by the U.S. Environmental Protection Agency (EPA) on December 29, 2010. TDML implements a legal framework to make sure that six states and the District of Columbia comply with the requirement set to restore the Chesapeake Bay between Maryland and Virginia by 2025. Furthermore, TDML requires a 25 percent nitrogen reduction, 24 percent phosphorus reduction and 20 percent sediment reduction. EPA intends to oversee every one of the jurisdictions' programs +EPA Outlines Aggressive Plan To Restore Chesapeake Bay +Hunter, Pam +The article deals with the Chesapeake Bay Total Maximum Daily Load (TMDL) launched by the U.S. Environmental Protection Agency (EPA) on December 29, 2010. TDML implements a legal framework to make sure that six states and the District of Columbia comply with the requirement set to restore the Chesapeake Bay between Maryland and Virginia by 2025. Furthermore, TDML requires a 25 percent nitrogen reduction, 24 percent phosphorus reduction and 20 percent sediment reduction. EPA intends to oversee every one of the jurisdictions' programs +300000 +title epa outlines aggressive plan to restore chesapeake bay author hunter pam + + + +Biscuit factory in hot water +The article offers information on the new Spirax Sarco EasiHeat engineered system from Fox's factory that uses a steam-to-hot water plate heat exchanger to provide domestic hot water on demand +Biscuit factory in hot water +The article offers information on the new Spirax Sarco EasiHeat engineered system from Fox's factory that uses a steam-to-hot water plate heat exchanger to provide domestic hot water on demand +288181 +title biscuit factory in hot water + + + +Bottled water recycling rates on the rise +The article focuses on the increase of recycling rates for bottled water in the U.S +Bottled water recycling rates on the rise +The article focuses on the increase of recycling rates for bottled water in the U.S +204464 +title bottled water recycling rates on the rise + + + +Water-cooler monitor +The article offers information on the segments of the television program "The Talk." +Water-cooler monitor +The article offers information on the segments of the television program "The Talk." +200000 +title water cooler monitor + + + +Every drop counts +The article discusses the importance of water as a significant component for the paper making industry. It says that the focus of the industry is on the comprehensive and intelligent water management solutions because of the rising cost of energy and strict legislation on the environment. It says that the water utilized by paper mills undergo numerous individual process and steps in which water quantity matters +Every drop counts +The article discusses the importance of water as a significant component for the paper making industry. It says that the focus of the industry is on the comprehensive and intelligent water management solutions because of the rising cost of energy and strict legislation on the environment. It says that the water utilized by paper mills undergo numerous individual process and steps in which water quantity matters +168181 +title every drop counts + + + +Graywater Recycling Turns Runoff Into Green Solution +Penny, Janelle +The article discusses how the emerging trend of graywater recycling could help cut costs and conserve water. According to Jason Rector, owner of AquaPro, reusing graywater could significantly reduce water consumption for buildings since estimates indicate that 40% to 60% of water in buildings is flushwed down the toilet. Simple graywater systems involve the collection of water from one bathroom sink, filtering it and redirecting it into the tank of another toilet +Graywater Recycling Turns Runoff Into Green Solution +Penny, Janelle +The article discusses how the emerging trend of graywater recycling could help cut costs and conserve water. According to Jason Rector, owner of AquaPro, reusing graywater could significantly reduce water consumption for buildings since estimates indicate that 40% to 60% of water in buildings is flushwed down the toilet. Simple graywater systems involve the collection of water from one bathroom sink, filtering it and redirecting it into the tank of another toilet +167142 +title graywater recycling turns runoff into green solution author penny janelle + + + +Lead in Fixtures May Go Undetected +The article focuses on a study, which showed that high levels of lead can leach from some brass devices in plumbing systems into drinking water +Lead in Fixtures May Go Undetected +The article focuses on a study, which showed that high levels of lead can leach from some brass devices in plumbing systems into drinking water +162000 +title lead in fixtures may go undetected + + + +The drying of the West +The article discusses diminishing water supplies in the U.S. Southwest. Drought conditions have reduced Lake Mead to just 40% capacity, and scientists believe global warming will reduce flows on the Colorado River, which feeds Lake Mead, by as much as 30%. Increasing demands on the Colorado by farmers, ranchers, and cities are also taxing Lake Mead +The drying of the West +The article discusses diminishing water supplies in the U.S. Southwest. Drought conditions have reduced Lake Mead to just 40% capacity, and scientists believe global warming will reduce flows on the Colorado River, which feeds Lake Mead, by as much as 30%. Increasing demands on the Colorado by farmers, ranchers, and cities are also taxing Lake Mead +155454 +title the drying of the west + + + +A negotiated solution for the Jordan Basin +Chóliz, J. S +The use of water in the Jordan Basin has been a key factor in the conflict between Israel and the Palestinians, and among Israel and its neighbours. In this paper, we explore possible ways of sharing water through a negotiation game with two players-Arabs and Israelis. We estimate a set of optimum Pareto allocations, as well as identifying a range of negotiated solutions. Our results suggest that viable solutions would improve incomes by some 20% compared to the current status quo. These solutions are close to the long-standing proposal contained in the Johnston Plan. Meanwhile, theoretical fairness criteria, which are more favourable to the Arabs than the Johnston Plan, maybe are not actually better in technical terms and could in any case only be achieved if the Arabs' negotiating position were much stronger than the Israelis' +A negotiated solution for the Jordan Basin +Atwi, M +Chóliz, J. S +The use of water in the Jordan Basin has been a key factor in the conflict between Israel and the Palestinians, and among Israel and its neighbours. In this paper, we explore possible ways of sharing water through a negotiation game with two players-Arabs and Israelis. We estimate a set of optimum Pareto allocations, as well as identifying a range of negotiated solutions. Our results suggest that viable solutions would improve incomes by some 20% compared to the current status quo. These solutions are close to the long-standing proposal contained in the Johnston Plan. Meanwhile, theoretical fairness criteria, which are more favourable to the Arabs than the Johnston Plan, maybe are not actually better in technical terms and could in any case only be achieved if the Arabs' negotiating position were much stronger than the Israelis' +154379 +title a negotiated solution for the jordan basin author atwi m author ch liz j s + + + +Deep-water discoveries total 93 +Deep-water discoveries total 93 +150000 +title deep water discoveries total + + + +Pemex tests the water +Pemex tests the water +150000 +title pemex tests the water + + + +Amoebas in drinking water worldwide +J. N. C +The article focuses on a study which concluded that some amoeba species called free-living amoebas (FLAs) survive water treatment and quickly multiply in drinking water distribution and storage systems +Amoebas in drinking water worldwide +J. N. C +The article focuses on a study which concluded that some amoeba species called free-living amoebas (FLAs) survive water treatment and quickly multiply in drinking water distribution and storage systems +140000 +title amoebas in drinking water worldwide author j n c + + + +Beyond the water's edge +In this article the author comments on the conduct of U.S. foreign policy by the administration of president Barack Obama. The central focus of the article is on the the Republican Party and its actions regarding foreign policy. A number of topics are addressed including Republican interest in defense spending, the Republican presidential candidates for 2012, and the reduction of U.S. troops in Afghanistan +Beyond the water's edge +In this article the author comments on the conduct of U.S. foreign policy by the administration of president Barack Obama. The central focus of the article is on the the Republican Party and its actions regarding foreign policy. A number of topics are addressed including Republican interest in defense spending, the Republican presidential candidates for 2012, and the reduction of U.S. troops in Afghanistan +120000 +title beyond the water s edge + + + +Smoke in the (Tariff) Water +Nicita, Alessandro +As the economic crisis deepened and widened, fears of a return to the protectionist spiral of the 1930s become more common. However, an important difference between the 1930s and today is the existence of the World Trade Organization and the legal limits it imposes on the protectionist responses members can pursue. The first objective of this paper is to assess the extent to which applied tariffs can be legally raised without violating bound tariff obligations and compare it with what is economically feasible. The second objective is the examination of whether individual countries have taken advantage of these legal tariff hikes as protectionist responses during economic crises, after the creation of the WTO. Results suggest that the policy space left when looking at what is economically possible is indeed quite large. However, in the recent past little of the available policy space has been used by countries suffering from an economic crisis +Smoke in the (Tariff) Water +Foletti, Liliana +Fugazza, Marco +Nicita, Alessandro +Olarreaga, Marcelo +As the economic crisis deepened and widened, fears of a return to the protectionist spiral of the 1930s become more common. However, an important difference between the 1930s and today is the existence of the World Trade Organization and the legal limits it imposes on the protectionist responses members can pursue. The first objective of this paper is to assess the extent to which applied tariffs can be legally raised without violating bound tariff obligations and compare it with what is economically feasible. The second objective is the examination of whether individual countries have taken advantage of these legal tariff hikes as protectionist responses during economic crises, after the creation of the WTO. Results suggest that the policy space left when looking at what is economically possible is indeed quite large. However, in the recent past little of the available policy space has been used by countries suffering from an economic crisis +120000 +title smoke in the tariff water author foletti liliana author fugazza marco author nicita alessandro author olarreaga marcelo + + + +The world's water-coolers +The article focuses on international conferences and congress of rich people and other influential people. The Davos Economic Forum, held annually in Davos, Switzerland is used as an example of such congresses, as is the Bildersberg Group, an annual conference whose proceedings are confidential. It is noted that several participants in such conferences believe they fail in their stated object of improving global governance and management of international economic relations +The world's water-coolers +The article focuses on international conferences and congress of rich people and other influential people. The Davos Economic Forum, held annually in Davos, Switzerland is used as an example of such congresses, as is the Bildersberg Group, an annual conference whose proceedings are confidential. It is noted that several participants in such conferences believe they fail in their stated object of improving global governance and management of international economic relations +120000 +title the world s water coolers + + + +Water purification : Any old iron? +Water purification : Any old iron? +120000 +title water purification any old iron + + + +New York's Ultraviolet Titan +Bergeron, Angelle +The article reports on the Catskill/Delaware Ultraviolet Disinfection Facility in New York City, the largest ultraviolet (UV) water disinfectant plant in the world. The facility will treat water from the Cat/Del watershed to meet federal Environmental Protection Agency surface-water-treatment rule requirements. Companies involved in the project include L.J. Coppola Inc., Welsbach Electric Corp. and SEW +New York's Ultraviolet Titan +Bergeron, Angelle +The article reports on the Catskill/Delaware Ultraviolet Disinfection Facility in New York City, the largest ultraviolet (UV) water disinfectant plant in the world. The facility will treat water from the Cat/Del watershed to meet federal Environmental Protection Agency surface-water-treatment rule requirements. Companies involved in the project include L.J. Coppola Inc., Welsbach Electric Corp. and SEW +115000 +title new york s ultraviolet titan author bergeron angelle + + + +Epa addresses chromium(vi) in drinking water +B. E. E +The article discusses the plan of U.S. Environmental Protection Agency (EPA) Administrator Lisa P. Jackson to issue guidance to all U.S. drinking water utilities for the development and implementation of programs monitoring chromium in drinking water +Epa addresses chromium(vi) in drinking water +B. E. E +The article discusses the plan of U.S. Environmental Protection Agency (EPA) Administrator Lisa P. Jackson to issue guidance to all U.S. drinking water utilities for the development and implementation of programs monitoring chromium in drinking water +101503 +title epa addresses chromium vi in drinking water author b e e + + + +Nanostructured Materials Repel Water Before It Freezes +The article offers information on nanostructured materials designed by Harvard University researchers, which repel water droplets before they can freeze +Nanostructured Materials Repel Water Before It Freezes +The article offers information on nanostructured materials designed by Harvard University researchers, which repel water droplets before they can freeze +100714 +title nanostructured materials repel water before it freezes + + diff --git a/test/test_sru.cfg b/test/test_sru.cfg new file mode 100644 index 0000000..636bdff --- /dev/null +++ b/test/test_sru.cfg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/test_sru.sh b/test/test_sru.sh new file mode 100644 index 0000000..9bc98bf --- /dev/null +++ b/test/test_sru.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +# srcdir might be set by make +srcdir=${srcdir:-"."} + +#TODO set up solr target. For now use donut +#F=../solr/client.sh +# +#rm -f solr.pid +#$F -l solr.log -p ztest.pid -D @:9999 +#sleep 1 +#if test ! -f ztest.pid; then +# echo "yaz-ztest could not be started" +# exit 0 +#fi + +${srcdir}/run_pazpar2.sh test_sru +E=$? + +#kill `cat ztest.pid` +#rm ztest.pid +exit $E + +# Local Variables: +# mode:shell-script +# sh-indentation: 2 +# sh-basic-offset: 4 +# End: diff --git a/test/test_sru.urls b/test/test_sru.urls new file mode 100644 index 0000000..d10ee84 --- /dev/null +++ b/test/test_sru.urls @@ -0,0 +1,5 @@ +http://localhost:9763/search.pz2?command=init&clear=1 +http://localhost:9763/search.pz2?session=1&command=settings&pz:sru%5Bgso.gbv.de%2Fsru%2FDB%5D=get&pz%3Aname%5Bgso.gbv.de%2Fsru%2FDB%5D=SOLR+Test&pz%3Acclmap%3Ati%5Bgso.gbv.de%2Fsru%2FDB%5D=1%3Dtitle&pz%3Acclmap%3Asu%5Bgso.gbv.de%2Fsru%2FDB%5D=1%3Dsubject&pz%3Acclmap%3Aau%5Bgso.gbv.de%2Fsru%2FDB%5D=1%3Dauthor&pz%3Acclmap%3Aisbn%5Bgso.gbv.de%2Fsru%2FDB%5D=1%3Disbn&pz%3Acclmap%3Aterm%5Bgso.gbv.de%2Fsru%2FDB%5D=1%3Dtitle&pz%3Axslt%5Bgso.gbv.de%2Fsru%2FDB%5D=solr-pz2.xsl&pz%3Aqueryencoding%5Bgso.gbv.de%2Fsru%2FDB%5D=UTF-8&pz%3Aapdulog%5Bgso.gbv.de%2Fsru%2FDB%5D=1&pz%3Asru_version%5Bgso.gbv.de%2Fsru%2FDB%5D=1.1 +http://localhost:9763/search.pz2?session=1&command=search&query=cql:man +4 http://localhost:9763/search.pz2?session=1&command=show&block=1 + diff --git a/test/test_sru_1.res b/test/test_sru_1.res new file mode 100644 index 0000000..81ff9ff --- /dev/null +++ b/test/test_sru_1.res @@ -0,0 +1,2 @@ + +OK11 \ No newline at end of file diff --git a/test/test_sru_2.res b/test/test_sru_2.res new file mode 100644 index 0000000..ab63fe6 --- /dev/null +++ b/test/test_sru_2.res @@ -0,0 +1,2 @@ + +OK \ No newline at end of file diff --git a/test/test_sru_3.res b/test/test_sru_3.res new file mode 100644 index 0000000..d3b889f --- /dev/null +++ b/test/test_sru_3.res @@ -0,0 +1,9 @@ + + +OK +0 +0 +0 +0 +0 + diff --git a/test/test_turbomarcxml.urls b/test/test_turbomarcxml.urls new file mode 100644 index 0000000..7d2b76c --- /dev/null +++ b/test/test_turbomarcxml.urls @@ -0,0 +1,8 @@ +http://localhost:9763/search.pz2?command=init&clear=1 +http://localhost:9763/search.pz2?session=1&command=settings&pz:name%5Bz3950.indexdata.com%2Fgils%5D=gils&pz:requestsyntax%5Bz3950.indexdata.com%2Fgils%5D=usmarc&pz:nativesyntax%5Bz3950.indexdata.com%2Fgils%5D=xml&pz:xslt%5Bz3950.indexdata.com%2Fgils%5D=marc21_test.xsl +http://localhost:9763/search.pz2?session=1&command=search&query=computer +2 http://localhost:9763/search.pz2?session=1&command=show&block=1 +http://localhost:9763/search.pz2?session=1&command=settings&pz:name%5Bz3950.indexdata.com%2Fgils%5D=gils&pz:requestsyntax%5Bz3950.indexdata.com%2Fgils%5D=usmarc&pz:nativesyntax%5Bz3950.indexdata.com%2Fgils%5D=txml&pz:xslt%5Bz3950.indexdata.com%2Fgils%5D=tmarc.xsl +http://localhost:9763/search.pz2?session=1&command=search&query=computer +2 http://localhost:9763/search.pz2?session=1&command=show&block=1 +2 http://localhost:9763/search.pz2?session=1&command=bytarget diff --git a/test/test_turbomarcxml_4.res b/test/test_turbomarcxml_4.res index 5983cd5..3ed2d80 100644 --- a/test/test_turbomarcxml_4.res +++ b/test/test_turbomarcxml_4.res @@ -13,11 +13,14 @@ searching by topic and geographic location, similar to GEOREF. It is currently under development to replace the printed Bibliography of Marine Geology BIBLIOGRAPHY OF MAINE GEOLOGY -This data base is a computer based bibliography of marine geology. It allows +This data base is a computer based bibliography of marine geology. It allows searching by topic and geographic location, similar to GEOREF. It is currently -under development to replace the printed Bibliography of Marine Geology +under development to replace the printed Bibliography of Marine Geology +1692-PRESENT +test-usersetting-2 data: + 9416 -title bibliography of maine geology +title bibliography of maine geology author medium book @@ -28,13 +31,16 @@ Survey in the mid-to late 1970's comprises this data set. Some series also show bedrock topography and potentiometric surface. Geographic coverage is restricted to Southern Maine GROUNDWATER RESOURCE MAPS - COUNTY SERIES -A series of 1:250,000 scale maps showing well yield, well depth, and depth to +A series of 1:250,000 scale maps showing well yield, well depth, and depth to bedrock for a large number of bedrock wells inventoried by the Maine Geological Survey in the mid-to late 1970's comprises this data set. Some series also show bedrock topography and potentiometric surface. Geographic coverage is -restricted to Southern Maine +restricted to Southern Maine +1972-1978 +test-usersetting-2 data: + 0 -title groundwater resource maps county series +title groundwater resource maps county series author medium book @@ -43,10 +49,13 @@ restricted to Southern Maine operator, driller, location, depth, copies of logs run, permits, samples (cuttings, core), completion records OIL/GAS DRILLING -This database contains information on oil and gas drilling such as well name, +This database contains information on oil and gas drilling such as well name, operator, driller, location, depth, copies of logs run, permits, samples -(cuttings, core), completion records +(cuttings, core), completion records +1907-PRESENT +test-usersetting-2 data: + 0 -title oil gas drilling +title oil gas drilling author medium book diff --git a/test/test_turbomarcxml_7.res b/test/test_turbomarcxml_7.res index c0aa569..5c85987 100644 --- a/test/test_turbomarcxml_7.res +++ b/test/test_turbomarcxml_7.res @@ -7,18 +7,30 @@ 0 3 - -0 -z3950.indexdata.com/gils-1 + +BIBLIOGRAPHY OF MAINE GEOLOGY +This data base is a computer based bibliography of marine geology. It allows searching by topic and geographic location, similar to GEOREF. It is currently under development to replace the printed Bibliography of Marine Geology +BIBLIOGRAPHY OF MAINE GEOLOGY +This data base is a computer based bibliography of marine geology. It allows searching by topic and geographic location, similar to GEOREF. It is currently under development to replace the printed Bibliography of Marine Geology +9416 +title bibliography of maine geology - + +GROUNDWATER RESOURCE MAPS - COUNTY SERIES +A series of 1:250,000 scale maps showing well yield, well depth, and depth to bedrock for a large number of bedrock wells inventoried by the Maine Geological Survey in the mid-to late 1970's comprises this data set. Some series also show bedrock topography and potentiometric surface. Geographic coverage is restricted to Southern Maine +GROUNDWATER RESOURCE MAPS - COUNTY SERIES +A series of 1:250,000 scale maps showing well yield, well depth, and depth to bedrock for a large number of bedrock wells inventoried by the Maine Geological Survey in the mid-to late 1970's comprises this data set. Some series also show bedrock topography and potentiometric surface. Geographic coverage is restricted to Southern Maine 0 -z3950.indexdata.com/gils-2 +title groundwater resource maps county series - + +OIL/GAS DRILLING +This database contains information on oil and gas drilling such as well name, operator, driller, location, depth, copies of logs run, permits, samples (cuttings, core), completion records +OIL/GAS DRILLING +This database contains information on oil and gas drilling such as well name, operator, driller, location, depth, copies of logs run, permits, samples (cuttings, core), completion records 0 -z3950.indexdata.com/gils-3 +title oil gas drilling diff --git a/test/test_turbomarcxml_urls b/test/test_turbomarcxml_urls deleted file mode 100644 index 4eb22a6..0000000 --- a/test/test_turbomarcxml_urls +++ /dev/null @@ -1,8 +0,0 @@ -http://localhost:9763/search.pz2?command=init&clear=1 -http://localhost:9763/search.pz2?session=1&command=settings&pz:name%5Bz3950.indexdata.com%2Fgils%5D=gils&pz:requestsyntax%5Bz3950.indexdata.com%2Fgils%5D=usmarc&pz:nativesyntax%5Bz3950.indexdata.com%2Fgils%5D=xml&pz:xslt%5Bz3950.indexdata.com%2Fgils%5D=marc21.xsl -http://localhost:9763/search.pz2?session=1&command=search&query=computer -2 http://localhost:9763/search.pz2?session=1&command=show&block=1 -http://localhost:9763/search.pz2?session=1&command=settings&pz:name%5Bz3950.indexdata.com%2Fgils%5D=gils&pz:requestsyntax%5Bz3950.indexdata.com%2Fgils%5D=usmarc&pz:nativesyntax%5Bz3950.indexdata.com%2Fgils%5D=txml&pz:xslt%5Bz3950.indexdata.com%2Fgils%5D=tmarcxml.xsl -http://localhost:9763/search.pz2?session=1&command=search&query=computer -2 http://localhost:9763/search.pz2?session=1&command=show&block=1 -2 http://localhost:9763/search.pz2?session=1&command=bytarget diff --git a/test/tmarc.xsl b/test/tmarc.xsl new file mode 100644 index 0000000..0dc7b20 --- /dev/null +++ b/test/tmarc.xsl @@ -0,0 +1,737 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + yes + + + + + + + + book + + recording + + -cd + -cassette + -vinyl + + + + + + video + + -dvd + -blu-ray + -vhs + + + audio-visual + + + + + newspaper + journal + + + map + music-score + microform + thesis + + web + article + electronic + + + + + other + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + , + + + + + + + + + + + + + + , + + + + + + + + + + + + + + , + + + + + + + + + + + + + + , + + + + + + + + + + + + + + , + + + + + + + + + + + + + + , + + + + + + + + + + + + + + , + + + + + + + + + + + + + + , + + + + + + + + + + + + + + , + + + + + + + + + + + + + + , + + + + + + + + + + + + + + , + + + + + + + + + + + + + + , + + + + + + + + + + + + + + , + + + + + + + + + + + + + + , + + + + + + + + + + + + + + , + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + (electronic) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PAZPAR2_NULL_VALUE + + + + + + + PAZPAR2_NULL_VALUE + + + + + + + PAZPAR2_NULL_VALUE + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + , + + + + + + + + + diff --git a/win/makefile b/win/makefile index 9c0ee85..729cec2 100644 --- a/win/makefile +++ b/win/makefile @@ -1,10 +1,10 @@ # This file is part of Pazpar2. -# Copyright (C) 2006-2010 Index Data +# Copyright (C) 2006-2011 Index Data DEBUG=0 # 0 for release, 1 for debug USE_MANIFEST = 1 # Can be enabled Visual Studio 2005/2008 PACKAGE_NAME=pazpar2 -PACKAGE_VERSION=1.3.0 +PACKAGE_VERSION=1.4.4 # YAZ YAZ_DIR=..\..\yaz @@ -59,19 +59,19 @@ pazpar2: $(PAZPAR2_EXE) YAZBINDIR=$(YAZ_DIR)\bin !if $(DEBUG) -YAZ_LIB="$(YAZ_DIR)\lib\yaz3d.lib" +YAZ_LIB="$(YAZ_DIR)\lib\yaz4d.lib" "$(YAZ_DIR)\lib\yaz_cond4d.lib" !if $(HAVE_ICU) -YAZ_LIB=$(YAZ_LIB) "$(YAZ_DIR)\lib\yaz_icu3d.lib" +YAZ_LIB=$(YAZ_LIB) "$(YAZ_DIR)\lib\yaz_icu4d.lib" !endif -YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz3d.dll" -YAZ_DLL_TARGET="$(BINDIR)\yaz3d.dll" +YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz4d.dll" +YAZ_DLL_TARGET="$(BINDIR)\yaz4d.dll" !else -YAZ_LIB="$(YAZ_DIR)\lib\yaz3.lib" +YAZ_LIB="$(YAZ_DIR)\lib\yaz4.lib" "$(YAZ_DIR)\lib\yaz_cond4.lib" !if $(HAVE_ICU) -YAZ_LIB=$(YAZ_LIB) "$(YAZ_DIR)\lib\yaz_icu3.lib" +YAZ_LIB=$(YAZ_LIB) "$(YAZ_DIR)\lib\yaz_icu4.lib" !endif -YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz3.dll" -YAZ_DLL_TARGET="$(BINDIR)\yaz3.dll" +YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz4.dll" +YAZ_DLL_TARGET="$(BINDIR)\yaz4.dll" !endif YAZ_DEF=/DYAZ_HAVE_XML2=2 /DYAZ_HAVE_XSLT=1 /I"$(YAZ_DIR)\include" @@ -201,6 +201,8 @@ PAZPAR2_OBJS = \ "$(OBJDIR)\normalize_record.obj" \ "$(OBJDIR)\normalize_cache.obj" \ "$(OBJDIR)\ppmutex.obj" \ + "$(OBJDIR)\incref.obj" \ + "$(OBJDIR)\sel_thread.obj" \ "$(OBJDIR)\connection.obj" diff --git a/win/pazpar2.nsi b/win/pazpar2.nsi index d90b259..3ae546e 100644 --- a/win/pazpar2.nsi +++ b/win/pazpar2.nsi @@ -1,5 +1,5 @@ ; This file is part of Pazpar2. -; Copyright (C) 2006-2010 Index Data +; Copyright (C) 2006-2011 Index Data !include version.nsi diff --git a/www/iphone/IndexData_MK_logo.png b/www/iphone/IndexData_MK_logo.png new file mode 100644 index 0000000..10e19ec Binary files /dev/null and b/www/iphone/IndexData_MK_logo.png differ diff --git a/www/iphone/UiUIKit/about.html b/www/iphone/UiUIKit/about.html new file mode 100644 index 0000000..d104fbb --- /dev/null +++ b/www/iphone/UiUIKit/about.html @@ -0,0 +1,41 @@ + + + + + + About the project + + + + + + + + + +

Universal iPhone UI Kit v1.0

+ +
    +

  • You're seeing an open source project to make universal interfaces for iPhone using technologies like HTML, CSS and all the capabilities of the phone.

    This framework was made for that: make life easier for the developer, letting you run a few elements of HTML to build complex interfaces same as you'd see on the iPhone.

    Look into the source code of this project, analyse each example and performs your own tests with a simple webserver and an iPhone Simulator or, a real iPhone. We're working to make more interfaces and add them to our framework for sharing with everyone.

    Anyone can collaborate in the project, simply send me your edits to dlafuente@gmail.com and then you add the SVN project.

    + +
+ +

About the author

+ + + +

Best enjoyed on a real iPhone
This iPhone UI Framework kit is licenced under GNU Affero General Public License (GNU AGPL 3)

+ + + + + \ No newline at end of file diff --git a/www/iphone/UiUIKit/author.html b/www/iphone/UiUIKit/author.html new file mode 100644 index 0000000..dd9f5f4 --- /dev/null +++ b/www/iphone/UiUIKit/author.html @@ -0,0 +1,60 @@ + + + + + + About the author + + + + + + + + + + + + + + +
    +

  • Diego Martín Lafuente is an IA designer, web standard advocate and amateur writer who lives in Barcelona, currently working for Tractis.com. Among this project he also writes his weekly column on his personal tech blog minid.net (spanish).

    • +
+ +

Contact Diego

+ + + + + + +

Best enjoyed on a real iPhone
This iPhone UI Framework kit is licenced under GNU Affero General Public License (GNU AGPL 3)

+ + + + + \ No newline at end of file diff --git a/www/iphone/UiUIKit/button-panels.html b/www/iphone/UiUIKit/button-panels.html new file mode 100644 index 0000000..56f2e30 --- /dev/null +++ b/www/iphone/UiUIKit/button-panels.html @@ -0,0 +1,63 @@ + + + + + + Buttons panel + + + + + + + + + + + + +

Examples

+ +
    +

  • Button panel it's useful to display as an modal window. It is placed always at the bottom of the screen and you can see 4 buttons example: white, red, blue (on hovers) and black.

    +
    • +
+ +

Show panel

+ + +

Best enjoyed on a real iPhone
This iPhone UI Framework kit is licenced under GNU Affero General Public License (GNU AGPL 3)

+ + + + + \ No newline at end of file diff --git a/www/iphone/UiUIKit/chat.html b/www/iphone/UiUIKit/chat.html new file mode 100644 index 0000000..78f30e4 --- /dev/null +++ b/www/iphone/UiUIKit/chat.html @@ -0,0 +1,77 @@ + + + + + + Chat Interface + + + + + + + + +
+

Hi, welcome to the chat interface example. All bubbles are made from a DIV element. Inside div elements there's P element that represents the user text. #chat on BODY is mandatory.

+
+ +

23/08/2008 21:55

+ +
+

By using simple markup you can customize colors using "lime, aqua…" classes on any P element.

+
+ +

23/08/2008 21:57

+ +
+

And you can customize the display (left or right)

+
+ +
+

Check all the colors.

+
+ +

23/08/2008 21:59

+ +
+

This is using class "lime"

+
+ +
+

This is using class "lemon"

+
+ +
+

This is using class "orange"

+
+ +
+

This is using class "aqua"

+
+ +
+

This is using class "purple"

+
+ +
+

This is using class "pink"

+
+ +
+

This is using class "graphite"

+
+ +
+

This is using class "clear"

+
+ + + \ No newline at end of file diff --git a/www/iphone/UiUIKit/forms.html b/www/iphone/UiUIKit/forms.html new file mode 100644 index 0000000..afdeaef --- /dev/null +++ b/www/iphone/UiUIKit/forms.html @@ -0,0 +1,67 @@ + + + + + + Forms + + + + + + + + + + + + +

Field sets

+ +
    +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
+ +

Buy this car

+ +

Best enjoyed on a real iPhone
This iPhone UI Framework kit is licenced under GNU Affero General Public License (GNU AGPL 3)

+ + + \ No newline at end of file diff --git a/www/iphone/UiUIKit/header-action.html b/www/iphone/UiUIKit/header-action.html new file mode 100644 index 0000000..0c49002 --- /dev/null +++ b/www/iphone/UiUIKit/header-action.html @@ -0,0 +1,46 @@ + + + + + + Headers + + + + + + + + + +

Explanation

+ +
    +

  • Simple header is just made from a DIV#header and a H1 element. This H1 element is builds the header. Once you get that, you can add navigational stuff like action buttons (always on right) and navigational button (always on left).

    +

    Visit all headers examples for more info.

    +
    • +
+ + + +

Best enjoyed on a real iPhone
This iPhone UI Framework kit is licenced under GNU Affero General Public License (GNU AGPL 3)

+ + + + + diff --git a/www/iphone/UiUIKit/header-back.html b/www/iphone/UiUIKit/header-back.html new file mode 100644 index 0000000..99b7827 --- /dev/null +++ b/www/iphone/UiUIKit/header-back.html @@ -0,0 +1,45 @@ + + + + + + Headers + + + + + + + + + +

Explanation

+ +
    +

  • Simple header is just made from a DIV#header and a H1 element. This H1 element is builds the header. Once you get that, you can add navigational stuff like action buttons (always on right) and navigational button (always on left).

    +

    Visit all headers examples for more info.

    +
    • +
+ + + +

Best enjoyed on a real iPhone
This iPhone UI Framework kit is licenced under GNU Affero General Public License (GNU AGPL 3)

+ + + + + diff --git a/www/iphone/UiUIKit/header-pretitle.html b/www/iphone/UiUIKit/header-pretitle.html new file mode 100644 index 0000000..8cc1ff7 --- /dev/null +++ b/www/iphone/UiUIKit/header-pretitle.html @@ -0,0 +1,46 @@ + + + + + + Headers + + + + + + + + + +

Explanation

+ +
    +

  • You can set pre class now in the #header container for starting use pre-titles. Every pre-title have trimming properties so, whenever is on the vertical view or horizontal it will scale nicely, javascript free.

    +
    • +
+ + + +

Best enjoyed on a real iPhone
This iPhone UI Framework kit is licenced under GNU Affero General Public License (GNU AGPL 3)

+ + + + + diff --git a/www/iphone/UiUIKit/header-simple.html b/www/iphone/UiUIKit/header-simple.html new file mode 100644 index 0000000..0959093 --- /dev/null +++ b/www/iphone/UiUIKit/header-simple.html @@ -0,0 +1,44 @@ + + + + + + Headers + + + + + + + + + +

Explanation

+ +
    +

  • Simple header is just made from a DIV#header and a H1 element. This H1 element is builds the header. Once you get that, you can add navigational stuff like action buttons (always on right) and navigational button (always on left).

    +

    Visit all headers examples for more info.

    +
    • +
+ + + +

Best enjoyed on a real iPhone
This iPhone UI Framework kit is licenced under GNU Affero General Public License (GNU AGPL 3)

+ + + + + diff --git a/www/iphone/UiUIKit/headers.html b/www/iphone/UiUIKit/headers.html new file mode 100644 index 0000000..06e03e5 --- /dev/null +++ b/www/iphone/UiUIKit/headers.html @@ -0,0 +1,38 @@ + + + + + + Headers + + + + + + + + + +

Headers list

+ + + +

Best enjoyed on a real iPhone
This iPhone UI Framework kit is licenced under GNU Affero General Public License (GNU AGPL 3)

+ + + + + \ No newline at end of file diff --git a/www/iphone/UiUIKit/images-list.html b/www/iphone/UiUIKit/images-list.html new file mode 100644 index 0000000..746905d --- /dev/null +++ b/www/iphone/UiUIKit/images-list.html @@ -0,0 +1,35 @@ + + + + + + Headers + + + + + + + + + +

Images list types

+ + + +

Best enjoyed on a real iPhone
This iPhone UI Framework kit is licenced under GNU Affero General Public License (GNU AGPL 3)

+ + + + + \ No newline at end of file diff --git a/www/iphone/UiUIKit/images-loading.html b/www/iphone/UiUIKit/images-loading.html new file mode 100644 index 0000000..d0d3c07 --- /dev/null +++ b/www/iphone/UiUIKit/images-loading.html @@ -0,0 +1,37 @@ + + + + + + Image grids + + + + + + + + +
    +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
+ + + \ No newline at end of file diff --git a/www/iphone/UiUIKit/images-no.html b/www/iphone/UiUIKit/images-no.html new file mode 100644 index 0000000..8465fce --- /dev/null +++ b/www/iphone/UiUIKit/images-no.html @@ -0,0 +1,28 @@ + + + + + + Image grids + + + + + + + + +

No pictures

+ +

Upload new images.

+ + + \ No newline at end of file diff --git a/www/iphone/UiUIKit/images.html b/www/iphone/UiUIKit/images.html new file mode 100644 index 0000000..084a885 --- /dev/null +++ b/www/iphone/UiUIKit/images.html @@ -0,0 +1,75 @@ + + + + + + Image grids + + + + + + + + +
    +
    • +
    • +
    • +
    • +
    • +
    • + +
    • +
    • +
    • +
    • +
    • +
    • + +
    • +
    • +
    • +
    • +
    • +
    • + +
    • +
    • +
    • +
    • +
    • +
    • + +
    • +
    • +
    • +
    • +
    • +
    • + +
    • +
    • +
    • +
    • +
    • +
    • + +
    • +
    • +
    • +
    • +
    • +
    • + +
+ + + \ No newline at end of file diff --git a/www/iphone/UiUIKit/images/PSD/chat_bubbles.psd b/www/iphone/UiUIKit/images/PSD/chat_bubbles.psd new file mode 100644 index 0000000..dd6d4e8 Binary files /dev/null and b/www/iphone/UiUIKit/images/PSD/chat_bubbles.psd differ diff --git a/www/iphone/UiUIKit/images/PSD/chevrons.psd b/www/iphone/UiUIKit/images/PSD/chevrons.psd new file mode 100644 index 0000000..2e73dbe Binary files /dev/null and b/www/iphone/UiUIKit/images/PSD/chevrons.psd differ diff --git a/www/iphone/UiUIKit/images/PSD/iphone-favicon.psd b/www/iphone/UiUIKit/images/PSD/iphone-favicon.psd new file mode 100644 index 0000000..243a4de Binary files /dev/null and b/www/iphone/UiUIKit/images/PSD/iphone-favicon.psd differ diff --git a/www/iphone/UiUIKit/images/actionButton.png b/www/iphone/UiUIKit/images/actionButton.png new file mode 100644 index 0000000..0f92dfd Binary files /dev/null and b/www/iphone/UiUIKit/images/actionButton.png differ diff --git a/www/iphone/UiUIKit/images/apple-touch-icon.png b/www/iphone/UiUIKit/images/apple-touch-icon.png new file mode 100644 index 0000000..50d8959 Binary files /dev/null and b/www/iphone/UiUIKit/images/apple-touch-icon.png differ diff --git a/www/iphone/UiUIKit/images/backButton.png b/www/iphone/UiUIKit/images/backButton.png new file mode 100644 index 0000000..e27ea8c Binary files /dev/null and b/www/iphone/UiUIKit/images/backButton.png differ diff --git a/www/iphone/UiUIKit/images/banner-1.png b/www/iphone/UiUIKit/images/banner-1.png new file mode 100644 index 0000000..91727c9 Binary files /dev/null and b/www/iphone/UiUIKit/images/banner-1.png differ diff --git a/www/iphone/UiUIKit/images/banner-2.png b/www/iphone/UiUIKit/images/banner-2.png new file mode 100644 index 0000000..2290ba4 Binary files /dev/null and b/www/iphone/UiUIKit/images/banner-2.png differ diff --git a/www/iphone/UiUIKit/images/banner-3.png b/www/iphone/UiUIKit/images/banner-3.png new file mode 100644 index 0000000..6637239 Binary files /dev/null and b/www/iphone/UiUIKit/images/banner-3.png differ diff --git a/www/iphone/UiUIKit/images/bgHeader.png b/www/iphone/UiUIKit/images/bgHeader.png new file mode 100644 index 0000000..6a54e19 Binary files /dev/null and b/www/iphone/UiUIKit/images/bgHeader.png differ diff --git a/www/iphone/UiUIKit/images/bgMetal.png b/www/iphone/UiUIKit/images/bgMetal.png new file mode 100644 index 0000000..99b9b74 Binary files /dev/null and b/www/iphone/UiUIKit/images/bgMetal.png differ diff --git a/www/iphone/UiUIKit/images/bglight.png b/www/iphone/UiUIKit/images/bglight.png new file mode 100644 index 0000000..ca2acd9 Binary files /dev/null and b/www/iphone/UiUIKit/images/bglight.png differ diff --git a/www/iphone/UiUIKit/images/blackbg.png b/www/iphone/UiUIKit/images/blackbg.png new file mode 100644 index 0000000..5234139 Binary files /dev/null and b/www/iphone/UiUIKit/images/blackbg.png differ diff --git a/www/iphone/UiUIKit/images/blueButton.png b/www/iphone/UiUIKit/images/blueButton.png new file mode 100644 index 0000000..0cfbee1 Binary files /dev/null and b/www/iphone/UiUIKit/images/blueButton.png differ diff --git a/www/iphone/UiUIKit/images/camera-icon-draw.ai b/www/iphone/UiUIKit/images/camera-icon-draw.ai new file mode 100644 index 0000000..cb6e942 --- /dev/null +++ b/www/iphone/UiUIKit/images/camera-icon-draw.ai @@ -0,0 +1,230 @@ +%PDF-1.5 %âãÏÓ +1 0 obj <>/OCGs[13 0 R 33 0 R]>>/Type/Catalog>> endobj 42 0 obj <>stream + + + + + application/pdf + + + Adobe Illustrator CS3 + 2008-08-27T01:32:58+02:00 + 2008-08-27T01:33:18+02:00 + 2008-08-27T01:33:18+02:00 + + + + 256 + 196 + JPEG + /9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgAxAEAAwER AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE 1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp 0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo +DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8A9U4q7FXYq7FXYq7FXYq7 FWKfmf59tPI3lC61yZBNcAiCwtjUCW4kB4KafsgAs3sD3xV8S+a/O/mnzXfve67qEt3IxqkRYiGM dljiHwIB7DFUjxV2KuxV2KuxV2KuxV2KuxV2KuxV2KorTtU1LTLtLzTrqazuozVJ4HaNwR4MpBxV 9bf84+/nFdec7G40XXZFbzBp6CRZwAv1m3qFLlRtzRiA1KVqPfFXsOKuxV2KuxV2KuxV2KuxV2Ku xV2KuxV2KuxV2KuxV8c/85IfmF/ibzmdJs5Q+kaCXt4yp+GS5NBPJ70K8F+VR1xV5JirsVdirsVd irsVdirsVdirsVdirsVdirsVT7yN5tvvKXmrT9fs6l7OQGWKtBJC3wyxn/WQkex3xV98aRqthq+l 2mqafKJrK9iSe3lHdJByG3Y77jtiqLxV2KuxV2KuxV2KuxV2KqN3fWVlCZ7y4jtoR1lmdY1H+yYg YqlX+OfJX/Uwab/0mQf814q7/HPkr/qYNN/6TIP+a8Vd/jnyV/1MGm/9JkH/ADXirv8AHPkr/qYN N/6TIP8AmvFXf458lf8AUwab/wBJkH/NeKsL/N784NB8v+SbybRNVtbvWrsfVbBbWeOZ43kBrMQj MQI1BIP81B3xV8XEkkkmpO5JxVrFXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FX0j/zjF+adha6 bdeUtevorSK1rdaVPcyLHH6bt+9h5OVFQ7c1HereGKvdf8c+Sv8AqYNN/wCkyD/mvFXf458lf9TB pv8A0mQf814q7/HPkr/qYNN/6TIP+a8Vd/jnyV/1MGm/9JkH/NeKu/xz5K/6mDTf+kyD/mvFU1tL 6yvYRPZ3EdzCeksLrIp/2SkjFVbFXkv55/nYnka3j0jRwk/mS7jLgv8AElrEdlkdf2nY/YX6TtQF V8k695j17zBfPf61fzX925J9Sdy1K70QfZRf8lQBiqXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7 FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FUx0HzHr3l++S/wBFv5rC7Qg+pA5WtN6OPsuv+SwI xV9bfkZ+dieebeTSNYCQeZLSMOSnwpdRDZpEX9l1P21+kbVAVfKXnXzJc+ZfNeq67cMWa+uHkjB/ ZirSJB7JGFUfLFUlxV2KuxV2KuxV2KuxV2KuxV2KuxV2KpjovlzX9cuDb6Np1zqMw+0ltE8pUeLc AeI9zir0HSf+ca/zY1BVeXTodPRtw13cRg091iMrj6RirJbb/nEXzm1PrWtadFtv6Xryb/7KOPFV 1x/ziJ5vUf6PrenyGh2kWaPft0STFWPar/zjF+a1kGMFraakF3/0W5UV+QnEBxV5/r/k/wA1eXnC a3pN1p9TRXnidEY/5DkcG+g4qk+KuxV2KuxV2KuxV2KuxV2KuxV2KuxVOvJXmS58tea9K123Yq1j cJJIB+1FWkqH2eMsp+eKpLirsVdirsVdirsVdirsVdirsVdirKvIv5Z+b/O94YNDsy1vGwW4v5j6 dtF/rSUNT/kqC3tir6S8i/8AOMPkvRFjufMDHX9RFCUkBjtEPgIgav8A7MkH+UYq9esrCxsLZLWx t4rS1jFI4IEWONR/kqoAGKq+KuxV2KuxVZNBDPE8M8aywyArJG4DKynqCDsRiry3zv8A844fl/5j SSfT4P0DqTbrPZKBCT/l2+yU/wBTiffFXzb+Yf5N+dPIzmbULcXWlE0j1S1q8O52ElQGjb/WFPAn FWC4q7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq9u/Jf/nHq78zLDr/mhXtN Aaj2loDwmux2Y944j49W7bb4q+qdM0vTtKsIdP022jtLK3XhBbwqERVHgB+OKorFXYq7FXYq7FXY q7FXYqsngguIZIJ41mglUpLFIAyMrChVlOxBGKvmz85f+cbvq8c3mDyPAzRLWS80RdyoG5e2ruR/ xX1/l/lxV86EEGh64q7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq9y/5x8/JNPMcy eafMcHLQoG/0CzcbXUqHdnB6woe37R26Agqvq5VVVCqAFAoANgAMVbxV2KuxV2KoG91/QrElb7Ub W1Zd2E80cZHbfkwxVTtPM3lu8YLZ6rZ3LMaAQ3EUhJHb4WOKplirsVdirsVdir5z/wCcifyRiaK4 86eWrfjKlZdbsIhsw6m5jUdCOsgHX7XjVV81Yq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FX YqzP8pvy9ufPXnC20ock06H/AEjVLhduFuhFQDQ/G5+Ffv7HFX3PY2NnYWUFjZRLBaW0axQQoKKi IKKo+QGKq+KuxVbLLHFG8srrHFGpZ3YgKqgVJJOwAGKvCfzF/wCcpdG0qSTT/KECateISr6jNUWi kbfAFKvL8wVXwJxV4H5m/Nj8w/Mrv+lNcuWgfraQN9Xgp4elFwU/NqnFWJEkmp64q7FWReXPzE88 eXHQ6Lrd3aIhBFuJC8Bp4wycoz9K4q9z/L7/AJytjlkjsfO1qsNaKNXs1JSvjNB8RHuU/wCBxV9C afqFjqNlDfWFxHdWdwoeC4hYOjqe6sNjiqIxV2KtMqspVgCpFCDuCDir4x/P/wDLBfJnmr61p0RX QNXLTWYH2YZR/ewV8ATyT/JNOxxV5birsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVfZ3/OOn kRfLPkGC9uI+Oqa7xvbkkUZYiP8AR4/oQ8vmxxV6nirsVWXFxBbwSXFxIsUEKtJLK5CqiKKszE7A ACpOKvj/APO788r7zjdy6Nokr23leFuJpVXvGU/bk7+nt8CfS29AqryHFXYq7FXYq7FXYq9D/KP8 4dZ8g6oqMXu/L1w3+nadXpXYzQ12WQfc3Q9iFX2jous6brWlWuraZOtzYXkYlt5l6FT4+BB2IO4O 2Ko3FXYqw/8ANjyPF508j6ho4UfXVX6xprn9m5iBKb9ue6H2bFXwe6OjsjqVdSQykUII2IIOKtYq 7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FWR/l15ZPmfzxouhkExXlyguAOvoR1kmI+USNir79RERF RFCooAVQKAAbAADFW8Vdir55/wCcp/zIltLeDyTpsxSS7QXGsOh3ENf3UBp/ORyYeFOxxV8yYq7F XYq7FXYq7FXYq7FXu/8Azi9+ZEum663k7UJidO1Qs+ncztFdgVKCvQSqP+CA8Tir6qxV2KuxV8R/ n/5WXy9+Z+qRxJwtdS46jbKNhS4r6lAO3rK4GKvOsVdirsVdirsVdirsVdirsVdirsVdirsVdir2 3/nE7Rlu/P19qUi8l02wf02/llndUB/5Fhxir60xV2KrJ5ooIZJ5mCRRKXkc9FVRUk/IYq/Przl5 juPMvmrVNduCeeoXDyqrdVjJpGn+wjCqPliqTYq7FXYq7FXYq7FXYq7FVayvLmyvIL21kMV1bSJN BKvVZI2DKw+RGKv0H8q67Dr/AJa0vW4QAmo2sVxwG/FpEBZP9i1VxVNMVdir5w/5y/0ZeHlzWkX4 q3FnM3iPhkiH0fHir5txV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KvpX/nD22QW3mm6p8bPZxBiO gUTMQD78t/oxV9GYq7FWJ/mxfyWH5aeZrmMkSDT541I6gyoY6/RzxV8FYq7FXYq7FXYq7FXYq7FX Yq7FX2j/AM42X8l1+Umlo5JNpLcwAnwEzOPuD0xV6hirsVeMf85X2qy/lrazcatb6nA4YDoGimQ1 Ph8X6sVfIuKuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV9O/84fzltH8ywbUjuLZ/f40kH/GmKvoT FXYqwr86Yml/KrzMqgkiyd9jTZCGP4DFXwnirsVdirsVdirsVdirsVdirsVfY/8Azi/AYvypgcgg T3lzICTWtGCbeH2MVetYq7FXj/8AzlPMY/yu4UB9bULdN/ZXfb/gMVfH2KuxV2KuxV2KuxV2KuxV 2KuxV2KuxV2KuxV9Af8AOIWqLF5g8w6WT8V3aQ3IHj9WkKH/AKicVfUOKuxVA69pUer6HqOkyGke oWs1q58FmjMZ/wCJYq/PG7tZ7S6mtLhSk9vI0UqHqroSrD6CMVUsVdirsVdirsVdirsVdirsVfen 5S6C+g/lt5e0yRSk0dossyHqslwTPIp+TyEYqy3FXYq8C/5y81NY/LGg6XX4rm9kuuO3S3iKV8f+ PjFXy3irsVdirsVdirsVdirsVdirsVdirsVdirsVeg/kJ5iGhfmnossjcbe+drCfelRcjhHU+Al4 HFX3BirsVdir5A/5yZ8hSaD52bXraOmma/WbkOiXa09dD/r7Sb9anwxV47irsVdirsVdirsVdirs VZ7+SfkOTzj58srWWMtpdiwvNTanw+lEQRGf+Mr0T5VPbFX3JirsVdir5E/5yo8xDUfzDi0qNqw6 NaJE61rSef8AfOf+AaMfRirxnFXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYqujkkjkWSNikiEMjA0 IINQQcVffP5beb4fN3krS9dVgZ7iELeKKfDcx/BMtB0+MEj2pirJsVdirH/PnkrSvOfli70HUhSO cc7ecCrQzrX05V91PUdxUd8VfDPnHyfrflHX7nRNYhMVzAapIK+nNGSeEsTH7SNT+B3BGKpJirsV dirsVdirsVRujaNqmtapb6Xpdu93f3biOCCMVLE/gABuSdgNzir7e/KT8tLHyD5YXT1KzapdETap eLWkktKBVrvwjBov0nvirNsVdiqB17WrHQ9FvtYvm4WlhC9xMdqlY1JoK926AeOKvz78wa1ea5rl /rF4a3WoTyXEtOgMjFuI9lrQe2KoDFXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXt3/OMf5kLo XmJ/K2oS8NM1pwbV2NFjvacV/wCRwAT5hcVfWeKuxV2KsW/MH8t/LXnnSPqGsQ0mjqbO/jAE8Dkd UY9VP7SnY/OhxV8j/mL+SXnTyTLJPPbnUNGUkpqtqpaML/xcu7RH/W+HwJxV5/irsVdirsVZf5D/ ACq85+drlV0eyZbLlSbU56x2qUND8dPjI/lQE+2Kvrb8rvyf8ueQbGtsBea1MoW81WRQHYdSkQ39 OOvYHfuTtirPMVdirsVfOH/OVH5kLxi8jadLUnhc60ynpT4oYD+Ejf7HFXzbirsVdirsVdirsVdi rsVdirsVdirsVdirsVdirsVbVmRgykqymqsNiCO4xV9j/kJ+cEPnLRV0jVZgPM+nRgS8iAbqFdhO terD/dg8d+9Aq9ZxV2KuxVxAIoemKsE8zfkd+WPmJ2mu9Fitrp9zc2RNs9T1JEdEYnxZTirBLz/n Ebya8nKz1nUIEJ+xL6Mv0AhI8VWW3/OInlJZK3OuX8sfdY1hjb/gmWT9WKsz8uf84+/lZocizLpI 1G4XpLqDm4H/ACKNIf8AhMVeiRRRQxJFEixxRgKkaAKqqNgABsBiq7FXYq7FWB/m9+aeneQfLrXF Un1u7BTS7In7T03lcVr6ad/E7d64q+ItQ1C91G+uL++ma4vLqRpridzVndzVmPzOKofFXYq7FXYq 7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FUZo2sanouqW2qaXcPa39o4kt54zRlYbfIgjYg7EbHFX2 N+T3536P56tUsL0pYeZol/fWVaJOFG8tuT18SnVfcb4q9PxV2KuxV2KuxV2KuxV2KuxV2KsH/ND8 2fL3kHTPUu2F1q86k2OlI1JJN6cnND6cYP7RHyqcVfGHm/zfrvm3XZ9a1qczXcxoqjaOKMfZiiXf ii1/id6nFUlxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxVUt7ie3njuLeRoZ4mDx SxsVdGU1DKwoQQehGKvoX8sf+cpJbdItL88o08SgJHrUK1kAH/LREv2/9ZN/YnfFX0Vo2u6Nrdil /pF7Df2cn2ZoHDr8jTofEHfFUdirsVdirsVdirsVUL6/sdPtZLu+uIrW1iHKW4mdY41HizMQBirw X8y/+cpNPtFl03yQgvLvdG1iZT6EZ3FYY23kI7M3w+zDFXzTqmq6lq2oT6jqVzJd31y3Oe4mYs7H 3J8OgHbFULirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVTPQPM3mDy9ef XdE1CfT7nYNJA5TkBvxcDZx7MCMVeweWf+csfONiqxa/p9trEY6zxn6pOfclA8R+iMYq9I0j/nKv 8uLtVF/Bf6bLT4+cSyxg+zRMzH/gBirI4P8AnIL8oJk5r5hRexD290hr8miGKrpPz/8AygjQu3mK IgdQsFyx8OixE4qkGq/85TflhZqfqhvtSffj6EHprX3M7REfdirzvzL/AM5b+YblGi8vaPBpwOwu bpzcyU8VQCJFPz5Yq8e80ed/Nnmm5Fxr+qT37KS0ccjUiQnr6cS8Y0/2K4qkeKuxV2KuxV2KuxV2 KuxV2KuxV2KuxVWvLWezu57S4XhPbyNFKh7OjFWH3jFVHFXYq7FXYq7FXYq7FXYq7FXYq7FXYq7F XYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYqrWdrPeXcFpbrznuJFiiQd3dgqj7zir2r/ AJyT/Kq90fX5/OGmwmTRtUf1L8oK/V7pz8Rf/Ilb4g38xI8KqvD8VdirsVdirsVdirsVdirsVdir sVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdir3D/nGz8qr3WNfg84alCY9G0t/U sC4p9YukPwlP8iJviLfzADxoq+qr/wCo/Ubj9Iel9R9NvrX1jj6PpUPP1Ofw8ePWu2Kvj780v+VA /pGb/C/6Q+tb8vqHD9H8/wDJ+sfvOv8AJ8Phirzj/nXP+Xz/AJJYq7/nXP8Al8/5JYq7/nXP+Xz/ AJJYq7/nXP8Al8/5JYq7/nXP+Xz/AJJYq7/nXP8Al8/5JYq7/nXP+Xz/AJJYq7/nXP8Al8/5JYq7 /nXP+Xz/AJJYq7/nXP8Al8/5JYq7/nXP+Xz/AJJYq7/nXP8Al8/5JYq7/nXP+Xz/AJJYq7/nXP8A l8/5JYq7/nXP+Xz/AJJYq7/nXP8Al8/5JYq7/nXP+Xz/AJJYq7/nXP8Al8/5JYq7/nXP+Xz/AJJY q7/nXP8Al8/5JYq7/nXP+Xz/AJJYq7/nXP8Al8/5JYq7/nXP+Xz/AJJYq7/nXP8Al8/5JYq7/nXP +Xz/AJJYq7/nXP8Al8/5JYq7/nXP+Xz/AJJYq7/nXP8Al8/5JYq9H/K3/lQP6Rh/xR+kPrW3H6/w /R/P/K+r/vOv8/w+OKvsGw+o/Ubf9H+l9R9Nfqv1fj6PpUHD0+Hw8ePSm2Kv/9k= + + + + + + uuid:258006696A75DD118BA9ECF03343FED2 + uuid:58eb0fda-eb1b-d44b-8dab-63c8475080a1 + + + + 1 + False + False + + 595.275574 + 841.889832 + Points + + + + Cyan + Magenta + Yellow + Black + + + + + + Default Swatch Group + 0 + + + + + + Document + + + + + + + + + + + + + + + + + + + + + + + + + endstream endobj 2 0 obj <> endobj 13 0 obj <> endobj 33 0 obj <> endobj 34 0 obj [/View/Design] endobj 35 0 obj <>>> endobj 14 0 obj [/View/Design] endobj 15 0 obj <>>> endobj 32 0 obj [33 0 R] endobj 5 0 obj <>/ArtBox[210.794 383.14 386.018 517.067]/MediaBox[0.0 0.0 595.276 841.89]/Thumb 41 0 R/TrimBox[0.0 0.0 595.276 841.89]/Resources<>/ExtGState<>>>/Type/Page/LastModified(D:20080827013318+02'00')>> endobj 37 0 obj <>stream +H‰dSKNÄ0 Ýû¾@<‰ãü¶ ˆB# ‚Ù¤ ‰Ûã|è ªÞsžÿ=<ñðp´xs{D¸€Å,ŽrÁPqŠhþxg|KŒÛûq†Ãý“Åó'\СÕÇ!—L) /‰¢/—7¨†70É*aÑH"Ȏ\ õï&O^4ú¡ Êv,ð—Ü]߻څ™Ñë³@ÒêbFg=‰MšÞŽhžœ–±ÁoÐ.pV»ò!á +^ëôk+DÐ{ââÔ^ÈgQñLÑÊdVe2Y SbÄRœ¿´ôH’Ó º6&ë¶4•Ñ>stream +8;Z]_Yml4+&4"WoDZ1Mo3R%`r"&q<"onY).SaQKM,HGb$`-bWif_a: +c'OHO<_s^TD!A6l5F0I;.;m+HBlAs^.ohIE1A=s5T9edA.KBGK]Pe_hQ/.YU~> endstream endobj 36 0 obj <> endobj 39 0 obj [/Indexed/DeviceRGB 255 40 0 R] endobj 40 0 obj <>stream +8;X]O>EqN@%''O_@%e@?J;%+8(9e>X=MR6S?i^YgA3=].HDXF.R$lIL@"pJ+EP(%0 +b]6ajmNZn*!='OQZeQ^Y*,=]?C.B+\Ulg9dhD*"iC[;*=3`oP1[!S^)?1)IZ4dup` +E1r!/,*0[*9.aFIR2&b-C#soRZ7Dl%MLY\.?d>Mn +6%Q2oYfNRF$$+ON<+]RUJmC0InDZ4OTs0S!saG>GGKUlQ*Q?45:CI&4J'_2j$XKrcYp0n+Xl_nU*O( +l[$6Nn+Z_Nq0]s7hs]`XX1nZ8&94a\~> endstream endobj 26 0 obj <> endobj 27 0 obj <> endobj 28 0 obj <>stream +%!PS-Adobe-3.0 %%Creator: Adobe Illustrator(R) 13.0 %%AI8_CreatorVersion: 13.0.0 %%For: (Diego Lafuente) () %%Title: (camera-icon-draw.ai) %%CreationDate: 8/27/08 1:33 AM %%BoundingBox: 210 383 387 518 %%HiResBoundingBox: 210.7944 383.1396 386.0176 517.0674 %%DocumentProcessColors: Cyan Magenta Yellow Black %AI5_FileFormat 9.0 %AI12_BuildNumber: 386 %AI3_ColorUsage: Color %AI7_ImageSettings: 0 %%RGBProcessColor: 0 0 0 ([Registration]) %AI3_TemplateBox: 298.5 420.3896 298.5 420.3896 %AI3_TileBox: 18.1377 40.9443 577.1377 823.9448 %AI3_DocumentPreview: None %AI5_ArtSize: 595.2756 841.8898 %AI5_RulerUnits: 2 %AI9_ColorModel: 1 %AI5_ArtFlags: 0 0 0 1 0 0 1 0 0 %AI5_TargetResolution: 800 %AI5_NumLayers: 1 %AI9_OpenToView: -87 724.5562 1.5 1230 885 26 1 0 6 75 0 0 1 1 0 0 1 %AI5_OpenViewLayers: 7 %%PageOrigin:0 0 %AI7_GridSettings: 72 8 72 8 1 0 0.8 0.8 0.8 0.9 0.9 0.9 %AI9_Flatten: 1 %AI12_CMSettings: 00.MS %%EndComments endstream endobj 29 0 obj <>stream +%%BoundingBox: 210 383 387 518 %%HiResBoundingBox: 210.7944 383.1396 386.0176 517.0674 %AI7_Thumbnail: 128 100 8 %%BeginData: 13714 Hex Bytes %0000330000660000990000CC0033000033330033660033990033CC0033FF %0066000066330066660066990066CC0066FF009900009933009966009999 %0099CC0099FF00CC0000CC3300CC6600CC9900CCCC00CCFF00FF3300FF66 %00FF9900FFCC3300003300333300663300993300CC3300FF333300333333 %3333663333993333CC3333FF3366003366333366663366993366CC3366FF %3399003399333399663399993399CC3399FF33CC0033CC3333CC6633CC99 %33CCCC33CCFF33FF0033FF3333FF6633FF9933FFCC33FFFF660000660033 %6600666600996600CC6600FF6633006633336633666633996633CC6633FF %6666006666336666666666996666CC6666FF669900669933669966669999 %6699CC6699FF66CC0066CC3366CC6666CC9966CCCC66CCFF66FF0066FF33 %66FF6666FF9966FFCC66FFFF9900009900339900669900999900CC9900FF %9933009933339933669933999933CC9933FF996600996633996666996699 %9966CC9966FF9999009999339999669999999999CC9999FF99CC0099CC33 %99CC6699CC9999CCCC99CCFF99FF0099FF3399FF6699FF9999FFCC99FFFF %CC0000CC0033CC0066CC0099CC00CCCC00FFCC3300CC3333CC3366CC3399 %CC33CCCC33FFCC6600CC6633CC6666CC6699CC66CCCC66FFCC9900CC9933 %CC9966CC9999CC99CCCC99FFCCCC00CCCC33CCCC66CCCC99CCCCCCCCCCFF %CCFF00CCFF33CCFF66CCFF99CCFFCCCCFFFFFF0033FF0066FF0099FF00CC %FF3300FF3333FF3366FF3399FF33CCFF33FFFF6600FF6633FF6666FF6699 %FF66CCFF66FFFF9900FF9933FF9966FF9999FF99CCFF99FFFFCC00FFCC33 %FFCC66FFCC99FFCCCCFFCCFFFFFF33FFFF66FFFF99FFFFCC110000001100 %000011111111220000002200000022222222440000004400000044444444 %550000005500000055555555770000007700000077777777880000008800 %000088888888AA000000AA000000AAAAAAAABB000000BB000000BBBBBBBB %DD000000DD000000DDDDDDDDEE000000EE000000EEEEEEEE0000000000FF %00FF0000FFFFFF0000FF00FFFFFF00FFFFFF %524C45FD25FF7DFD352752FD47FFA82727F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F8F827FD46FFFD3B27FD44FF7DF8F827F827F827F8 %27F827F827F827F827F827F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F827F827F827F8F87DFD43FF52F8FD3927 %F852FD42FF7DF827F827F827F827F827F827F827F827F827F827F827F827 %F827F827F827F827F827F827F827F827F827F827F827F827F827F827F827 %F827F827F827F87DFD41FFFD3F27FD40FF5227F827F827F827F827F827F8 %27F827F827F827F827F827F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F827F827F827F8F852FD3FFFFD3F27F827 %FD3EFF7DF827F827F827F827F827F827F827F827F827F827F827F827F827 %F827F827F827F827F827F827F827F827F827F827F827F827F827F827F827 %F827F827F827F827F87DFD3DFFFD4327FD26FFFD16A85227F827F827F827 %F827F827F827F827F827F827F827F827F827F827F827F827F827F827F827 %F827F827F827F827F827F827F827F827F827F827F827F827F827F827F8F8 %52FFFD15A8FD0CFF7D52FD73277DFD08FFA827F8F827F827F827F827F827 %F827F827F827F827F827F827F827F827F827F827F827F827F827F827F827 %F827F827F827F827F827F827F827F827F827F827F827F827F827F827F827 %F827F827F827F827F827F827F827F827F827F827F827F827F827F827F827 %F827F827F827F827F827F827F827F827F8277DFD05FF7DF8FD7727F8277D %FFFFFFA8F827F827F827F827F827F827F827F827F827F827F827F827F827 %F827F827F827F827F827F827F827F827F827F827F827F827F827F827F827 %F827F827F827F827F827F827F827F827F827F827F827F827F827F827F827 %F827F827F827F827F827F827F827F827F827F827F827F827F827F827F827 %F827F827F827F8277DFFFFFD7C27F827FF7D27F827F827F827F827F827F8 %27F827F827F827F827F827F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F827F827F827F827F827F87D52F8FD3527 %F827F8272752527D527DFD04522727F827F8FD352752F827F827F827F827 %F827F827F827F827F827F827F827F827F827F827F827F827F827F827F827 %F827F827F827F827F827F827F827F8F8F85252A8A8FD0AFFA87D7D5227F8 %27F827F827F827F827F827F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F827F827F827F827F8FD3227F82727527D %FD14FFA87D52F8FD3227F827F827F827F827F827F827F827F827F827F827 %F827F827F827F827F827F827F827F827F827F827F827F827F827F827F827 %52FD1AFFA82727F827F827F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F827F827F827F827F827F8FD31277DA8FD %1DFF7D52F8FD2E27F827F827F827F827F827F827F827F827F827F827F827 %F827F827F827F827F827F827F827F827F827F827F827F82752A8FD21FFA8 %27F8F827F827F827F827F827F827F827F827F827F827F827F827F827F827 %F827F827F827F827F827F827F827F8FD2C27F852A8FD25FF52FD2C27F827 %F827F827F827F827F827F827F827F827F827F827F827F827F827F827F827 %F827F827F827F827F827F852A8FD27FF7D27F827F827F827F827F827F827 %F827F827F827F827F827F827F827F827F827F827F827F827F827F827F8FD %2A27F87DFD2AFFA852F8FD2827F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F827F827F827F827F827F87DFD2CFFA852 %F827F827F827F827F827F827F827F827F827F827F827F827F827F827F827 %F827F827F827F827F8FD2827F8A8FD2FFF52F8FD2627F827F827F827F827 %F827F827F827F827F827F827F827F827F827F827F827F827F827F827F827 %F8A8FD31FF52F827F827F827F827F827F827F827F827F827F827F827F827 %F827F827F827F827F827F827F8FD2627F87DFD33FF27F8FD2427F827F827 %F827F827F827F827F827F827F827F827F827F827F827F827F827F827F827 %F827F852FD34FFA827F827F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F8FD2427F852FD16FFA8A87D7D5252527D %7DA8A8FD15FF7DFD2427F827F827F827F827F827F827F827F827F827F827 %F827F827F827F827F827F827F827F827A8FD13FFA87D2727F827F827F827 %F8F8F827277DA8FD13FF5227F827F827F827F827F827F827F827F827F827 %F827F827F827F827F827F827F827F8FD24277DFD12FFA85227F8FD0B27F8 %27F82752FD13FFFD2327F827F827F827F827F827F827F827F827F827F827 %F827F827F827F827F827F827F82727FD11FFA852F827F827F827F827F827 %F827F827F827F827F8F8F87DFD11FFA8F827F827F827F827F827F827F827 %F827F827F827F827F827F827F827F827F827F8FD2227F8A8FD10FF7D27F8 %FD1527F852FD11FF52F8FD2027F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F827F852FD10FF5227F827F827F827F827 %F827F827F827F827F827F827F827F827F827A8FD0FFF7D27F827F827F827 %F827F827F827F827F827F827F827F827F827F827F827F827F8FD2027F827 %A8FD0FFF7D27F8FD1927F827A8FD0FFF52FD2027F827F827F827F827F827 %F827F827F827F827F827F827F827F827F827F827F82727FD0FFF5227F827 %F827F827F827F827F827F827F827F827F827F827F827F827F827F827A8FD %0EFFA8F827F827F827F827F827F827F827F827F827F827F827F827F827F8 %27F827F8FD2027F8A8FD0EFF7DFD1F27F852FD0FFF52F8FD1E27F827F827 %F827F827F827F827F827F827F827F827F827F827F827F827F827F827A8FD %0DFFA827F827F827F827F827F827F827F827F827F827F827F827F827F827 %F827F827F827F87DFD0EFF7D27F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F8FD202752FD0EFF52F8FD2127F8A8FD0EFFF8 %FD1E27F827F827F827F827F827F827F827F827F827F827F827F827F827F8 %27F827F8A8FD0DFFA8F827F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F8F827FD0EFF52F827F827F827F827F827 %F827F827F827F827F827F827F827F827F827F8FD1E27F827FD0EFF52FD25 %27A8FD0DFF7DFD1E27F827F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F82727FD0DFFA827F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F827F827F827F827F852FD0DFFA8F827F8 %27F827F827F827F827F827F827F827F827F827F827F827F827F8FD1E27F8 %7DFD0DFF7DF8FD2627FD0EFF27F8FD1C27F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F827F8277DFD0DFF2727F827F827F827F8 %27F827F827F827F827F827F827F827F827F827F827F827F827F827F827F8 %F87DFD0DFF2727F827F827F827F827F827F827F827F827F827F827F827F8 %27F827F8FD1F27A8FD0CFFA8FD2727F87DFD0DFF52F8FD1C27F827F827F8 %27F827F827F827F827F827F827F827F827F827F827F827F827A8FD0CFF7D %F827F827F827F827F827F827F827F827F827F827F827F827F827F827F827 %F827F827F827F827F82727FD0DFF52F8F827F827F827F827F827F827F827 %F827F827F827F827F827F827F8FD1F27FD0DFF52FD2927A8FD0CFF7DF8FD %1C27F827F827F827F827F827F827F827F827F827F827F827F827F827F827 %F827A8FD0CFF52F827F827F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F827F827F8A8FD0CFF7D27F827F827F827 %F827F827F827F827F827F827F827F827F827F827F8FD1F27FD0DFF52FD29 %27A8FD0CFFA8F8FD1C27F827F827F827F827F827F827F827F827F827F827 %F827F827F827F827F852FD0DFF52F827F827F827F827F827F827F827F827 %F827F827F827F827F827F827F827F827F827F827F827F827F8A8FD0CFF7D %27F827F827F827F827F827F827F827F827F827F827F827F827F827F8FD1E %2752FD0DFF52FD2727F827A8FD0CFFA8F8FD1C27F827F827F827F827F827 %F827F827F827F827F827F827F827F827F827F852FD0DFF52F827F827F827 %F827F827F827F827F827F827F827F827F827F827F827F827F827F827F827 %F827F827F8A8FD0CFF7D27F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F8FD1F27FD0DFF52FD2927A8FD0CFFA8F8FD1C27F827F8 %27F827F827F827F827F827F827F827F827F827F827F827F827F827FD0DFF %7DF827F827F827F827F827F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F82727FD0DFF7DF8F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F8FD1F27FD0DFF7D27F8FD2527F852FD0D %FF7DF8FD1C27F827F827F827F827F827F827F827F827F827F827F827F827 %F827F827F8277DFD0DFF2727F827F827F827F827F827F827F827F827F827 %F827F827F827F827F827F827F827F827F827F8F852FD0DFF2727F827F827 %F827F827F827F827F827F827F827F827F827F827F827F8FD1E27F8A8FD0D %FF52F8FD2527F8A8FD0DFF52FD1D27F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F8F852FD0DFF7DF8F827F827F827F827F8 %27F827F827F827F827F827F827F827F827F827F827F827F827F827F827FD %0DFFA8F827F827F827F827F827F827F827F827F827F827F827F827F827F8 %27F8FD1E27F852FD0EFFFD262752FD0DFF7D27F8FD1C27F827F827F827F8 %27F827F827F827F827F827F827F827F827F827F827F827F8A8FD0DFF7DF8 %27F827F827F827F827F827F827F827F827F827F827F827F827F827F827F8 %27F827F82727FD0EFF52F827F827F827F827F827F827F827F827F827F827 %F827F827F827F827F8FD20277DFD0EFF27F8FD2127F87DFD0EFFFD1F27F8 %27F827F827F827F827F827F827F827F827F827F827F827F827F827F827F8 %52FD0EFF7DF8F827F827F827F827F827F827F827F827F827F827F827F827 %F827F827F827F827F827FD0EFF7D27F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F8FD2127FD0FFF52FD2127A8FD0EFF7DF8 %FD1E27F827F827F827F827F827F827F827F827F827F827F827F827F827F8 %27F827F82752FD0FFF27F8F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F8F852FD0FFF2727F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F827F8FD2227FD10FFFD1E2752FD0FFF7D %FD2027F827F827F827F827F827F827F827F827F827F827F827F827F827F8 %27F827F827F87DFD0FFFA8F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F8F852FD0FFFA827F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F827F8FD2327FD11FFFD1827F8277DFD10 %FF7DF8FD2027F827F827F827F827F827F827F827F827F827F827F827F827 %F827F827F827F827F82752FD11FF5227F827F827F827F827F827F827F827 %F827F827F827F8277DFD11FF2727F827F827F827F827F827F827F827F827 %F827F827F827F827F827F827F827F8FD2427A8FD11FFA852F8FD0F27F827 %277DFD12FF52FD2227F827F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F852FD13FF7D2727F827F827F827F827F8 %27F827F82752A8FD12FFA827F827F827F827F827F827F827F827F827F827 %F827F827F827F827F827F827F827F8FD2427F87DFD14FFA87D52FD0527F8 %27275252A8FD15FF27F8FD2227F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F827F827F827F8A8FD16FFA8A87DA87DA8 %A8FD18FF52F827F827F827F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F8FD2727FD34FF7DF8FD2427F827F827F827F827F8 %27F827F827F827F827F827F827F827F827F827F827F827F827F827F8F827 %FD32FFA8F827F827F827F827F827F827F827F827F827F827F827F827F827 %F827F827F827F827F827F8FD282752FD30FFA8FD2727F827F827F827F827 %F827F827F827F827F827F827F827F827F827F827F827F827F827F827F827 %F8F827FD2EFFA8F827F827F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F827F8FD2A2752FD2CFFA8F8FD2827F827 %F827F827F827F827F827F827F827F827F827F827F827F827F827F827F827 %F827F827F827F827F82727A8FD29FF7DF827F827F827F827F827F827F827 %F827F827F827F827F827F827F827F827F827F827F827F827F827F8FD2D27 %7DFD26FFA852F8FD2A27F827F827F827F827F827F827F827F827F827F827 %F827F827F827F827F827F827F827F827F827F827F827F827F852A8FD23FF %7D27F827F827F827F827F827F827F827F827F827F827F827F827F827F827 %F827F827F827F827F827F827F827F8FD2E27F8277DFD20FFA852FD2E27F8 %27F827F827F827F827F827F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F827F827277DA8FD1BFF7D52F827F827F8 %27F827F827F827F827F827F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F8FD3227F82752FD17FFA8A85227F8FD3027F8 %27F827F827F827F827F827F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F827F827F827F8F8F8527DA8A8FD0FFFA8 %A85227F827F827F827F827F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F827F827F827F827F827F8FD3627F827F8 %52527D7DA8A8FFA8FFA8FFA8A87D7D2727F827F8FD3427F827F827F827F8 %27F827F827F827F827F827F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F827F827F827F827F827F8272727F82727 %27F827F827F827F827F827F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F827F827F827F827F827F827F827F827F8 %FD3E27F8272727F8FD3E27F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F827F827F8FD812752F8F827F827F827F8 %27F827F827F827F827F827F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F827F827F827F827F827F827F827F852A8 %F8FD7D277DFF52F827F827F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F82727FFFFA827F8FD7A27FD04FF7D27F827F827F8 %27F827F827F827F827F827F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F827F827F827F827F827F8F8F8A8FD05FF %A852F8272727F8272727F8272727F8272727F8272727F8272727F8272727 %F8272727F8272727F8272727F8272727F8272727F8272727F8272727F827 %2727F8272727F8272727F8272727F8272727F8272727F8272727F8272727 %F8272727F8272727F8272727F8272727F8272727F8272727F8272727F827 %52A8FD08FFA85252FD7127527DFD04FFFF %%EndData endstream endobj 30 0 obj <>stream +%AI12_CompressedDataxœÝ½÷zòº²8üÝ÷ ½ÚôÞk€@„F(¦„ÖÚïùã\û'ÉݸQÖ³öù=ûYï¶<#FÓ4#YLíŽ'7ݍ OÀ‹ K$F‡7¢§ÆÚz}¤$|dvqÐ +4ÊÕ¢C¦á ARËÝ6Ž^¡—eøµ½¸$æ;cc4;Ûá0ÚàUwyXàåd´!ȑg9Ùm=Srô·w´t°¸°âèZE}þˆ‹ñx `Ì5Áûü.·óüî?q£njhü1†ð(x]]>”´7 aC/ˆ…Áa/†GÂà“ˆ G‚à»ânr܀^¶É݄ ¨Ân½#©¸±ðg´56Gsðfdëõîoc~=š¬ `ü¡ay¹&ÀP7£ƒ1ǝ«áþaþ¸\O›1hpÁǁ!‚Ø£(þ G†µ xÒ!Ð]€ÒöG:Ëÿà ÅB^$6Fƒ¸7Eé÷ÏÇ5Aö¶Ë—>ŠÑDhî¦Ät€ƒR^ÐØÑÿpþ_ºAwDΉ˜ÕÝúx@\ŘW€ÈÑNN#hí‰mw÷‚zêLñ½¡PØoÄ%p3F£!£?Œ„‘ƒÁJƒ…@ vLJLS‹\ΗÛ8ӳȰB.§üÔEüÆ(ýæ +þ‹±ÿѽ>ˆ-ÓkÀ2…¦€0o³0–¶ÓÂniOA¶s¿l±ÞÍéwÜßè øü¸§{~Á4µÉåÂ4<¢7Ña{}¯*ämg;ƒ^ÞíÑa˜šØN)°DégôO#ýxÚXþEÐÏÀ2Ý;TáuÉÑ 5¶Æ?Ää>fðuŽË¡ ¨3d"yòH-ŒÝÝnÍõOüŠë&ó=…íÿ;p´ÑÛ֖¦ô)&¦XÿuX@ke àå3ôÂh½^ÎÉÑ~±œÈ!yÏa¢ß ¬q’à¿G?Ùÿ×Á–6ãÝzImxnÁõx•«µG$xjË0„ØAØaù¶°!€JñA:žÅD ;Ç1À]ÞmÔ3d´:!!„¨ui3&àãl¹&¸–¸\Ëþb9YÈ´äf3Î8ìÙ9ÙýE{O¥Ô?˜¬—{0ÑÐû˜è9&uºê„_€·^n #u w+Bgã`ùXÆ6%Ñ"õüEL€ëÆ£õh;á$ ødGN‰)­«„êÙè{ÜD¯EB°K©Ý16`/àþÜxA «.eà7-¦ó]¾óBžFMTÈì7æjŒŽZýg äãu´ïg7ö‚õå©T¢K›íÁ²iNˆû,mF­–û1 òÊ¡Š”$À)öNâFëî‘<ìÆpsɇtJH déH·1’šá¾š;òBî)¦y…M—PBÀé¦UŒdºqÅé¾vªö{ÒKÇo”'¶™ÒÛ.Œ¸Ž…ØAHÛ ¼‡hЯÔJè7Ù‹Ä Œdjÿ1Éå_p椂Tú=¯ß19IO” ;"GÔ)O¦³ê}ƒ<(êÛ)À5é݀¯Õ:FN½;rîUí<Óæ¯1/mEMFk‚…¥Ùî/•ž£Fûõä2§Ðm&[J¤ Íh2ÖĒåÊùfå¥à¦žF`­S6r·Wîòl{ðN×¢)‘mCÉŒ* ‡‰ò®ðY«ô…òŽ—piª6Ùs ÿR7dëö€vTÚ¬ñ ²NLMI;j1’àU‚l+¨ù¶À°HW_Àä”ä8n'ºj=ÚnٝZyEˆZiIáÉF 8ì=oÇkìcca´ìÔøaïô[í‡ñ/¿z˜=mŸ‰½I Þˆ%ë2‰Ô`O $2jOàS‡5«P"e•µ1ágL{~Žô|³ŸBÊ­·º;µŸêNO÷UÒyK˜Ú „Ä젯偕Z¡HD½%Éë°(&¿‚¹¶t¨ESwîf3Š8h5[HšÉÚdS‚Zη#‘í*ÛMí˜ µh6°°j»5^6#™›ÒmÈS+[Vù ̔LÀPé*lÉy6c˜%¬®w$45΀]ìÈÿaØC¡Õ~G-E°¬ÐÃõh¯mm0íT,¤m‰-ÜÒ·~hõŒ?›z¾Sv€yãL_¼~y{6KÊbkP¾ëÐY÷@£)ÈlÒ2=`Pb<")âòv XMù £1'"t´%E†®Vk¡˜+6ߌÈ%Æ\¯u´ôZGk‰pS°õöäl·U[¸È’RÚé'6˜‚QBJ… òåZÎõˆ!hIÑRèpâ¨Ê·£C †hõʪÚþa!¥Œt€g²ù£&ûø†»ÃBÞqϱÍ®;.ÌQÛîø(’q¹EQ"(Y¡"o +uȵלcÛ`0ªÀ£ž…Á(a@5Õ@­µÃÚ£¡ƒ*ǝ^í¨ÓiB…‘X@H†‡ÝØØÚCX”±ÃŞÙ,ßb™é"í;º™t~„\ù%ïÈu +µZ4T$ î€/ƒ™–õݕì§l‰Ñ«û!`myòY²²YÄç[ÓCÙä¶Û +ˑ—2‡{ÕRø>žíUÒÍ`&Þø°5³äq)—üͨï1Œ*þçn̜M|yÙ¤{Oe©ºßg°d É6z8äçÕ§F6$:…e*=)z½¶ù ªÆtðEŠeK<òV9>óÁ7;·Ù5¨\­sX¸Òáûc¹4÷ó?k[ß`)ΰ‡±,0s$6‹¼<½äºï‹2Ra»øg6¹*fã”wã*º-Dz½2,ˆXåïaëXœ}ö#ùuvýŸå‡Â"ò†‹Èñm-NðÆo6™±õi8 ËTákþµY‹µi͔÷D̹Žç~K÷áu4=,±»kRš„žì…Ep˜Hæ,«+ÿèþve ¶^¹@é—‡ûEb2­à_KWiÖXИqÌ7ŠKów|ùõ0ͯ-›‡t}sŽõöߑM<,K8ñò™Ím'¶+ÕLø"›Ô2ñQ³@ŽœÔp×*Žs'Åê-b#"ý6/ ¾˜_¼™²{ÜD~ioè –l¡–¼ï—ܱæ¥ö¾OG +»/Wòeú÷ï?ØôÖ”;ïᔼ‡ûá§-¤S:¿r„= k¾Lþyß,úFIkÙäz#!–0|ñ…  & 6¾«Ñß®t9Éü•ì—êtó‚»ôMóü5Àº¯˜+.¹ýÅÌ<ÅÀ駒‰éÏãšI®Ã^+b°€Fù®Ÿ|p{ê6"‚èYȔ/©‹• †ßÂ?“\·øã*Î|õßÒhd3çÃãÞS¬myíåZ…|»8ë,³¿Ÿñ¹Á’ºCš˜oáé[iˆ»^òÁ×\«\üé ˟°/1ÛXæåẨ¦¿#‘çéŽÇíünê¹VÃY/Ó:M–Ð4ïƒÙ?ì½O®ÌËè—P:eÝÃ]®ûp8žMBY؉x%M,¨X9­ÂÁ`)½M-sÿw2SÄÊÙbäw²\Üát»ò»Ø—t®Ä”N,;4çdÔQ ŒEH§‡F%7|ÀÇ$]ûÄwÙ>«{sX²ûæw˜¿’tGÄäŸcDÙnÝ; +‹ðóªäjxË<§‚0ØA Ó)M!‡fÁ¢ÚXÁÐî…ù¢DE“Þs.òæïKç ]]¿ˆ`ßUJ÷8&7%±Q/,¹nsê&+惕\oQKA»Ê 2‹¦äÇü•`ó”sí²£½N”‹¡7¿+]ùö,ü¸À¨&³r©ŠäÃžÖ 8^¼úâFH‹¾ï½3ÿs˜nòëíË.×]¼šˆº‹°/¹wþ²ÕyÏ=Ï6ðÙ§5v5´´tg¶jôv· ¥`éåµÊŠp€ þÙ ”³óÔ+ðßÅqpÑÏõ,JÜΚ{£?kOI4^,üûÝ–̯ìûe9YÁíÙþöì it‰@XãØøX²§~û¼¦‘¼œl?Dæ {Dçä}ôە¨Q3 ±'÷¡<~\¿ç:ßæm,÷MV ^ÐäûH†5¿‡¹Î±äߢÆ@Ž›,9‰[éÙ®Oß ™i¶‘çÙ܎¿z¹€Õd.Až.à•B# ÿJc<…ãxwÛ îYšÿÂ`á[¢§ðgŠÂúý wþ'ø6EÍ"(ÀgyX.é)GBžâ³ø¶/Á&IÔþ,,\÷ò°Ñ#‡Æñ‰Ad¹Î§¹/¨ ìMu‰nuÄ`Aä ;iW›]ø,€ñX)‰Ø.K‘¢Ÿ¼ƒ…û}“€ïÑ02<)QsÔ=šŠÛyâ‰#AѓÒ”L˜}ñDÉLí!™ ý $ ÑILŽÿã0Wdú•KZ{Jè.£¿8ˆ4RñOš-€äWb E¶€ܨxV‘%z8ù”X)z¬hå°äHñc†[rD•¬TŽ€)šb’a"šÄÅ 2âÞ8Ì4OK¢ÆüªœÌϖhVÓ<×¢æ9™¥’àzØæ„ͤè³öØóI­Î/ˆäˆŠ2Ãcr [šç±!=%Ü¢¥%êãs8Š;Zè/šüp¨óðŸ7±éçÌu_êÛrÖFt¥?ó F,·ºrÞ(7ñ²ÉéZ Ž+Êj{X.ÅU¶ߛ–_Ãli²úµÒªL`N„mewFhv¸úȝ¾˜Ø¡A-Î=Ž múµkŽ^lj¼-ì>ûb³Ç +‹ãó[±^ÿÍ ”¹çm±•í|‘c`Á®³\ŒÅ…|‡ø#¶&=ßåô­ïÎñœÐ—}iâîúòa·ß#ðñüx^$œ¥*o[AKéáã ÃXaіÀuÀ5…¾ml]ÞÍhóìÀk|æÙùšÏ9Ø/`)k=ôvs¢Ã5–ҕΉׄ±ú8õÀ¡Ñ.³È÷ýZñJtí%«Ìô,+Æ>z}È#3–§êÿ-Ï9Ò¬?Uý(Öóa@à矲ïÎü“åó€Ìa(*"2tú"ˆíÓặXû‰Œx²ÏŽ!n[¼¬Ý\«WìV'͜|G”œ +šžépØÉ-€J~ž¿#ëß`áíÿӎ­bee!ÀòzJ Æüå>TöwãX̕>ŠÁ6œ”¤–0•\gu¯ç¿øä9Óòg{¦ã©v Ö*¨áôûßV÷…Ň):<²³ÿéÃõ‚µŸ_5]Àiς܉CÇà+¿ò§Lü ŽÙ±øt³Æà4=ˆ|äp¾œ,}x9(‘òקó¾\ÚÁªô[b›(ÍYn³ï=™4òOí,ЃÍ#ÓÑãÀ’{zì¼@_›}Ñÿ 04ÞY±Èê8nc½w]¡Z)Á̬J î[c6X8–,gIrÑ Æ›ý BÀ2‰oèÝ°Y¬PÀníóÕ|ð˜Çpw2‰æàý+KÔ=܋nð×»Ì!_¬äΒwÕ²ÓáqÕþ{ºÚé¹\:L 8Ò@69þÚfûO.k|áê,ò‹ý >Hç“FÕS| ß4rŒ©”¦[rëWLßêõ‡sV¤aFkýø £úêt®^à +îf…%µ è‚çý{(ý$uxù°O& ¹ÙÕæK}šÄñ¨ ØüeÇ }ÈÕø”žÆTýqZœnbn–ùìwÀOÏ`ÅBõžVFž)í¥tô¬Ÿ +ʼno+ÁЩÚöå×Þgíl‘Ùa°Ð{ÑÏÒðËò:?7eó_vNc-8¾R7l¶JÄjPçÌKcßÛRlà ‰ýŽ|wF_7æÀRŠô›ûŽXwÓ-#É@‰(}µÆC`›$ À™9Jö‘ ÚcO@üõ£´-À Üg“™žµXÛ,ßó¡—WoîÉٞ瞻.àYT,•ÏH~…OI¡©B+””¯X{o8¡±ñŒšéœìÈu>Úµš;åá½uPœzå×Q³»ø`wؑqí}dIÌ-+À±»ÄÌÜYÈ %úL•\ÎðL¨Þà\í‡ù¯ì‹ùpà07ÀÏMáC£ü 89ÔõzD¯l&¬ö^I2 8ýŠ"´ÍŸÙ,¾´=5IçΕ‹ƒªSnh¢v!—Á’øܽ¨5zqF'‰–¤I‚ør¬P-þ8O,KîÝ$cÏuBåÏÊæà´Áv?¬„9á¢{ +è’æ‚6d2á×Já±ð’‘ð³{AšÞÙüû &9û+°P˜·¿7XЈÌxÁú¬‡Ã©òo5Y\7B¼ÌLâ×½©8ë|ï +Ë;s0v°•Û¦k;9‚ó™®µ›ìc͙ϵâ¥z6‘ß -o¦gI{–ôĎP&gs‘Ïécqûö•ÞˆƒUBÏØië½ÿ5Èí-' ˜˜Y8s ýüà;:•© ¸$ +ä$¶Ê•º¹H왍Ãâ쉙Lo«÷åBîs^.dçÏUs +¯åb¾UN¾IÎù“}éÖFådñ è Ä÷wÙxŸ˜g£{rˆâ’§X€CçDs¸¨½Ð;RÚÌCIVÖ͍+©T~ù}K ¸‰ +AY¢`˜þ pǏ5û2ë°Óá‡cÑû<õdã?+qþé†ïÊÛ³õÂ-×ßô^ó ýDä·­} âë›%5’£Ú:«_UtË¥¤Ãlé^üæ7­tè”_žî€úZ½AK)Ûœ Z€©Öõg]8{Øl#X5êó»b)›êYòþëPœíH¯ Ãƀ֜;àÞÎk¹0ËøåÃø/Ð8ˆÀ@,mb•Í¯?KÌZ-Š•´…&F,LÇ`'/o6Q¶×¦}è\~@ñZ$’_ÐU8ºxÝå 8íŽhˆLôUTùɵð|¸Ù™U6™Þß ×"k¿¦>1ÊýN÷‚¥\ÈS‚‚?ł¡Ž~•ý]YtWnlK“Ð`öx2IJå"fÌÁ Ûåfvy,€òõ¨;°ž°y¼é +MÚµšt­TÛÓó¢Äø\ð;€EÜÝæ0¦ü˜ê+Md¨˜­îÙÆî4èÂ4#UÙ5Ú8d¬ WêáíA@ u>óëH֌\ f#3 7"Î#”ÏqÏ,Ir#† šU–_¯÷ßžç1Ú—ÆXÒ&´àˆaúEn="à®Ä=ܬÁrϻơènýNYKiuäz-Ô/‹µ4¹ OÆD–KÑçªÔØø­>7£œ˜m¬Và¶ÿ„y[HÆh‰]ò¢ÉXTlŠD¿äjÙ\€€_µvé&X†u3À\öÊa6X8Üýlr]vmp)°ŽòºƒKø·ðXŠ}#…âJSo1^8i ‡”²?9ÐCyô-ïãIÆ e•‡k_ÈÈð:y—rÑ +u€[ߞ²ýÁóRÀ{*AÄ­0æg‡súwƒ¬H(“3B,-¹èx?¨$pߞFU`ëí°ÄìHRÑ»s}‚/¸aÄ4Køu€½Ý)—³sÀäcwªÍ¿aäô":@?  اïöH²™ë¸³`^æέ bÎÒäx7ÌE=Þ;h†%ìÔіÈWÓiø¥÷ùd +ÕÂâ}z=¬»lò)ðU¬×“wÜf±ô3`•GÖR6ñÙfgäɅùÝ¿ åßV@çÎö¹çu¨/£×,åx½+Ö€íïó{±V¡ç „!©€Œ„T8ýë|(N +£UѹôMNd'®8IÅ ©Q2@û-Òý¾'¡ÃåÌ&¾°ïð/F-–Ÿ¬7*úÛVW*Wš‚uÞÍõ‹óàç +LÓ!+JÒMZ¶Ï’'Y±æ¼£# ¬°*ŧÓI7þø5>–¿? ˜«0­Ù Ìú&Öà>¿*Ú~Jo“ñ› Ä ÕSÎ=›H=9ô·Ë¯ŒŽùxåð;çêý|Søžœ>ÑÚ)p¼%݃z>u×RÅy À˺ßI÷±8-¹Ÿ¬^ÏM¹P*š—WÈcˆ0¡ð]l•ýid#w›þåóòtTñžõw?E_éǂD"ÀÂwj¾ÍOr­zî³Î`åôü‘~ -NÙ¨ÃÒÆíû𠛤’Âʼ ó°ùÆÈ/Má^þOy˜Î½ÃPNE.æ €¹ç¹n‘r‚>ìé,&Qø ˜ Ͳ ¬[­«äh6#/) '}ÚuŠ¦& +†ópîËöz>šk¿?|”&k,Òٜٵwû<æÄl]™?÷TöúŒ3OíŸ\·Wx—†îýÇ0ò%sék…/ .±ËÛákñsþ‰q³!(ÉBl°)Ö&v;; çìEßk—6±y'ô§H”vñHP5ù¤¦²µÒØ»r÷¦…¿X 4ýEó{#LíTÈTpâÀª«R(„„$Ì« ‘Jk-}¿Ï ܽ–‹‡73PêÙßüÊþùmüošKŒ§ÃQM¾Ž@ù¤S˜Î×.–é󘋻¿·ô‘GÒô?¿_.×\áct’un¼cK™ÂZŸ +j—ëËíT9±T髧ãHP­:Ð +9úsé8ÅßJ‡©Öaø¥bU¾kɂÜm/O"ùŒcµo¥ã ªÒ +BPoPnÙ¹•Mèf¿m¡Ê’2ø8Gþޑ«†zŠ¹âwy­LvÅ/Ÿ5rÏ?ìîÎ:%@&“¹ ÞÓi±²‰»âu !H8–~¯ãt ÙÊ?ýµñ +\®¯Æ_ÇDzåþjK‹="7!wãс>â]õ3¿@ôÀ¼zÈÓíÝz©VË~ÆŒPÛNÖGéwe/,zŽúrN½ÖNãË»F?EõEµ)€¸œ-¹"¾wÁÆË íݘ#<6û° ŒLiž‘bNÆ7þ½ ¶Fjô6Ú +o¥0ÂÁG|Ì痳G±x= +ÿŠýٍ{À­FÀø€ QÓàæ£åV¹÷é–Jö°ƒ &„q‰ÊFÆõè<öe´ßBӋŠ:N°{µmÕÆñ`hl[°8 w»~IÛ<Ú«o–è ¹Ü«W‘ðËUU6G@x zÒ«ìy¡~õ-˜š‘˜[F§q¼‡ÊzéFÛéˆÔa‡pçAjìó¯ sW´¡çaIVc)8ùBY¡¶Ï…^bÀÂr3õÙÎóel +õvló.¹Ü@Vê WPg&Ú:êS»/Œfì +4Òþˆí3HÍ…f¼¥#< [±õ31@V]dÀrªq兪†"ä×сè.Ž›ñv´\ëÐdb³”_Ú<ÐÝ©ÇrdJ½OŒá=(Úö¼ÄÐ=§3BsMmy +„€P…) }Ä>’s]Áá:Es˜ý^Þ¨³Z0b’;4B¸$ç;© ðþ~OèL¬u#PY%Z¯F{úü«%k%·|B[›N³ïNIþ–ñ™÷5}>¬ cßP—„Odëµ\éÐwĕyû0Ÿ«éte‡üËL>Å܋'î/ô"Ètùâ,VYUïŸS#¸m”æÞú]©çðÂäTS&Ïöl°˜\éUÒäx|‹™Ü‹%xõ=óš\ÇxÇän¾M¬éÇ|©¡Þºã)Hù©&è\qÌ´¾Ó|4 ¿…7o(g ño±ê(,$™NsîýãC¶£ÒÑj²ï-ïނ/%òã +¾•Ýr*—šàÎ\dË` ˜Ÿ\óàk„•†KÈhÄ̀b'I&¨.@â®a¾`‡ß3*Z>¼ø¿v++6µâs‹K~bTÀŽ]éŠÉŠŽæ¥¸òú¨h%ýMü€Ÿ•5øzP#ý ?›OòH+‘¯P¼öå•Eúe~l,´<Òð²^±È#Mšì$…[Hy¤mü#xç;y¤ –²¹›¤¡…}d”䑯Xs6e‘Þ•§aƒÅyv<ʍ+wûE¤á{K»“Ë)!ýÆ*÷o=)ªoäÐVäåBÉ|/`/¶×¨,ï÷ÇÎ|<Ê"}ià;E¤½Š¯²FH ™±Ö±—} «€4ãxùêçd‘ö3c§R “!Úá0wè+ø#ˆ}¶ºy¤­ùÏk1é”Eúyð>!¤P¿œŽuÓvY_•–±áÓoRi+ë ßsTA‚îâC´¥OXÀѪ©ÿˆ5h¤£»CE¼h2ä±ÿ„H]'‹¦uŸp|7C°*§Ö)ë·óÙÌ ]ŜMcŚ!„ÔoKÛ«b¤^’š?ÜC¤)Àˆ†×ôq.¤YêD~ìb4Ҍ½ä–×”+·l4ÒÏCüAD^Gϕ¨¦€Öw* +{¸'Ò°þ¤å£)¹Ì8¤ñ'¯x¤Õ^ÞbM"¤L¯Ñ@H!z¬÷ïThüކH±?Ƭw¯‡§@ê?‘Îdn¼í¹,¤üÛ|ÈäA¯ññ ûþ82%±Ú‡ë ð֖ÆGTû^î-˜²Ûdɛ‹ð­œ„©Ž·áHٌÃ÷'lsW]ìYU&÷vKFZŸÕä-7ûÕÃ!Š§ß"ò_׬¦l«_zRx{HÔk÷”üÛ:öi°4\®ÐQá}xø˜Mm +oë³v<òâ‘}}|ÃYMêwËP¬™¹¹ôœ¾ [{£÷RZámÒþRHö³’·ÅygßL.ó +_WÝÃB¸û!ÿ¶™+ÿ¤‡üÛÇg ‘¨aÉ¥ðþõg |~…·›ßgEDåß>Ûá瑇þV†bŸÎwŽ»O¿þ¾°òPæíè՟ºsGÊJ#^ˇ»!ÿõ û\Ø~jw²o-ý§é‹Ýô˜‘{K’©á“ÁÈ>Ùíð½÷ô½?_k=å7ðí‰"sà eú´eß¿ãv§%iúFoO(Þ§Îlß9â¿NïÉ=çñ푐JǪæ$½°êw»À¹f9×LèY˜œõnrŸû&÷Ëð+‡Ó®Éþî8¿ÚÐÿ,˜<õ!°…^Wú³tj·½éd>³¯Ýڀ;úzDÎò’fIí½o™;€…wWîŽO,7É;¿-Õö0Ύy'TÁéûÿÚÙ›ŸWB½/Dt|(#½+y‘bå|¸¥€4|¼¤m 1äъ¾TVL!e¤• +9à u!@­Þÿ†,ÒÊZLàO!Ò`Ç,$ïSöY€tjµÞóH–ĺ÷È£•rÛ^ip0PFzWžc¢U)F‹|¤À›¾ÃX éH)´Æ+X\q¬È"QD +푞yÝuô»}€6ŒmyBJ{£7Œ 0–4Å ¥õ¢cšÔ\?™Ð[z¿òÒht Ó³t È Îéu‰Ò»Hìë‹Dß]Fõ`¡áTÕ)ز:‘óôgËÒö˜XÕ9ì.qþÕkG}Ý©¯:1'!|õþ ¾{$c>ÙÕ¯‚À|zÖ ÍcêñV »V&Ë¯äU4k**O°Ç§ GìHžÑ~OÁ¹z"(Ҙ½@&ŸçL½'ð÷e€‰wÏR¢¢ýA¤‘;[©K ŸÝj‡í#KÎŁØW¥Må=>%#⵫“”óÓ`‘óÏ9‰æ”‘h½ó%šR„¬H4j%Ý­ÖoÁËSÞôau¥Î$̽¥T.Bçîڵߓ“h¬ýÞùM.và\/Ñz·Ù{Ep†Š[gYŒ8ô|ˆ} Š‘­–h˜¢-Ú:”·Q8Û’éŠ 8Ài§$©Ko⃎œ«×EGZÿ–<˜N9!ËEàϳØ9B­}E1;؟Ÿý ]Ì3ÛoÐ`¹Ú@).}FŽÔ;«7è[ÎÕ)Š¬%xºó® Gyå(šä²» ؙQ?5]èfbbmؿƾ1éÇ/҅×y|ÐÃÒP`œÓֆ˜÷QQŠ< ìê˜KÌa¾^‹õÏiÉj±þ5ö½ +£ ¯Òb}9û^ŠÁ¢ G—6Tׅ¬„Ý5ý×hC‰.„)án^2XNr_.JG‚£•Ó…¼®&OñiŠ¶èח¢;*"%Z•ê è,hX”:,]V&`º¤K€ +iETe­˜b[‹Þ™¤¥¥¢Gôªs«íž‚¥ãcÔª¯ åµÓé¤]’_¤4'ëX^Åä•QKEµ¤OVTLcJÅISÈ\Sö÷Ò\z%RêX\ÀÏ¿®Ô}#½)oêWªZórÖî vÐÍĚÓOVÚÏ$ädQú­*0£àõ©$ߎ€ª OøttJ-,¬²¸8ÌĀxƒN +—Á'<›ÅþlŽ˜Ü‹Ÿ¬Œk˜”+SÎ&Ö*WRìCÃk9‹bÊ[!g’‘h—RLø'‰N‡4%±Ç.t æUÍFf©+Æ-Uêå¤ÒB /p+»8ýÆê>dÌ:œƒgï$´«âì)œáÏî¬×€€eX²^‹Ð{ågZ&ÂR¹ gètgDÙçQ.qÓ^ûÚäPÞb”°½"1ç*h‘CÍr©ªyv¢ÏŽôRc¯ØŽ¬iUÅÒCªµ>l¥Ïöœ°Å‰«ÄZJªr2RG¹"Jn.²Ç@—,zÃœ=¦H§ƒ]ïrU/³³4:¥—NÒ]1 °vºX@«2N±K’zdXÎvVDF¥Kó´˜Z…¾ˆŒVvºŽ¢8•.IÏîÈà”$"0Çö>žˆL¯ß]Ÿ¥ö #"Ãíñi¸ ›‡k"2â»ðºíú¡ÉDdøìýehçGddªc¿—& çê¤"õ²ú¼s"2 +q~H­L{Å9€6a]œ¬/K"{<)4?™´óÆõËûú-j3=\=c@£AGáê· ê ¡ÉeΊ5²ž2´”ãü$9‰~Ù×u¥.h–IR”ªµêêÎËe”ÍP­ëÍ×S¯«ãuœj¥°v‚*®S>¤JÈÉúRõæ{›$m<³«gdъΠy¾ç-êáè|°øÕõp—œ?v~=œ|ô­ëá®ÊPÕ]§‘¡z£z8$“¯^Zõp²'‚*æ^Z'͆b·ÿn['sî(vãz8§Ü N0/”¾×ÃÉøb +Û:0’r靤^¬¬Î@ºs"%G +ۖzr"O²$.[û½ëËë¡ҙ © G-3X÷/„#qžÏé g!8×ÖØÓPNýfùxm‰ÖS ˆI󝙵¯º e¶ò` ›z!Žhr·ÿÈWzݤ"ªu0\oгÀ^”WŽ‚S\†¥Áå¤kÐûËp°¿ÉiÀŽÚ2Ôç½"8W,C!°¯<놆£¼Ÿ.š–bš5&>bFë44!¨“Óá]’|¦iJ«9ԂŠÔþ-*R?~oX‘ +€Ý®"õã÷©ø]è©£»¦[Š¾ŠTç*¹)¨Óuªˆfodݧs+Rõ-t‰åóúÐQ94õÜ$#x¢NÜî>Y†q»ÆDè‹k1¥pŠr즥pÐÓÌèò‚R8¥y¹m)ÜUqKÝ¥pçù•—–ÂIÎ ’ÿH)œlTáæ¥pJñ1þПzDäüd•Â'q‚Äy'ÂKí±ÁÍTƒgløXýìAdL|ù6̘2|Þ悸½àõéÚÂQI]€U~'1:!Å͒.éäAtTF=0 'úÖ8YvfM?tAfdö>‹ßÊ/¬ïo”ȯÔ0Õ-®pƒ¥÷=ô‹÷ÄC§˜quº©Ý·+ þª´AK[¡üúQžúmé»"m¢p¯ žü"Sìö˜ÖbÁ‚´“Ȼݿ ÚÂð•¨,/¼”ŠÝ^«ÎàÍ|¸J…ºV[iø^ªý©Tì¦Qa·(#…×j+"…—jϕj±â +;I±[;ä —€¡«¦9¤Òb7xAæZ©Â.èP©°»+¼ŠH±r=ÙV@ +ï㳋ßJÅnCµb7sXiåéþGzrŸ¥µlŽ”>«÷±þ¢ˆȱR©WϪ™>°€ý‹¹ÍîèLùtµ 0I;z½H[bßÎxNDW|w(ñªŒy”¢¼—d“Q¨µœ{͔[© Èrˆ÷ˆŠ:œô•ö¤$§j\sé—úQâ'9Wʝ*h䓪çypÞëÍn’“»GNöL•«n’;3 +wrèÙÅՐ;ƒÓ8G\œ×§z‰œF^ߍ.‘SŸÂ½o:su5»¤y׀n¢ëH¥¥vùýqú×ËNë¼|¹tW}ÐiEzϯ¦»4s^5œÀGánUM'WK'>Ì5Õtr1A™õre5\-Ý•glc+fÚ_\M'!‹´¶úFÕtr 4O9»šNΩק‘Ï©¦“Û§èÊUÓÉÕÒIvFnPM'gŸ w‹j:¹X;ï½ÞªšN圫VÓÉÕ҉sGoQM'§´Ñìß´šN®Kғ¯¯¦“›?ƒå,óTG5ÜüÉfC]UMw +JóNá ªé”mË[VӝE±‹«éNAÁ³Ôn]Mw)ÅΫ¦“ó° 7¯¦“€j«oZM'Àpój:¹Ý’“ø««éäjé¤ÞëõÕtråc❑[TÓÉÕÒIõËõÕtrÄݖu“j:•\7¨¦“«¥S¹ïz0c/’È”Ü/6×01tˆ™$t—¹›C_á“niA[·¾¯N®KªÖÅE÷Õ©Zúè¤y³­ˆI9*IëÄk: },P<ð +ŠUÏò:í’.Q ëv¹³øI®KtvGMG=½^:É%R¨I:zW¯¨’KìÉì=oÄ*A&ÍZ%2'ÐbÊݝQ³&͝øœ+}&ùù×Ü)K˜ûÃz¯¹S©äÒWH§ëLpõüd梻+ôp»¶¸EÇ5wz"Šç_÷£QT¹èNO­RAíš;¶öíœ<`ŨP ÓsÝˍù¬s®öõ›ÕYdâOºŠ_µS”ÀÐâö«kyöu]¹€?¹ÜQùB:ë +´ù³Îäóß N3÷× «ÂP9‰CoU$Lø&IduÅП”“õÜ°…däi=Q{£¨èäφRÚïåjÞ .TfCun— Õ¹e6TGg6”Fbs{£wñiT>:®Þ +AP7X΃s™ÊyIε+A‘Èn¥JaíÌ.L»°Våvia-wD±`åL­)u-­ÿT@¬p8ËÂS¶ù!0¿®ÌpîR$åᔐRÇ}¯*F´ÖÒ jðLzI“†'®˜CÝ;ËtW¹)ïf7B]y³ŠÍ—b!Ã9kŸZéºhH»ò1á¼Öœ(œžR|Ñn5‚s^=§Â=V'G_:*é=‰g^Ä#Y ê… gîðBÛËyRÈ`ûÕ¬Lѹ ¯ºáŽ¯¯”¿ãî¢exrÃÝå÷VŸs݊5Žî¸»EåcÑu£›ò4–î›ònR—¤tÇÝÙ£’=Úû¤.IÏE“gßp§qß«û4†¥}ÝÞSÍa’ÊM +»˜t eïUaíèn¨Q kÐ_X;ºˆ t8¡¢ÊÇÖ~üÊU·Ÿ{Î çÜh–ÜÎ +k!6ÑIÝӆ£|.œ0µFp&¤bSÿ¬úv™½ïŠ~;<2Ëðõ긖àÞ7åƒeDf€Ž"¦!)ñµÄZL³Œé¤"LŸÛ.˜EÇýõêd,Áª|Õ¦ÖSÄ4$%¾ûå~%,ôÔ[ÄÄÝ)|*¸E_”óY†!]‘êÕ[ƤË0,x=Ãb)x5t‰NÃp h¢¼‹sk\ó¯ œdϬ§OhW¬Óp‹ôîØГÞÑxa‚’ N^bÜäohn.¨Þ-xýuc +©<]UÏÚm z”¤êY­Æ•_½˜¯<ôÈácË̈Ifp ]¢×ÍDKñ­<èßJd6W w +yï¤PÈûê0³³ge-î]’ÜÃÖÛ¯ßåêá Xœö®rÑÝS¼-d%Q=œ+1i)á…NKÒ´ÊdqÁ–ríuWžú‘bånþI©ÁBßÃ&¬“"ýV»æÎ W‰‘TÜE bҋ‹FB¡öïήXšF¿qÙ"<@1Dàdb#¸sNR†'¹]O<ÒwµÊ¿_ƒ•Öþíº]E¤Ö±˜*!%䐲÷¾EŸ^ Œ•ß+ +H£UÑå…R¤O©@#ߣ¥ÉtýÅaÆOf_¾]B±“kÍâþhè‚t´évŒšl„eŒNvᖏ듻ŸTãÄY9m§–6é¢O—“ÜbfÝéÍSÓÍïEñ¾‚_G„D¹$éWo—è +•N• +£TØå؍R«Þ‹Š‰U⬎HRÛ&MAÓ1ur7³¼ÏK­R)“žòU€Ê]ÇJ$û•tNF%±žÎ¾”ï¬Ù.¾”O|[Ö?u)Ÿ\Táö—òißÈv‹KùhÙv:)^ʇvÏ»ï‚Kùä¢p·¿”Oõ~ä›]ʧ÷þÊ+.åE`§Á…NµzºJƒnõ»ÅÙPð^¿›TrÝìl¨ëîõMZØtA¶­ì½~êQ!™«‹îõ“p¥äV¿Kφ’Þë§RôÄϼ×Oa†˜[ý”Ά:÷^?]œ|õ½~ê™!‚ÈÕU÷úé¨äºÁ½~t%—R8—Ó/WÞë§>´Óû+/»×OýV¿‹n‘¹×O}@òªçßë';M꧚_p¯ŸzƙÂYÐbêè-?R,>X}WÝ맮èÐ.Ï îõS¿Õį̈ïõSwu² Ï¾×O.kŠ¿ÕïêûønPó®ÿ^?u(höop¯Ÿú†Š £ûª{ýÔ ge*R/º×O~C…½ÕOr;ÃÅ÷ú¦Á oõcó”..OaîõSf‰îºô^?Ù}΄ ½¤ëïõSO¸W¤^~¯Ÿ¨~ëäV¿“s®.¼×O€ìl×Þ맺Öz“oq¯Ÿúîð÷ñ]qŠ‡ø>¾ëëäoõ;¿šCþ^?õ-bålÛóîõS·äéš÷ëïõS¿Õï6UiZùËmîõSßo–f\z¯Ÿú­~WÜÇwF’†Ú}|W¦ÃÝêw“ûø4}i§7œÞëwÎU| sݽ~'Å¢[ý¸Š¡+ïõãØKöV¿KªÒÎ7syìÌ{ýÔ̜_àïßä^¿[Ô½jß맯îõÚ{ý8(:ïF¿ì^¿ór®dîõ»¼ž»ÕOt?²pWéìš'µ[ýTN9;ë^?9Ƙ'ZìÂ{ýԝNbJÞë§TÔ¢˜þš§¸]ߪ¼ú^¿óüÊKïõ ®“[ý®ÉÞë§ÎA^­{ýÔ Cn'ñÊ{ýÔ by|ݽ~ê·úÉØcÝë§fÑ6Ì-îõÓkÃ\w¯Ÿx&¥·ú©Vמq¯ŸºrШâÔ}¯Ÿºr`,%¸Ué=Q J—i½pšñ!9W*`Ž­|´Þ„vÑ.¦ârVO¼—-JäXÐý,Þ½±Š–½}# y!ÁÌ]‚Êب¨0Ø-Í ‚a&û»ãhòølMo 3³Iú©œÉ9'Ÿ|KÜè7C¹PØE-j¾Ýqd«ј3ón~»3ÕS®üì»|…ãæNÿ¾hYm; ±Ø{ –p§ñ;Œ¬¦yvõý¸¨Xìñ£úûÒÁ÷õYgñ´\÷*¾æñeXq؇ÂËñ3ý´6mWb¶w½e¤¥c·‘dÀlºÛ;Ÿ3/Ž·ÆäÅs5íé_ó¦×¾e[$ÉL¼mr~Vš&¾µv%&Á,VÆ2i¬Ü헱Êýî«´$¹ÌxÈã"m£lîÇ1¸‰©´Lÿ–\©èã;œ*{ÃJ/‘!IÍîáªl²‰™T_š¦Å·r®QNåRþ +HúA[þ÷YžXk<ØYôÌÀN&³Ûð£©ÿXwɍ•éñÛkvZ-¯ms4±Î[ڝʃí»SKcÖfØŇ‚iú(y" ë` W™º+×<&rù 8p>ÕÒ"Åë© \>ߖµ(¶ +Í &ޚç‡Æk!2›0ÎÎ,õó¿/YßÁYtłc_¾ä¯fÁ³æCvÖë>æªáïGW,”Ê”cæçiáóᾊFêÏ\%zY£]•t¥o‡Ù]E·åX¶Wk5¼ôO,…åȇÃÉٖ&«ßæ{]yüÃêԍùF¿¨ãÍ0#¿ +3µ[2½;/ËÊö{r†0_(è@?Ų;ð3îB?Ñ©MÏ¿àAÁ±ˆ„ý0'“ßå¡ã½ŽÍ¾²ól¢a"A¿ëŽº±í7÷Â)|Q°Œ¹0sXðª‡O¹W^á‹yjƽÀ/<æڂ}ñè@#Å+»÷̅,tóʗw½òàTöq >ó1*!ôˆÁ‚¥ ^ 7ü𧟆=þ²p°Ÿ\t“ñ‡§t9xË1DÜwO%]½N÷‚¹ÈçÔN¯&Ç[Çd°0ü;x÷ç6»•«÷ûß<{ùÇéŠzßÍO˜¿XMAK°Os·¿øVÃi¶/NZ!æ¯uϏþœ\<¾¡Åî/9FÃÍõ™ V6µ·–=·*—=Zô`,‚e +&Á_ɇ¬ÚgÐÚ/Gí–ì²—ÜšËpàÆvH€`v aÙõà@1¥{Ûèå,b·N‰üü à[Ÿ«ôòZ…¤ü`ò˜C¸]®‰îÁ?#Nzŏî:Aú4¿Ì\€õÎÜ] -‰7 Ï_Hš9‰v$I‹ÌY/þ.òàƒaîøwÛ>¸zü$B¿2v€‘Þº‹ëò'èT ô1]@RǼé^†‘wéš ëZ +¤#/ÕÂ÷*7ã>Ï4©ÄpršèÂc@›(Nïñ™ñJÏó;oIöÒäÌ¡©râÅ3mXQ-Ž!vHù~Å…®Sƈ»×šè¼ãö‰Qß)Ò%4s€d¦#Pûp{…÷¿ -—î 0³øù–ž¨Xœ6dîÁ³è‘6x¬oþR£Ëâ“-À“<½Á¨Z«¼!iBWÑÃR×ýèÊ# ¤ »ê‚y¹g>î˜0w¨“ƒDŒ(†Ù½oʳ£FG<|³'¤  lnÑ ûØüü$X‘qÀH'8 úzbÆÂÒvÀš7Ž|uÏ?ëޣȬ´n˜yÉ;êœMQýôÞýô9­(êÛ;É%Ɍ5‡é¤)ˆ´VL™¾ÿˆC¤wüÙPsß±½Ôù;$x'cþÊjDfö…·éK¯GD„à/G„/™—ôϟ8¼ I 9iãþålKE"Œ’<ïk<*͇ Ü-$m[ÊÁËsÿ«iç+ÑD óƒw}|€ÒÀcMèvl†¦ õnåˆðªÂô¹Ö4?„T2’˜ýhS^?ˆS/; áÙú@ ör+B}=ˆ¢£èx´ë†1$åHW¥*ˆ1uþ0DU°XüÊa,L%a)ƒEˆµI„P´_¶×­îö`§J~ û+û0üE±qzg£=&uô^ûJ½ (ÍÙpš2…ߝÀ‚f)šb1U{uÔ˕ìÚ?±3i“RUå‘w,€ÁF(-±js0¶|p¼3ô+VÅ·"÷eqei…Èñ˜a„žùU™ÝÁ‚ðØE“3Xéb“‚دiâxì"¡@ïôöã1I/Æã+Wüx!˜N!bE]«‘ÇÛÃu+~ü+]®º5òX.U;,“t‰i¢m^Œ8d£ÈÔâ|à/‘—42o>hؖ0Þmþuˆ‚1ÆÑâ|?Æ3¬rŽ$Ä }‚ZA³êD.3ܪ„güVé }* ´½ª^îC#)ô±ÒA;×ÑOlj·ÇÙq'ÿ…ªØY7za° W~[¦‘f_•½ü7þÏãW–}ÑÀøùB̕¬‹§¬®åqWÊþ `pc¥ácœëJ ƒž±+`ŽmƒTz~¸Ç£CŒÐ.¸`7ø'p»æá=¾£“ñˆÚ /j¼^m?cÐÆÁ?Søó•Èt‹æÏaö:ؐO Í$ÀRÀ ÒAËË` 䣁h‚ørÌ +‹p¹•_Gï£B7Î%tCY]¸× à<ûu(кЀÓÃx8á^*^Èõ¬‰ïÂ"Rß纹m2v̟w~1‘›Éë’ Z#ѳÿ-œËqÃÍMθë^`yŸQ Ò ÏTqЍî^P4’·ã¤ÿÊ¿ª0r3L“¬Ñ}¥½$>–‹L®‰7ՕE¯Bbãèÿ¬Bb¥Ñ?«€4â×Â?¦h™÷õ+$Næý£ +‰Á¢¥Ø¸( LšY£©š –Ë!êWR€“•ÔÔ •”Á"«¦ø}qq. øÌ-»ìã:–=ZôpísË3;”nPŽµáÚ¯šÜŽLWfٛ¥Ëžæ@ ïh•YúÈ¡ýG'wb¨³g~a t7‚vԅ+ux(—üÍ(³Ø~‚w4Áø~ÕAGWg¶_ôü3ØÑۑ~[ÖôÉì%¼è±Tۍˆå[¾¼´Ú[ºã.´M0'JréZ`Âë¼íÂ0öiÙIGüêEgǵ“N¹Ø.×݌úìá^™ýG«· wó¿az{¨G'½Wm„œPƒ¨l<ó¼‘?IFdsy1ñ_l^ƒ¹ôR éÃga@­KöL¦ƒ ŠPm™= ³â Vsl<µsžn^xš|øÖo ¢Ýð½É’7Y«Ē÷ @àå× +ÎïÅ1‹jdhêù–é^ ™rA҈?Ùg/¿ì³é[¶¶.~WVâf™‰W„ +t¢sÐ^“Š`°8³}çˆÝ8@Lu²q@o@#òÂm:sÊqeÌ×pñµã‚«èž%B6àÖý͒ èãI{³l@ÚådE"dâ«-K§E¼màÑ»}„Îö“#BJ;@ Æ™xûÀïœ,gm Ñ › m,ўKE!# ,' ~ûY N ;ðD˜}'Ý èû»NW„úzf³2ÅW ƒN›> Y•ª ÐmçC&;ïšaôâ>Åí8çÐâ+‹]¸­Éì9ý{û5«º©u@Âh€ˆœ×õ¡`q±{›:gw7\n}0XTzÑÃ=×ì¯âî¯ÍRˆb—0²fôr%»ç,±/`š¤TSys G¨»J5ÏKËð=Üùþ´†•ƒiYþÁùv0â[Ø®qçd)‹ôCYZ!r<¦F˜Ê—WÏü*ÏneôðâS#Ň{C‡¶™¨|¾Eç¹ÎѼ,½MÛ0ÞÞÅyîE·s¼ÁW€e¯nP˜Sš‰pÙÁ}“XúT€â¡ïcÙ¾`?¡ÃÕÇÙ¸d•?ìõèo®Î!$ܦ±ú¬tB7óasËp|‹pÒS…Ž¿ $nèbLw¿4b"WÐY@ÑQ;Zv;ŠžòÁTŸ¿èyw¡…Æ­&â´Ö`-×+—¥ÉÞ·–žätîŽP ƒÕ>OLM.[˜‹Â¯ÐóJ"¯h¤xékúŽ: ×¢‡^„tœ¬?˜eÌ­@>ŸÓ[­Ñ΄4¿›ÝtÈCmïeÆWɺ˜”O:¡—úß´p/Ün–¶SáVƒÁbO:Äḇ BÃ<1_n£?iÀôÿ0ð?øo$fÄýQ£??Bðicl°£¶FÜall –¡/GŠËÉa¹ÛŽÈ?Æ8|ôÚlôjEcÜH·‚¶ £ô‚Öà•îo A‡̘ÿ½þmÀÄàÇðãüñým ›Æ÷OÌ8…íž Ñ` v÷bÁpи1ØF§|Gڕ9ã碐µ ˜7 âxÔþàHþÇÂ|Šxüáçþ{àïà‘°c òÆüÁ(ó,36À3̋¢¸1„ãÞX,‚Ãgˆ7 Á³ˆ7 D€|€£˜¼üá°†Cü³x†y#ÿ¡?­b1ü‹Áò{ýá€_Ø ÷F#ß]ðÌï÷FbÁ ÿlmðãk8Â?òãÝ( yÈ’{Ñm +îY´Â±0Ï=‹F½!Ü1²ÀÑ݈ë÷¤À–{ó †øgh˜mÅ矰]°Øg\W‚gì€8èÜ O'·`˜N)ü±¨7ú‹N86Äï ‡‚þ¤uÈÄAËX Æþ é݉yÁ¼±hP˜Œù²ÐH¸ßCÀ¾†"ü³àúÁ#@?Yôܧ|ÿ$c˜€±9{*+…íO$À :êìäÇùgþf Bö G˜‚ß~08˜€ûrƒp¸ìo0<è ûXâžüH3óS0dúÛ×?ÉࠕGÜÈÓBˆP$Ú<À ±´Gs¢KŽ–k BçÔè/Â8Únw‡ÑØƒ7Æ9IP‡I©Åîoø|Â6¸U6üÿúj  endstream endobj 38 0 obj <> endobj xref 0 43 0000000003 65535 f +0000000016 00000 n +0000014224 00000 n +0000000004 00000 f +0000000006 00000 f +0000014674 00000 n +0000000007 00000 f +0000000008 00000 f +0000000009 00000 f +0000000010 00000 f +0000000011 00000 f +0000000012 00000 f +0000000016 00001 f +0000014275 00000 n +0000014533 00000 n +0000014564 00000 n +0000000017 00000 f +0000000018 00000 f +0000000019 00000 f +0000000020 00000 f +0000000021 00000 f +0000000022 00001 f +0000000023 00000 f +0000000024 00000 f +0000000025 00000 f +0000000031 00000 f +0000016399 00000 n +0000016473 00000 n +0000016647 00000 n +0000017628 00000 n +0000031546 00000 n +0000000000 00001 f +0000014649 00000 n +0000014346 00000 n +0000014417 00000 n +0000014448 00000 n +0000015725 00000 n +0000015019 00000 n +0000053083 00000 n +0000015838 00000 n +0000015886 00000 n +0000015455 00000 n +0000000162 00000 n +trailer <<9B64ED4272634A6ABA86CC1FA8D7917D>]>> startxref 53206 %%EOF \ No newline at end of file diff --git a/www/iphone/UiUIKit/images/camera-roll.png b/www/iphone/UiUIKit/images/camera-roll.png new file mode 100644 index 0000000..e4e4119 Binary files /dev/null and b/www/iphone/UiUIKit/images/camera-roll.png differ diff --git a/www/iphone/UiUIKit/images/chat_bubbles.psd b/www/iphone/UiUIKit/images/chat_bubbles.psd new file mode 100644 index 0000000..dd6d4e8 Binary files /dev/null and b/www/iphone/UiUIKit/images/chat_bubbles.psd differ diff --git a/www/iphone/UiUIKit/images/chat_bubbles_aqua_l.png b/www/iphone/UiUIKit/images/chat_bubbles_aqua_l.png new file mode 100644 index 0000000..2a8e638 Binary files /dev/null and b/www/iphone/UiUIKit/images/chat_bubbles_aqua_l.png differ diff --git a/www/iphone/UiUIKit/images/chat_bubbles_aqua_r.png b/www/iphone/UiUIKit/images/chat_bubbles_aqua_r.png new file mode 100644 index 0000000..cb61fec Binary files /dev/null and b/www/iphone/UiUIKit/images/chat_bubbles_aqua_r.png differ diff --git a/www/iphone/UiUIKit/images/chat_bubbles_clear_l.png b/www/iphone/UiUIKit/images/chat_bubbles_clear_l.png new file mode 100644 index 0000000..19dc7d6 Binary files /dev/null and b/www/iphone/UiUIKit/images/chat_bubbles_clear_l.png differ diff --git a/www/iphone/UiUIKit/images/chat_bubbles_clear_r.png b/www/iphone/UiUIKit/images/chat_bubbles_clear_r.png new file mode 100644 index 0000000..6194d28 Binary files /dev/null and b/www/iphone/UiUIKit/images/chat_bubbles_clear_r.png differ diff --git a/www/iphone/UiUIKit/images/chat_bubbles_graphite_l.png b/www/iphone/UiUIKit/images/chat_bubbles_graphite_l.png new file mode 100644 index 0000000..2f0f6c0 Binary files /dev/null and b/www/iphone/UiUIKit/images/chat_bubbles_graphite_l.png differ diff --git a/www/iphone/UiUIKit/images/chat_bubbles_graphite_r.png b/www/iphone/UiUIKit/images/chat_bubbles_graphite_r.png new file mode 100644 index 0000000..c51369d Binary files /dev/null and b/www/iphone/UiUIKit/images/chat_bubbles_graphite_r.png differ diff --git a/www/iphone/UiUIKit/images/chat_bubbles_lemon_l.png b/www/iphone/UiUIKit/images/chat_bubbles_lemon_l.png new file mode 100644 index 0000000..7cbdf987 Binary files /dev/null and b/www/iphone/UiUIKit/images/chat_bubbles_lemon_l.png differ diff --git a/www/iphone/UiUIKit/images/chat_bubbles_lemon_r.png b/www/iphone/UiUIKit/images/chat_bubbles_lemon_r.png new file mode 100644 index 0000000..3508405 Binary files /dev/null and b/www/iphone/UiUIKit/images/chat_bubbles_lemon_r.png differ diff --git a/www/iphone/UiUIKit/images/chat_bubbles_lime_l.png b/www/iphone/UiUIKit/images/chat_bubbles_lime_l.png new file mode 100644 index 0000000..4be16be Binary files /dev/null and b/www/iphone/UiUIKit/images/chat_bubbles_lime_l.png differ diff --git a/www/iphone/UiUIKit/images/chat_bubbles_lime_r.png b/www/iphone/UiUIKit/images/chat_bubbles_lime_r.png new file mode 100644 index 0000000..a36ab6c Binary files /dev/null and b/www/iphone/UiUIKit/images/chat_bubbles_lime_r.png differ diff --git a/www/iphone/UiUIKit/images/chat_bubbles_orange_l.png b/www/iphone/UiUIKit/images/chat_bubbles_orange_l.png new file mode 100644 index 0000000..d0fc14d Binary files /dev/null and b/www/iphone/UiUIKit/images/chat_bubbles_orange_l.png differ diff --git a/www/iphone/UiUIKit/images/chat_bubbles_orange_r.png b/www/iphone/UiUIKit/images/chat_bubbles_orange_r.png new file mode 100644 index 0000000..2c73d6a Binary files /dev/null and b/www/iphone/UiUIKit/images/chat_bubbles_orange_r.png differ diff --git a/www/iphone/UiUIKit/images/chat_bubbles_pink_l.png b/www/iphone/UiUIKit/images/chat_bubbles_pink_l.png new file mode 100644 index 0000000..b811fe3 Binary files /dev/null and b/www/iphone/UiUIKit/images/chat_bubbles_pink_l.png differ diff --git a/www/iphone/UiUIKit/images/chat_bubbles_pink_r.png b/www/iphone/UiUIKit/images/chat_bubbles_pink_r.png new file mode 100644 index 0000000..04d4e7d Binary files /dev/null and b/www/iphone/UiUIKit/images/chat_bubbles_pink_r.png differ diff --git a/www/iphone/UiUIKit/images/chat_bubbles_purple_l.png b/www/iphone/UiUIKit/images/chat_bubbles_purple_l.png new file mode 100644 index 0000000..345cb24 Binary files /dev/null and b/www/iphone/UiUIKit/images/chat_bubbles_purple_l.png differ diff --git a/www/iphone/UiUIKit/images/chat_bubbles_purple_r.png b/www/iphone/UiUIKit/images/chat_bubbles_purple_r.png new file mode 100644 index 0000000..1495560 Binary files /dev/null and b/www/iphone/UiUIKit/images/chat_bubbles_purple_r.png differ diff --git a/www/iphone/UiUIKit/images/chevron.png b/www/iphone/UiUIKit/images/chevron.png new file mode 100644 index 0000000..1f422a9 Binary files /dev/null and b/www/iphone/UiUIKit/images/chevron.png differ diff --git a/www/iphone/UiUIKit/images/chevron_b.png b/www/iphone/UiUIKit/images/chevron_b.png new file mode 100644 index 0000000..451d311 Binary files /dev/null and b/www/iphone/UiUIKit/images/chevron_b.png differ diff --git a/www/iphone/UiUIKit/images/chevron_dg.png b/www/iphone/UiUIKit/images/chevron_dg.png new file mode 100644 index 0000000..b8590a5 Binary files /dev/null and b/www/iphone/UiUIKit/images/chevron_dg.png differ diff --git a/www/iphone/UiUIKit/images/chevron_w.png b/www/iphone/UiUIKit/images/chevron_w.png new file mode 100644 index 0000000..8970e39 Binary files /dev/null and b/www/iphone/UiUIKit/images/chevron_w.png differ diff --git a/www/iphone/UiUIKit/images/gallery/image01.jpg b/www/iphone/UiUIKit/images/gallery/image01.jpg new file mode 100644 index 0000000..e1d98b1 Binary files /dev/null and b/www/iphone/UiUIKit/images/gallery/image01.jpg differ diff --git a/www/iphone/UiUIKit/images/gallery/image02.jpg b/www/iphone/UiUIKit/images/gallery/image02.jpg new file mode 100644 index 0000000..8bcaaf1 Binary files /dev/null and b/www/iphone/UiUIKit/images/gallery/image02.jpg differ diff --git a/www/iphone/UiUIKit/images/gallery/image03.jpg b/www/iphone/UiUIKit/images/gallery/image03.jpg new file mode 100644 index 0000000..57d45c2 Binary files /dev/null and b/www/iphone/UiUIKit/images/gallery/image03.jpg differ diff --git a/www/iphone/UiUIKit/images/gallery/image04.jpg b/www/iphone/UiUIKit/images/gallery/image04.jpg new file mode 100644 index 0000000..1c1c308 Binary files /dev/null and b/www/iphone/UiUIKit/images/gallery/image04.jpg differ diff --git a/www/iphone/UiUIKit/images/gallery/image05.jpg b/www/iphone/UiUIKit/images/gallery/image05.jpg new file mode 100644 index 0000000..b844b31 Binary files /dev/null and b/www/iphone/UiUIKit/images/gallery/image05.jpg differ diff --git a/www/iphone/UiUIKit/images/gallery/image06.jpg b/www/iphone/UiUIKit/images/gallery/image06.jpg new file mode 100644 index 0000000..1ba2c45 Binary files /dev/null and b/www/iphone/UiUIKit/images/gallery/image06.jpg differ diff --git a/www/iphone/UiUIKit/images/grayButton.png b/www/iphone/UiUIKit/images/grayButton.png new file mode 100644 index 0000000..83f2c45 Binary files /dev/null and b/www/iphone/UiUIKit/images/grayButton.png differ diff --git a/www/iphone/UiUIKit/images/greenButton.png b/www/iphone/UiUIKit/images/greenButton.png new file mode 100644 index 0000000..96ea153 Binary files /dev/null and b/www/iphone/UiUIKit/images/greenButton.png differ diff --git a/www/iphone/UiUIKit/images/image-loading.gif b/www/iphone/UiUIKit/images/image-loading.gif new file mode 100644 index 0000000..f5c07e4 Binary files /dev/null and b/www/iphone/UiUIKit/images/image-loading.gif differ diff --git a/www/iphone/UiUIKit/images/iphoneuikitlogo.png b/www/iphone/UiUIKit/images/iphoneuikitlogo.png new file mode 100644 index 0000000..0458a8a Binary files /dev/null and b/www/iphone/UiUIKit/images/iphoneuikitlogo.png differ diff --git a/www/iphone/UiUIKit/images/kitbg.png b/www/iphone/UiUIKit/images/kitbg.png new file mode 100644 index 0000000..b310430 Binary files /dev/null and b/www/iphone/UiUIKit/images/kitbg.png differ diff --git a/www/iphone/UiUIKit/images/list-icon-1.png b/www/iphone/UiUIKit/images/list-icon-1.png new file mode 100644 index 0000000..024451b Binary files /dev/null and b/www/iphone/UiUIKit/images/list-icon-1.png differ diff --git a/www/iphone/UiUIKit/images/list-icon-2.png b/www/iphone/UiUIKit/images/list-icon-2.png new file mode 100644 index 0000000..38cca3f Binary files /dev/null and b/www/iphone/UiUIKit/images/list-icon-2.png differ diff --git a/www/iphone/UiUIKit/images/list-icon-3.png b/www/iphone/UiUIKit/images/list-icon-3.png new file mode 100644 index 0000000..85ff75f Binary files /dev/null and b/www/iphone/UiUIKit/images/list-icon-3.png differ diff --git a/www/iphone/UiUIKit/images/list-icon-4.png b/www/iphone/UiUIKit/images/list-icon-4.png new file mode 100644 index 0000000..e8b6e41 Binary files /dev/null and b/www/iphone/UiUIKit/images/list-icon-4.png differ diff --git a/www/iphone/UiUIKit/images/list-icon-5.png b/www/iphone/UiUIKit/images/list-icon-5.png new file mode 100644 index 0000000..456dc4f Binary files /dev/null and b/www/iphone/UiUIKit/images/list-icon-5.png differ diff --git a/www/iphone/UiUIKit/images/masterlogo.psd b/www/iphone/UiUIKit/images/masterlogo.psd new file mode 100644 index 0000000..629049c Binary files /dev/null and b/www/iphone/UiUIKit/images/masterlogo.psd differ diff --git a/www/iphone/UiUIKit/images/minid-profile.png b/www/iphone/UiUIKit/images/minid-profile.png new file mode 100644 index 0000000..ae10ec8 Binary files /dev/null and b/www/iphone/UiUIKit/images/minid-profile.png differ diff --git a/www/iphone/UiUIKit/images/minidlastfm.jpg b/www/iphone/UiUIKit/images/minidlastfm.jpg new file mode 100644 index 0000000..6c951e2 Binary files /dev/null and b/www/iphone/UiUIKit/images/minidlastfm.jpg differ diff --git a/www/iphone/UiUIKit/images/profile-user.png b/www/iphone/UiUIKit/images/profile-user.png new file mode 100644 index 0000000..d65596b Binary files /dev/null and b/www/iphone/UiUIKit/images/profile-user.png differ diff --git a/www/iphone/UiUIKit/images/redButton.png b/www/iphone/UiUIKit/images/redButton.png new file mode 100644 index 0000000..af24f71 Binary files /dev/null and b/www/iphone/UiUIKit/images/redButton.png differ diff --git a/www/iphone/UiUIKit/images/standard-img.jpg b/www/iphone/UiUIKit/images/standard-img.jpg new file mode 100644 index 0000000..5c186d4 Binary files /dev/null and b/www/iphone/UiUIKit/images/standard-img.jpg differ diff --git a/www/iphone/UiUIKit/images/standard-img.png b/www/iphone/UiUIKit/images/standard-img.png new file mode 100644 index 0000000..158d06b Binary files /dev/null and b/www/iphone/UiUIKit/images/standard-img.png differ diff --git a/www/iphone/UiUIKit/images/stripes.png b/www/iphone/UiUIKit/images/stripes.png new file mode 100644 index 0000000..1760f9b Binary files /dev/null and b/www/iphone/UiUIKit/images/stripes.png differ diff --git a/www/iphone/UiUIKit/images/toolButton.png b/www/iphone/UiUIKit/images/toolButton.png new file mode 100644 index 0000000..afe4d7a Binary files /dev/null and b/www/iphone/UiUIKit/images/toolButton.png differ diff --git a/www/iphone/UiUIKit/images/whiteButton.png b/www/iphone/UiUIKit/images/whiteButton.png new file mode 100644 index 0000000..ce8c9cb Binary files /dev/null and b/www/iphone/UiUIKit/images/whiteButton.png differ diff --git a/www/iphone/UiUIKit/index.html b/www/iphone/UiUIKit/index.html new file mode 100644 index 0000000..487b80c --- /dev/null +++ b/www/iphone/UiUIKit/index.html @@ -0,0 +1,47 @@ + + + + + + Universal iPhone UI Kit + + + + + + + + + +

Main index

+ + + +
    +

  • This framework and its contents are in no way affiliated with, endorsed by, or supported by Apple Inc.

    • +
+ +

Best enjoyed on a real iPhone
This iPhone UI Framework kit is licenced under GNU Affero General Public License (GNU AGPL 3)

+ + + + + \ No newline at end of file diff --git a/www/iphone/UiUIKit/info-lists-example.html b/www/iphone/UiUIKit/info-lists-example.html new file mode 100644 index 0000000..76356aa --- /dev/null +++ b/www/iphone/UiUIKit/info-lists-example.html @@ -0,0 +1,52 @@ + + + + + + Information Fields + + + + + + + + + + + + +

With images and content

+ + + + + +
    +

  • This is how the picture works: You only need to print in the HEAD element of this page an STYLE element with a li.picture class and a background property.

    View the source of this page as an example.

    Only two LI elements can be used on UL.profile. The first one sets the picture dimentions, background and borders. The other holds the data, cleaning all possible styling.

    Both Title and description on the second LI will overflow hidden with ellipsis if the text is really longer, but if you use horizontally it will scaled perfectly. You can test it on this page by turning the iPhone/iPod Touch vertical and horizontal position.

    • +
+ +

Best enjoyed on a real iPhone
This iPhone UI Framework kit is licenced under GNU Affero General Public License (GNU AGPL 3)

+ + + \ No newline at end of file diff --git a/www/iphone/UiUIKit/info-lists-without.html b/www/iphone/UiUIKit/info-lists-without.html new file mode 100644 index 0000000..372e1b2 --- /dev/null +++ b/www/iphone/UiUIKit/info-lists-without.html @@ -0,0 +1,47 @@ + + + + + + Information Fields + + + + + + + + + +

Generic Fields

+ + + + + + + + + + +

Best enjoyed on a real iPhone
This iPhone UI Framework kit is licenced under GNU Affero General Public License (GNU AGPL 3)

+ + + \ No newline at end of file diff --git a/www/iphone/UiUIKit/info-lists.html b/www/iphone/UiUIKit/info-lists.html new file mode 100644 index 0000000..b1ae2fb --- /dev/null +++ b/www/iphone/UiUIKit/info-lists.html @@ -0,0 +1,33 @@ + + + + + + Information Fields + + + + + + + + + +

Field sets

+ + + +

Best enjoyed on a real iPhone
This iPhone UI Framework kit is licenced under GNU Affero General Public License (GNU AGPL 3)

+ + + \ No newline at end of file diff --git a/www/iphone/UiUIKit/licence.txt b/www/iphone/UiUIKit/licence.txt new file mode 100644 index 0000000..dba13ed --- /dev/null +++ b/www/iphone/UiUIKit/licence.txt @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. diff --git a/www/iphone/UiUIKit/normal-contact.html b/www/iphone/UiUIKit/normal-contact.html new file mode 100644 index 0000000..64397fa --- /dev/null +++ b/www/iphone/UiUIKit/normal-contact.html @@ -0,0 +1,53 @@ + + + + + + Normal lists + + + + + + + + +

E

+ + + +

F

+ + + +

Optional List

+ + + + + diff --git a/www/iphone/UiUIKit/normal-content.html b/www/iphone/UiUIKit/normal-content.html new file mode 100644 index 0000000..8cc8a04 --- /dev/null +++ b/www/iphone/UiUIKit/normal-content.html @@ -0,0 +1,52 @@ + + + + + + Normal lists + + + + + + + + +

Standard items

+ + + +

Standard with content

+ + + +

With icons

+ +
    +
  • Standard item list
    • +
  • Standard linked item
    • +
+ + + \ No newline at end of file diff --git a/www/iphone/UiUIKit/normal-extended.html b/www/iphone/UiUIKit/normal-extended.html new file mode 100644 index 0000000..00bea08 --- /dev/null +++ b/www/iphone/UiUIKit/normal-extended.html @@ -0,0 +1,32 @@ + + + + + + Normal lists + + + + + + + + + + + + + diff --git a/www/iphone/UiUIKit/normal-icon.html b/www/iphone/UiUIKit/normal-icon.html new file mode 100644 index 0000000..1b678de --- /dev/null +++ b/www/iphone/UiUIKit/normal-icon.html @@ -0,0 +1,35 @@ + + + + + + Normal lists + + + + + + + + +

Normal list with icons

+ + + +

Best enjoyed on a real iPhone
This iPhone UI Framework kit is licenced under GNU Affero General Public License (GNU AGPL 3)

+ + + \ No newline at end of file diff --git a/www/iphone/UiUIKit/normal-lists.html b/www/iphone/UiUIKit/normal-lists.html new file mode 100644 index 0000000..e73d895 --- /dev/null +++ b/www/iphone/UiUIKit/normal-lists.html @@ -0,0 +1,35 @@ + + + + + + Normal lists + + + + + + + + +

Normal list types

+ + + +

Best enjoyed on a real iPhone
This iPhone UI Framework kit is licenced under GNU Affero General Public License (GNU AGPL 3)

+ + + \ No newline at end of file diff --git a/www/iphone/UiUIKit/normal-metal.html b/www/iphone/UiUIKit/normal-metal.html new file mode 100644 index 0000000..09280b4 --- /dev/null +++ b/www/iphone/UiUIKit/normal-metal.html @@ -0,0 +1,32 @@ + + + + + + Normal lists + + + + + + + + + + + + + diff --git a/www/iphone/UiUIKit/normal-simple.html b/www/iphone/UiUIKit/normal-simple.html new file mode 100644 index 0000000..30201c3 --- /dev/null +++ b/www/iphone/UiUIKit/normal-simple.html @@ -0,0 +1,31 @@ + + + + + + Normal lists + + + + + + + + + + + + diff --git a/www/iphone/UiUIKit/plastic-lists.html b/www/iphone/UiUIKit/plastic-lists.html new file mode 100644 index 0000000..624d0fd --- /dev/null +++ b/www/iphone/UiUIKit/plastic-lists.html @@ -0,0 +1,49 @@ + + + + + + Normal lists + + + + + + + + + + + + + + + +

Best enjoyed on a real iPhone
This iPhone UI Framework kit is licenced under GNU Affero General Public License (GNU AGPL 3)

+ + + \ No newline at end of file diff --git a/www/iphone/UiUIKit/rounded-lists.html b/www/iphone/UiUIKit/rounded-lists.html new file mode 100644 index 0000000..182bfdd --- /dev/null +++ b/www/iphone/UiUIKit/rounded-lists.html @@ -0,0 +1,65 @@ + + + + + + Rounded lists + + + + + + + + +

Standard items

+ + + +

Standard with content

+ + + +

With icons

+ +
    +
  • Standard item list
    • +
  • Standard linked item
    • +
+ +

Individuals

+ + + + + +

Best enjoyed on a real iPhone
This iPhone UI Framework kit is licenced under GNU Affero General Public License (GNU AGPL 3)

+ + + \ No newline at end of file diff --git a/www/iphone/UiUIKit/stylesheets/ie-vs-chrome.blog.html b/www/iphone/UiUIKit/stylesheets/ie-vs-chrome.blog.html new file mode 100644 index 0000000..f67296f --- /dev/null +++ b/www/iphone/UiUIKit/stylesheets/ie-vs-chrome.blog.html @@ -0,0 +1,67 @@ +Title: Google Chrome vs el resto + +

Tenemos un nuevo navegador para disfrutar: Google Chrome, hecho, valga la redundancia por la misma gente que hace el buscador más utilizado del planeta: Google. En el diario Público leí la reseña que hicieron y me gustó todo, sólo una cosa no me terminó de cerrar: ¿por qué lo comparan con Internet Explorer 8 y no el 7? O sea, ¿el criterio es compararlo con navegadores en estado beta o con navegadores que tienen son lanzamientos oficiales como estables?

+ +

Google Chrome

+ +

Es un navegador rápido. Al menos, es lo que demostró funcionando en una máquina virtual que apenas emularía la velocidad de un ordenador con 700MB de RAM y 1Ghz de procesador. Se abre en un plis y todo va rápido. Esa es la sensación inicial.

+ +

Necesita un Windows XP con Service Pack 2 para poder funcionar, de lo contrario, el instalador te dirá que no puedes usarlo. El instalador apenas ocupa 500KB, se baja de internet todo, y creo que es acertado el método. + +

Si fuera estables, entonces deberíamos comprar Firefox 3, Internet Explorer 7. Aunque, el verdadero problema no es ese. Ya que, Microsoft tiene dividido el uso de Internet Explorer en 6 y 7. Mis estadísticas indican que, incluso siendo un público especializados, el 7 le gana al 6 pero no tanto, y el 8 apenas es visible.

+ +

Pero yendo al grano, me causó gracia el recuadro de pros y contras de los navegadores, lo resumiré aquí:

+ +
+ +

Microsoft Internet Explorer 8

+ +

Lo mejor:

+ +
    +
  • Es el más difundido, todas las webs funcionan correctamente con él.
    • +
  • Integración con Windows. Muchas aplicaciones de Windows utilizan partes del navegador para funcionar.
    • +
  • Extensiones, ActiveX. Los programadores pueden añadir funciones para realizar tareas especializadas.
    • +
+ +

Lo mejorable:

+ +
    +
  • Vulnerabilidades, que tardan en corregirse. Como promedio, tardan unos nueve días en ser corregidos mediante una revisión o parche.
    • +
  • Pobre gestión de los estándares web.
    • +
  • Ciclo de versiones y revisiones lento, aunque la compañía ha mejorado algo en Explorer 7 y 8.
    • +
+ +
+ +

Vayamos punto por punto:

+ +

Es el más difundido, todas las webs funcionan correctamente con él.

+ +

Esta es una apreciación bastante incorrecta. Ni es el más difundido (8 apenas tiene meses de lanzamiento) ni todas las webs funcionan correctamente. De hecho, Internet Explorer 8 funciona muy similar a Firefox, Safari y Opera ahora, al ir con modo estándar por defecto. Esto significa que, aunque navegues webs de bancos, administraciones verás los mismos problemas e incluso, algunos peores sólo por el hecho que esas webs utilizan métodos de codificación que se ajustaban a Internet Explorer 6 (casi el más difundido). En mis pruebas, la beta 2 de IE8 iba mejor que la 1 que parecía, no sé, un malware. Entrabas a Google Maps y no existían los mapas.

+ +

Integración con Windows. Muchas aplicaciones de Windows utilizan partes del navegador para funcionar.

+ +

Esta es otra apreciación bastante locuaz. La integración con el OS no es entera, de hecho, el OS no utiliza los últimos componentes, va todo con la DLL concreta para la UI que maneje Windows en ese momento. Por ejemplo, hay casos donde tienes Internet Explorer 8 rendereando varios modos de compatibilidad, y tienes abierto el Outlook Express mirando un correo electrónico usando otra versión del Internet Explorer que no es, precisamente, la 8 beta 2. Tanto Windows como Explorer usan el mismo motor pero no es la misma versión.

+ +

Por otro lado, esto no algo apreciable, es invisible al usuario. El usuario utiliza sus aplicaciones y no tiene, se los aseguro, ni puñetera idea que está usando un interfaz montado a partir de XMLs, hojas de estilos que el motor de IE soporta en una ventana de sistema. Simplemente piensa que es una aplicación normal y corriente y no una aplicación web.

+ +

Extensiones, ActiveX. Los programadores pueden añadir funciones para realizar tareas especializadas.

+ +

Totalmente de acuerdo. De hecho, es una de las razones por las cuales, muchas empresas siguen apostando por ActiveX. Tanto porque no se quieren actualizar, como por la inconveniencia de meterse con otra cosa que no salga de una suite de programación de Microsoft. En este ámbito, las extensiones ActiveX le dan la verdadera vida al navegador, pero tampoco es la panacea. Comparar ActiveX contra, por ejemplo, las extensiones de Firefox me parecería incorrecto.

+ +

Vulnerabilidades, que tardan en corregirse. Como promedio, tardan unos nueve días en ser corregidos mediante una revisión o parche.

+ +

Aquí ya no me meto. En un año, la cantidad de vulnerabilidades que encontraron en IE6 e IE7 (separadamente hablando) fue horripilante. Más de 197 vulnerabilidades. Algunas, requirieron el lanzamiento de SP2 con premura según leía Slashdot y otros sitios que tocan el tema.

+ +

Pobre gestión de los estándares web.

+ +

Aquí Microsoft ha hecho un esfuerzo notable. En la versión 7, además de dar soporte a cosas tan indispensables como el alpha en los archivos PNG, soporte de algunos de los selectores más importantes de CSS 2. En Internet Explorer 8, el soporte de CSS 2.1 no está completo del todo, pero está casi soportado en su totalidad. La gestión de estándares no es pobre, pero tampoco es la mejor. En IE8 se aprecian incontables bugs de visualización (es una beta tirando a alpha) y todavía le quedan incontables cosas por soportar. De todo lo que podemos apreciar de este navegador es que al menos, algo de bola a los estándares le están dando.

+ +

Ciclo de versiones y revisiones lento, aunque la compañía ha mejorado algo en Explorer 7 y 8.

+ +

Bueno, el ciclo de versiones en Internet Explorer no es lento, es… casi estático. Tardaron más de 7 años en lanzar una actualización de 6 a 7, y tardarán bastante (otros 3 años más) en tener la 8. El ciclo se mueve más que nada a velocidad de caracol, y no se trata de lanzar nuevas versiones sino actualizaciones. Firefox, Safari, Opera viven lanzando actualizaciones, además de los típicos parches. Y de lo mejorcito que se puede uno esperar es eso, encontrar que la versión 3.1 soporta 3 o 4 cosas nuevas, que la versión 9.53 mejora este bug y otro, pero en IE eso no es posible. Cada parche es de seguridad, las actualizaciones que involucren mejoras y soporte a nuevas tecnologías está sujeto siempre a nuevas versiones y no actualizaciones. Por ejemplo, el soporte PNG llevó sólo 68 horas de programación y test en Internet Explorer 7 cuando llevaron más de 6 años sin ponerlo en IE6. No sé si captan la indirecta.

+ +✂------✂------✂------✂------✂------✂------✂------✂------✂------✂------ + +Main entry continued diff --git a/www/iphone/UiUIKit/stylesheets/iphone.css b/www/iphone/UiUIKit/stylesheets/iphone.css new file mode 100644 index 0000000..8bcbc3c --- /dev/null +++ b/www/iphone/UiUIKit/stylesheets/iphone.css @@ -0,0 +1,1128 @@ +/* + + Universal iPhone UI Kit 1.0 + Author: Diego Martín Lafuente. + E-Mail: dlafuente@gmail.com + AIM: Minidixier + Licence: AGPLv3 + date: 2008-08-09 + + URL: www.minid.net + SVN URL: http://code.google.com/p/iphone-universal/source/checkout + Download: http://code.google.com/p/iphone-universal/downloads/list + + */ + + + body { + background: rgb(197,204,211) url(../images/stripes.png); + font-family: Helvetica; + margin: 0 0 0 10px; + padding: 0; + -webkit-user-select: none; + -webkit-text-size-adjust: none; + } + + /* standard header on body */ + + div#header + h1, ul + h1 { + color: rgb(76,86,108); + font: bold 18px Helvetica; + text-shadow: #fff 0 1px 0; + margin: 15px 0 0 10px; + } + +#searchForm { + background-color: #7ec8b2; +} +#nav { + background-color: #000; + height: 40px; + width: 100%; + overflow: hidden; + border-bottom-width: 0px; + border-bottom-top: 0px; +} +#nav li { + margin: 10px 5px 0 5px; + float: left; + padding: 0; + margin: 0; + list-style: none; + border-bottom-width: 0px; + border-bottom-top: 0px; +} +#nav a { + color: #fff; + text-transform: uppercase; + font-size: 10px; + margin-top: 0px; + margin-bottom: 0px; + margin-left: 0px; + vertical-align: bottom; + } + + a { + text-decoration: none; + color: #1A4064; + cursor: pointer; + } + + + + + /* standard paragraph on body */ + + ul + p, ul.data + p + p, ul.form + p + p { + color: rgb(76,86,108); + font: 14px Helvetica; + text-align: center; + text-shadow: white 0 1px 0; + margin: 0 10px 17px 0; + } + + + + + + + + + + + + + + + + /* headers */ + + div#header { + background: rgb(109,133,163) url(../images/bgHeader.png) repeat-x top; + border-top: 1px solid rgb(205,213,223); + border-bottom: 1px solid rgb(46,55,68); + padding: 10px; + margin: 0 0 0 -10px; + min-height: 44px; + -webkit-box-sizing: border-box; + } + + + div#header h1 { + color: #fff; + font: bold 20px/30px Helvetica; + text-shadow: #2d3642 0 -1px 0; + text-align: center; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + width: 49%; + padding: 5px 0; + margin: 2px 0 0 -24%; + position: absolute; + top: 0; + left: 50%; + } + + div#header a { + color: #FFF; + background: none; + font: bold 12px/30px Helvetica; + border-width: 0 5px; + margin: 0; + padding: 0 3px; + width: auto; + height: 30px; + text-shadow: rgb(46,55,68) 0 -1px 0; + text-overflow: ellipsis; + text-decoration: none; + white-space: nowrap; + position: absolute; + overflow: hidden; + top: 7px; + right: 6px; + -webkit-border-image: url(../images/toolButton.png) 0 5 0 5; + } + + div#header #backButton { + left: 6px; + right: auto; + padding: 0; + max-width: 55px; + border-width: 0 8px 0 14px; + -webkit-border-image: url(../images/backButton.png) 0 8 0 14; + } + + + .Action { + border-width: 0 5px; + -webkit-border-image: url(../images/actionButton.png) 0 5 0 5; + } + + + + div#header ul { + margin-top: 15px; + } + + div#header p { + color: rgb(60,70,80); + font-weight: bold; + font-size: 13px; + text-align: center; + clear: both; + position: absolute; + top: 4px; + left: 35px; + right: 35px; + margin: 0; + text-shadow: #C0CBDB 0 1px 0; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + } + + div.pre { + height: 60px; + } + + + div.pre h1 { + top: 18px !important; + } + + div.pre a { + top: 25px !important; + right: 6px; + } + + div.pre a#Backbutton { + left: 6px !important; + } + + + + + + /***** List (base) ******/ + + ul { + color: black; + background: #fff; + border: 1px solid #B4B4B4; + font: bold 17px Helvetica; + padding: 0; + margin: 15px 10px 17px 0; + -webkit-border-radius: 8px; + } + + + ul li { + color: #666; + border-top: 1px solid #B4B4B4; + list-style-type: none; + padding: 10px 10px 10px 10px; + } + + + + /* when you have a first LI item on any list */ + + li:first-child { + border-top: 0; + -webkit-border-top-left-radius: 8px; + -webkit-border-top-right-radius: 8px; + } + + li:last-child { + -webkit-border-bottom-left-radius: 8px; + -webkit-border-bottom-right-radius: 8px; + } + + + /* universal arrows */ + + ul li.arrow { + background-image: url(../images/chevron.png); + background-position: right center; + background-repeat: no-repeat; + } + + + #plastic ul li.arrow, #metal ul li.arrow { + background-image: url(../images/chevron_dg.png); + background-position: right center; + background-repeat: no-repeat; + } + + + + /* universal links on list */ + + ul li a, li.img a + a { + color: #000; + text-decoration: none; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + display: block; + padding: 12px 10px 12px 10px; + margin: -10px; + -webkit-tap-highlight-color:rgba(0,0,0,0); + } + + ul li.img a + a { + margin: -10px 10px -20px -5px; + font-size: 17px; + font-weight: bold; + } + + ul li.img a + a + a { + font-size: 14px; + font-weight: normal; + margin-left: -10px; + margin-bottom: -10px; + margin-top: 0; + } + + + ul li.img a + small + a { + margin-left: -5px; + } + + + ul li.img a + small + a + a { + margin-left: -10px; + margin-top: -20px; + margin-bottom: -10px; + font-size: 14px; + font-weight: normal; + } + + ul li.img a + small + a + a + a { + margin-left: 0px !important; + margin-bottom: 0; + } + + + ul li a + a { + color: #000; + font: 14px Helvetica; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + display: block; + margin: 0; + padding: 0; + } + + ul li a + a + a, ul li.img a + a + a + a, ul li.img a + small + a + a + a { + color: #666; + font: 13px Helvetica; + margin: 0; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + display: block; + padding: 0; + } + + + + + + /* standard mini-label */ + + ul li small { + color: #369; + font: 17px Helvetica; + text-align: right; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + display: block; + width: 23%; + float: right; + padding: 3px 0px; + } + + + + ul li.arrow small { + padding: 0 15px; + } + + ul li small.counter { + font-size: 17px !important; + line-height: 13px !important; + font-weight: bold; + background: rgb(154,159,170); + color: #fff; + -webkit-border-radius: 11px; + padding: 4px 10px 5px 10px; + display: inline !important; + width: auto; + margin-top: 2px; + } + + + ul li.arrow small.counter { + margin-right: 15px; + } + + + + + /* resize without labels */ + + ul li.arrow a { + width: 95%; + } + + /* with labels */ + + ul li small + a { + width: 75%; + } + + ul li.arrow small + a { + width: 70%; + } + + + + /* images */ + + ul li.img { + padding-left: 115px; + } + + ul li.img a.img { + background: url(../images/standard-img.png) no-repeat; + display: inline-block; + width: 100px; + height: 75px; + margin: -10px 0 -20px -115px; + float: left; + } + + + + /* individuals */ + + + + ul.individual { + border: 0; + background: none; + clear: both; + height: 45px; + } + + ul.individual li { + color: rgb(183,190,205); + background: white; + border: 1px solid rgb(180,180,180); + font-size: 14px; + text-align: center; + -webkit-border-radius: 8px; + -webkit-box-sizing: border-box; + width: 48%; + float:left; + display: block; + padding: 11px 10px 14px 10px; + } + + ul.individual li + li { + float: right; + + } + + + ul.individual li a { + color: rgb(50,79,133); + line-height: 16px; + margin: -11px -10px -14px -10px; + padding: 11px 10px 14px 10px; + -webkit-border-radius: 8px; + } + + ul.individual li a:hover { + color: #fff; + background: #36c; + } + + + + + /* Normal lists and metal */ + + body#normal h4 { + color: #fff; + /* 002863 rgb(154,159,170) */ + background: rgb(0,40,99) url(../images/bglight.png) top left repeat-x; + border-top: 1px solid rgb(0,40,99); /* rgb(165,177,186); */ + text-shadow: #666 0 1px 0; + margin: 0; + padding: 2px 10px; + } + + + body#normal, body#metal { + margin: 0; + padding: 0; + background-color: rgb(255,255,255); + } + + body#normal ul, body#metal ul, body#plastic ul { + -webkit-border-radius: 0; + margin: 0; + border-left: 0; + border-right: 0; + border-top: 0; + } + + body#metal ul { + border-top: 0; + border-bottom: 0; + background: rgb(180,180,180); + } + + + + + body#normal ul li { + font-size: 20px; + } + + body#normal ul li small { + font-size: 16px; + line-height: 28px; + } + + body#normal li, body#metal li { + -webkit-border-radius: 0; + } + + body#normal li em { + font-weight: normal; + font-style: normal; + } + + body#normal h4 + ul { + border-top: 0px; + # border-top: 1px solid rgb(152,158,164); + border-bottom: 1px solid rgb(113,125,133); + } + + + body#metal ul li { + border-top: 1px solid rgb(238,238,238); + border-bottom: 1px solid rgb(156,158,165); + background: url(../images/bgMetal.png) top left repeat-x; + font-size: 26px; + text-shadow: #fff 0 1px 0; + } + + body#metal ul li a { + line-height: 26px; + margin: 0; + padding: 13px 0; + } + + body#metal ul li a:hover { + color: rgb(0,0,0); + } + + body#metal ul li:hover small { + color: inherit; + } + + + body#metal ul li a em { + display: block; + font-size: 14px; + font-style: normal; + color: #444; + width: 50%; + line-height: 14px; + } + + body#metal ul li small { + float: right; + position: relative; + margin-top: 10px; + font-weight: bold; + } + + + body#metal ul li.arrow a small { + padding-right: 0; + line-height: 17px; + } + + + body#metal ul li.arrow { + background: url(../images/bgMetal.png) top left repeat-x, + url(../images/chevron_dg.png) right center no-repeat; + } + + + + /* option panel */ + + div#optionpanel { + background: url(../images/blackbg.png) top left repeat-x; + text-align: center; + padding: 20px 10px 15px 10px; + position: absolute; + left: 0; + right: 0; + bottom: 0; + } + + div#optionpanel h2 { + font-size: 17px; + color: #fff; + text-shadow: #000 0 1px 0; + } + + + + + + /***** BUTTONS *****/ + + .button { + color: #fff; + font: bold 20px/46px Helvetica; + text-decoration: none; + text-align: center; + text-shadow: #000 0 1px 0; + border-width: 0px 14px 0px 14px; + display: block; + margin: 3px 0; + } + + .green { -webkit-border-image: url(../images/greenButton.png) 0 14 0 14; } + .red { -webkit-border-image: url(../images/redButton.png) 0 14 0 14; } + + .white { + color: #000; + text-shadow: #fff 0px 1px 0; + -webkit-border-image: url(../images/whiteButton.png) 0 14 0 14; + } + + .black { -webkit-border-image: url(../images/grayButton.png) 0 14 0 14; } + + +/***** FORMS *****/ + +/* fields list */ + + ul.form { + + } + + ul.form li { + padding: 7px 10px; + } + + ul.form li.error { border: 2px solid red; } + ul.form li.error + li.error { border-top: 0; } + + ul.form li:hover { background: #fff; } + + ul li input[type="text"], ul li input[type="password"], ul li textarea, ul li select { + color: #777; + background: #fff url(../.png); /* this is a hack due the default input shadow that iphones uses on textfields */ + border: 0; + font: normal 17px Helvetica; + padding: 0; + display: inline-block; + margin-left: 0px; + width: 100%; + -webkit-appearance: textarea; + } + + ul li textarea { + height: 120px; + padding: 0; + text-indent: -2px; + } + + ul li select { + text-indent: 0px; + background: transparent url(../images/chevron.png) no-repeat 103% 3px; + -webkit-appearance: textfield; + margin-left: -6px; + width: 104%; + } + + ul li input[type="checkbox"], ul li input[type="radio"] { + margin: 0; + color: rgb(50,79,133); + padding: 10px 10px; + } + + ul li input[type="checkbox"]:after, ul li input[type="radio"]:after { + content: attr(title); + font: 17px Helvetica; + display: block; + width: 246px; + margin: -12px 0 0 17px; + } + + + + /**** INFORMATION FIELDS ****/ + + ul.data li h4 { + margin: 10px 0 5px 0; + } + + ul.data li p { + text-align: left; + font-size: 14px; + line-height: 18px; + font-weight: normal; + margin: 0; + } + + ul.data li p + p { margin-top: 10px; } + + + ul.data li { + background: none; + padding: 15px 10px; + color: #222; + } + + ul.data li a { + display: inline; + color: #2E3744; + text-decoration: underline; + } + + + ul.field li small { + position: absolute; + right: 25px; + margin-top: 3px; + z-index: 3; + } + + ul.field li h3 { + color: rgb(76,86,108); + width: 25%; + font-size: 13px; + line-height: 18px; + margin: 0 10px 0 0; + float: left; + text-align: right; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + padding: 0; + } + + ul.field li a { + font-size: 13px; + line-height: 18px; + overflow: visible; + white-space: normal; + display: inline-block; + width: 60%; + padding: 0; + margin: 0 0 0 0; + vertical-align: top; + } + + ul.field li big { + font-size: 13px; + line-height: 18px; + font-weight: normal; + overflow: visible; + white-space: normal; + display: inline-block; + width: 60%; + } + + + + + + + ul.field li small { + font-size: 13px; + font-weight: bold; + } + + + /* this is for profiling */ + + ul.profile { + border: 0; + background: none; + clear: both; + min-height: 62px; + position: relative; + } + + ul.profile li { + background: #fff url(../images/profile-user.png) no-repeat; + border: 1px solid #B4B4B4; + width: 62px; + height: 62px; + -webkit-border-radius: 4px; + -webkit-box-sizing: border-box; + float: left; + } + + ul.profile li + li { + border: 0; + background: none; + width: 70%; + } + + + ul.profile li + li h2, ul.profile li + li p { + color: rgb(46,55,68); + text-shadow: #fff 0 1px 0; + margin: 0; + } + + ul.profile li + li h2 { + font: bold 18px/22px Helvetica; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + } + + ul.profile li + li p { + font: 14px/18px Helvetica; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + } + + + /* any A element inside this kind of field list will scale 62x62 */ + + ul.profile li a { + display: block; + width: 62px; + height: 62px; + color: transparent; + } + + + + /***** PLASTIC LISTS *****/ + + body#plastic { + margin: 0; + padding: 0; + background: rgb(173,173,173); + } + + body#plastic ul { + -webkit-border-radius: 0; + margin: 0; + border-left: 0; + border-right: 0; + border-top: 0; + background-color: rgb(173,173,173); + } + + + body#plastic ul li { + -webkit-border-radius: 0; + border-top: 1px solid rgb(191,191,191); + border-bottom: 1px solid rgb(157,157,157); + } + + + body#plastic ul li:nth-child(odd) { + background-color: rgb(152,152,152); + border-top: 1px solid rgb(181,181,181); + border-bottom: 1px solid rgb(138,138,138); + } + + + body#plastic ul + p { + font-size: 11px; + color: #2f3237; + text-shadow: none; + padding: 10px 10px; + } + + body#plastic ul + p strong { + font-size: 14px; + line-height: 18px; + text-shadow: #fff 0 1px 0; + } + + body#plastic ul li a { + text-shadow: rgb(211,211,211) 0 1px 0; + } + + body#plastic ul li:nth-child(odd) a { + text-shadow: rgb(191,191,191) 0 1px 0; + } + + + body#plastic ul li small { + color: #3C3C3C; + text-shadow: rgb(211,211,211) 0 1px 0; + font-size: 13px; + font-weight: bold; + text-transform: uppercase; + line-height: 24px; + } + + + + /**** MINI & BIG BANNERS ****/ + + #plastic ul.minibanner, #plastic ul.bigbanner { + margin: 10px; + border: 0; + height: 81px; + clear: both; + } + + #plastic ul.bigbanner { + height: 140px !important; + } + + #plastic ul.minibanner li { + border: 1px solid rgb(138,138,138); + background-color: rgb(152,152,152); + width: 145px; + height: 81px; + float: left; + -webkit-border-radius: 5px; + padding: 0; + } + + #plastic ul.bigbanner li { + border: 1px solid rgb(138,138,138); + background-color: rgb(152,152,152); + width: 296px; + height: 140px; + float: left; + -webkit-border-radius: 5px; + padding: 0; + margin-bottom: 4px; + } + + #plastic ul.minibanner li:first-child { + margin-right: 6px; + } + + + #plastic ul.minibanner li a { + color: transparent; + text-shadow: none; + display: block; + width: 145px; + height: 81px; + } + + #plastic ul.bigbanner li a { + color: transparent; + text-shadow: none; + display: block; + width: 296px; + height: 145px; + } + + + + /**** CHAT ****/ + + + body#chat { + background: #DBE1ED; + } + + body#chat div.bubble { + margin: 10px 10px 0 0px; + width: 80%; + clear: both; + } + + + + body#chat div.right { + float: right; + } + + body#chat div.left { + float: left; + } + + + body#chat div.right p { + border-width: 10px 20px 12px 10px; + } + + body#chat div.left p { + border-width: 10px 10px 12px 20px; + } + + /* lefties */ + + body#chat div.left p.lime { + -webkit-border-image: url(../images/chat_bubbles_lime_l.png) 10 10 13 19; + } + + body#chat div.left p.lemon { + -webkit-border-image: url(../images/chat_bubbles_lemon_l.png) 10 10 13 19; + } + + body#chat div.left p.orange { + -webkit-border-image: url(../images/chat_bubbles_orange_l.png) 10 10 13 19; + } + + body#chat div.left p.aqua { + -webkit-border-image: url(../images/chat_bubbles_aqua_l.png) 10 10 13 19; + } + + body#chat div.left p.purple { + -webkit-border-image: url(../images/chat_bubbles_purple_l.png) 10 10 13 19; + } + + body#chat div.left p.pink { + -webkit-border-image: url(../images/chat_bubbles_pink_l.png) 10 10 13 19; + } + + body#chat div.left p.graphite { + -webkit-border-image: url(../images/chat_bubbles_graphite_l.png) 10 10 13 19; + } + + body#chat div.left p.clear { + -webkit-border-image: url(../images/chat_bubbles_clear_l.png) 10 10 13 19; + } + + + + + /*rights*/ + + body#chat div.right p.aqua { + -webkit-border-image: url(../images/chat_bubbles_aqua_r.png) 10 19 13 10; + } + + body#chat div.right p.lemon { + -webkit-border-image: url(../images/chat_bubbles_lemon_r.png) 10 19 13 10; + } + + body#chat div.right p.lime { + -webkit-border-image: url(../images/chat_bubbles_lime_r.png) 10 19 13 10; + } + + body#chat div.right p.purple { + -webkit-border-image: url(../images/chat_bubbles_purple_r.png) 10 19 13 10; + } + + body#chat div.right p.pink { + -webkit-border-image: url(../images/chat_bubbles_pink_r.png) 10 19 13 10; + } + + body#chat div.right p.graphite { + -webkit-border-image: url(../images/chat_bubbles_graphite_r.png) 10 19 13 10; + } + + body#chat div.right p.clear { + -webkit-border-image: url(../images/chat_bubbles_clear_r.png) 10 19 13 10; + } + + + + + + + + body#chat div.bubble p { + color: #000; + font-size: 16px; + margin: 0; + } + + body#chat div.bubble + p { + color: #666; + text-align: center; + font-size: 12px; + font-weight: bold; + margin: 0; + padding: 10px 0 0 0; + clear: both; + } + + + + + + + /**** image grids ****/ + + + body#images { + background: #fff; + margin: 0; + } + + body#images ul { + margin: 4px 4px 4px 0; + border: 0; + -webkit-border-radius: 0; + } + + body#images ul li { + border: 1px solid #C0D5DD; + -webkit-border-radius: 0; + width: 73px; + height: 73px; + float: left; + margin: 0 0 4px 4px; + background: #F4FBFE url(../images/image-loading.gif) no-repeat center center; + padding: 0; + } + + body#images ul li a { + display: block; + width: 100%; + height: 100%; + margin: 0; + padding: 0; + } + + + /*** BLANK PAGES ***/ + + body#blank { + background: #fff; + } + + + body#blank p { + color: #898989; + text-align: center; + margin: 250px 0 0 0; + } + + + + + /**** ICONFIED LIST ****/ + + + ul li a img.ico, ul li img.ico { + float: left; + display: block; + margin: -4px 10px -4px -1px; + } + + \ No newline at end of file diff --git a/www/iphone/example_client.js b/www/iphone/example_client.js new file mode 100644 index 0000000..9761e83 --- /dev/null +++ b/www/iphone/example_client.js @@ -0,0 +1,658 @@ +/* A very simple client that shows a basic usage of the pz2.js +*/ + +// create a parameters array and pass it to the pz2's constructor +// then register the form submit event with the pz2.search function +// autoInit is set to true on default +var usesessions = true; +var pazpar2path = '/pazpar2/search.pz2'; +var showResponseType = ''; +var querys = {'su': '', 'au': '', 'xt': ''}; + +if (document.location.hash == '#useproxy' || document.location.search.match("useproxy=true")) { + usesessions = false; + pazpar2path = '/service-proxy/'; + showResponseType = 'json'; +} + + +my_paz = new pz2( { "onshow": my_onshow, + "showtime": 500, //each timer (show, stat, term, bytarget) can be specified this way + "pazpar2path": pazpar2path, + "oninit": my_oninit, + "onstat": my_onstat, + "onterm": my_onterm_iphone, + "termlist": "xtargets,subject,author", + "onbytarget": my_onbytarget, + "usesessions" : usesessions, + "showResponseType": showResponseType, + "onrecord": my_onrecord } ); +// some state vars +var curPage = 1; +var recPerPage = 20; +var totalRec = 0; +var curDetRecId = ''; +var curDetRecData = null; +var curSort = 'relevance'; +var curFilter = 'ALL'; +var submitted = false; +var SourceMax = 16; +var SubjectMax = 10; +var AuthorMax = 10; +var tab = "recordview"; + +var triedPass = ""; +var triedUser = ""; + +function loginFormSubmit() { + triedUser = document.loginForm.username.value; + triedPass = document.loginForm.password.value; + auth.login( {"username": triedUser, + "password": triedPass}, + authCb, authCb); +} + +function authCb(authData) { + if (!authData.loginFailed) { + triedUser = ""; + triedPass = ""; + } + + if (authData.loggedIn == true) { + showhide("recordview"); + } +} + +function logOutClick() { + auth.logOut(authCb, authCb); +} + +function loggedOut() { + var login = document.getElementById("login"); + login.innerHTML = 'Login'; +} + +function loggingOutFailed() { + alert("Logging out failed"); +} + +function login() { + showhide("login"); +} + +function logout() { + auth.logOut(loggedOut, loggingOutFailed, true); +} + +function logInOrOut() { + var loginElement = document.getElementById("login"); + if (loginElement.innerHTML == 'Login') + login(); + else + logout(); +} +function loggedIn() { + var login = document.getElementById("login"); + login.innerHTML = 'Logout(' + auth.displayName + ')'; + document.getElementById("log").innerHTML = login.innerHTML; +} + +function auth_check() { + auth.check(loggedIn, login, true); + domReady(); +} + +// +// Pz2.js event handlers: +// +function my_oninit() { + my_paz.stat(); + my_paz.bytarget(); +} + +function my_onshow(data) { + totalRec = data.merged; + // move it out + var pager = document.getElementById("pager"); + pager.innerHTML = ""; + pager.innerHTML +='
Displaying: ' + + (data.start + 1) + ' to ' + (data.start + data.num) + + ' of ' + data.merged + ' (found: ' + + data.total + ')
'; + drawPager(pager); + + var results = document.getElementById("results"); + + var html = []; + for (var i = 0; i < data.hits.length; i++) { + var hit = data.hits[i]; + html.push('
  • ' + /* +''+ (i + 1 + recPerPage * (curPage - 1)) +'. ' */ + +'' + + hit["md-title"] +' '); + if (hit["md-title-responsibility"] !== undefined) { + html.push(''+hit["md-title-responsibility"]+' '); + if (hit["md-title-remainder"] !== undefined) { + html.push('' + hit["md-title-remainder"] + ' '); + } + } + if (hit.recid == curDetRecId) { + html.push(renderDetails_iphone(curDetRecData)); + } + html.push(''); + } + replaceHtml(results, html.join('')); +} + +function my_onstat(data) { + var stat = document.getElementById("stat"); + if (stat == null) + return; + + stat.innerHTML = ' .:STATUS INFO -- Active clients: ' + + data.activeclients + + '/' + data.clients + ' -- ' + + 'Retrieved records: ' + data.records + + '/' + data.hits + ' :.'; +} + +function showhide(newtab) { + var showtermlist = false; + if (newtab != null) + tab = newtab; + + if (tab == "recordview") { + document.getElementById("recordview").style.display = ''; + } + else + document.getElementById("recordview").style.display = 'none'; + + if (tab == "xtargets") { + document.getElementById("term_xtargets").style.display = ''; + showtermlist = true; + } + else + document.getElementById("term_xtargets").style.display = 'none'; + + if (tab == "subjects") { + document.getElementById("term_subjects").style.display = ''; + showtermlist = true; + } + else + document.getElementById("term_subjects").style.display = 'none'; + + if (tab == "authors") { + document.getElementById("term_authors").style.display = ''; + showtermlist = true; + } + else + document.getElementById("term_authors").style.display = 'none'; + + if (showtermlist == false) + document.getElementById("termlist").style.display = 'none'; + else + document.getElementById("termlist").style.display = ''; + + var tabDiv = document.getElementById("loginDiv"); + if (tab == "login") { + tabDiv.style.display = ''; + } + else { + tabDiv.style.display = 'none'; + } +} + +function my_onterm(data) { + var termlists = []; + + termlists.push('
    '); + termlists.push('

    Sources

    '); + termlists.push(''); + termlists.push('
    '); + + termlists.push('
    '); + termlists.push('

    Subjects

    '); + termlists.push(''); + termlists.push('
    '); + + termlists.push('
    '); + termlists.push('

    Authors

    '); + termlists.push(''); + termlists.push('
    '); + var termlist = document.getElementById("termlist"); + replaceHtml(termlist, termlists.join('')); + showhide(); +} + +var termlist = {}; +function my_onterm_iphone(data) { + my_onterm(data); + var targets = "reset_xt|All\n"; + + for (var i = 0; i < data.xtargets.length; i++ ) { + + targets = targets + data.xtargets[i].id + "|" + data.xtargets[i].name + "|" + data.xtargets[i].freq + "\n"; + } + termlist["xtargets"] = targets; + var subjects = "reset_su|All\n"; + for (var i = 0; i < data.subject.length; i++ ) { + subjects = subjects + "su" + "|" + data.subject[i].name + "|" + data.subject[i].freq + "\n"; + } + termlist["subjects"] = subjects; + var authors = "reset_au|All\n"; + for (var i = 0; i < data.author.length; i++ ) { + authors = authors + "au" + "|" + data.author[i].name + "|" + data.author[i].freq + "\n"; + } + termlist["authors"] = authors; + callback.send("termlist", "refresh"); +} + +function getTargets() { + return termlist['xtargets']; +} + +function getSubjects() { + return termlist['subjects']; +} + +function getAuthors() { + return termlist['authors']; +} + +function my_onrecord(data) { + // FIXME: record is async!! + clearTimeout(my_paz.recordTimer); + // in case on_show was faster to redraw element + var detRecordDiv = document.getElementById('det_'+data.recid); + if (detRecordDiv) return; + curDetRecData = data; + var recordDiv = document.getElementById('recdiv_'+curDetRecData.recid); + var html = renderDetails_iphone(curDetRecData); + recordDiv.innerHTML += html; +} + +function my_onrecord_iphone(data) { + my_onrecord(data); + callback.send("record", data.recid, data, data.xtargets[i].freq); +} + + +function my_onbytarget(data) { + var targetDiv = document.getElementById("bytarget"); + var table ='' + +''; + + for (var i = 0; i < data.length; i++ ) { + table += ""; + } + + table += '
    Target IDHitsDiagsRecordsState
    " + data[i].id + + "" + data[i].hits + + "" + data[i].diagnostic + + "" + data[i].records + + "" + data[i].state + "
    '; + targetDiv.innerHTML = table; +} + +//////////////////////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////// + +// wait until the DOM is ready +function domReady () +{ + document.search.onsubmit = onFormSubmitEventHandler; + document.search.query.value = ''; + document.select.sort.onchange = onSelectDdChange; + document.select.perpage.onchange = onSelectDdChange; + if (document.location.search.match("inApp=true")) + applicationMode(true); + else + applicationMode(false); +} + +function applicationMode(newmode) +{ + var searchdiv = document.getElementById("searchForm"); + if (newmode) + inApp = newmode; + if (inApp) { + document.getElementById("heading").style.display="none"; + searchdiv.style.display = 'none'; + } + else { + document.getElementById("nav").style.display=""; + searchdiv.style.display = ''; + document.search.onsubmit = onFormSubmit; + } + callback.init(); +} +// when search button pressed +function onFormSubmitEventHandler() +{ + resetPage(); + document.getElementById("logo").style.display = 'none'; + loadSelect(); + triggerSearch(); + submitted = true; + return true; +} + +function onSelectDdChange() +{ + if (!submitted) return false; + resetPage(); + loadSelect(); + my_paz.show(0, recPerPage, curSort); + return false; +} + +function resetPage() +{ + curPage = 1; + totalRec = 0; +} + +function triggerSearch () +{ + my_paz.search(document.search.query.value, recPerPage, curSort, curFilter); +} + +function loadSelect () +{ + curSort = document.select.sort.value; + recPerPage = document.select.perpage.value; +} + +// limit the query after clicking the facet +function limitQuery(field, value) +{ + var newQuery = ' and ' + field + '="' + value + '"'; + querys[field] += newQuery; + document.search.query.value += newQuery; + onFormSubmitEventHandler(); + showhide("recordview"); +} + +//limit the query after clicking the facet +function removeQuery (field, value) { + document.search.query.value.replace(' and ' + field + '="' + value + '"', ''); + onFormSubmitEventHandler(); + showhide("recordview"); +} + +//limit the query after clicking the facet +function limitOrResetQuery (field, value, selected) { + if (field == 'reset_su' || field == 'reset_au') { + var reset_field = field.substring(6); + document.search.query.value = document.search.query.value.replace(querys[reset_field], ''); + querys[reset_field] = ''; + onFormSubmitEventHandler(); + showhide("recordview"); + } + else + limitQuery(field, value); + //alert("limitOrResetQuerry: query after: " + document.search.query.value); +} + +// limit by target functions +function limitTarget (id, name) +{ + curFilter = 'pz:id=' + id; + resetPage(); + loadSelect(); + triggerSearch(); + showhide("recordview"); + return false; +} + +function delimitTarget () +{ + curFilter = 'ALL'; + resetPage(); + loadSelect(); + triggerSearch(); + return false; +} + +function limitOrResetTarget(id, name) { + if (id == 'reset_xt') { + delimitTarget(); + } + else { + limitTarget(id,name); + } +} + +function drawPager (pagerDiv) +{ + //client indexes pages from 1 but pz2 from 0 + var onsides = 6; + var pages = Math.ceil(totalRec / recPerPage); + + var firstClkbl = ( curPage - onsides > 0 ) + ? curPage - onsides + : 1; + + var lastClkbl = firstClkbl + 2*onsides < pages + ? firstClkbl + 2*onsides + : pages; + + var prev = '<< Prev | '; + if (curPage > 1) + var prev = ' | '; + + var middle = ''; + for(var i = firstClkbl; i <= lastClkbl; i++) { + var numLabel = i; + if(i == curPage) + numLabel = '' + i + ''; + + middle += ' ' + + numLabel + ' '; + } + + var next = ' | Next >>'; + if (pages - curPage > 0) + var next = ' | '; + + predots = ''; + if (firstClkbl > 1) + predots = '...'; + + postdots = ''; + if (lastClkbl < pages) + postdots = '...'; + + pagerDiv.innerHTML += '
    ' + + prev + predots + middle + postdots + next + '
    '; +} + +function showPage (pageNum) +{ + curPage = pageNum; + my_paz.showPage( curPage - 1 ); +} + +// simple paging functions + +function pagerNext() { + if ( totalRec - recPerPage*curPage > 0) { + my_paz.showNext(); + curPage++; + } +} + +function pagerPrev() { + if ( my_paz.showPrev() != false ) + curPage--; +} + +// swithing view between targets and records + +function switchView(view) { + + var targets = document.getElementById('targetview'); + var records = document.getElementById('recordview'); + + switch(view) { + case 'targetview': + targets.style.display = "block"; + records.style.display = "none"; + break; + case 'recordview': + targets.style.display = "none"; + records.style.display = "block"; + break; + default: + alert('Unknown view.'); + } +} + +// detailed record drawing +function showDetails (prefixRecId) { + var recId = prefixRecId.replace('rec_', ''); + var oldRecId = curDetRecId; + curDetRecId = recId; + + // remove current detailed view if any + var detRecordDiv = document.getElementById('det_'+oldRecId); + //alert("oldRecId: " + oldRecId + " " + detRecordDiv != null); + // lovin DOM! + if (detRecordDiv) + detRecordDiv.parentNode.removeChild(detRecordDiv); + + // if the same clicked, just hide + if (recId == oldRecId) { + curDetRecId = ''; + curDetRecData = null; + return; + } + // request the record + my_paz.record(recId); +} + +function replaceHtml(el, html) { + var oldEl = typeof el === "string" ? document.getElementById(el) : el; + /*@cc_on // Pure innerHTML is slightly faster in IE + oldEl.innerHTML = html; + return oldEl; + @*/ + var newEl = oldEl.cloneNode(false); + newEl.innerHTML = html; + oldEl.parentNode.replaceChild(newEl, oldEl); + /* Since we just removed the old element from the DOM, return a reference + to the new element, which can be used to restore variable references. */ + return newEl; +}; + +function renderDetails(data, marker) +{ + var details = '
    '; + if (marker) details += ''; + if (data["md-title"] != undefined) { + details += ''; + } + if (data["md-date"] != undefined) + details += ''; + if (data["md-author"] != undefined) + details += ''; + if (data["md-electronic-url"] != undefined) + details += ''; + if (data["location"][0]["md-subject"] != undefined) + details += ''; + if (data["location"][0]["@name"] != undefined) + details += ''; + details += '
    '+ marker + '
    Title: '+data["md-title"]; + if (data["md-title-remainder"] !== undefined) { + details += ' : ' + data["md-title-remainder"] + ' '; + } + if (data["md-title-responsibility"] !== undefined) { + details += ' '+ data["md-title-responsibility"] +''; + } + details += '
    Date: ' + data["md-date"] + '
    Author: ' + data["md-author"] + '
    URL: ' + data["md-electronic-url"] + '' + '
    Subject: ' + data["location"][0]["md-subject"] + '
    Location: ' + data["location"][0]["@name"] + " (" +data["location"][0]["@id"] + ")" + '
    '; + return details; +} + +function renderLine(title, value) { + if (value != undefined) + return '

  • ' + title + '

    ' + value + '
    • '; + return ''; +} + +function renderLineURL(title, URL, display) { + if (URL != undefined) + return '

  • ' + title + '

    ' + display + '
    • '; + return ''; +} + +function renderLineEmail(dtitle, email, display) { + if (email != undefined) + return '

  • ' + title + '

    ' + display + '
    • '; + return ''; +} + +function renderDetails_iphone(data, marker) +{ + //return renderDetails(data,marker); + + if (!data) + return ""; + var details = '
    ' +/* + details = ''; +*/ + if (marker) + details += '

    '+ marker + '

    '; + details += '
      '; + if (data["md-title"] != undefined) { + details += '

    • Title

      ' + data["md-title"]; + if (data["md-title-remainder"] !== undefined) { + details += ' ' + data["md-title-remainder"] + ' '; + } + if (data["md-title-responsibility"] !== undefined) { + details += ''+ data["md-title-responsibility"] +''; + } + details += '' + details += '
      • ' + } + details + +=renderLine('Date', data["md-date"]) + + renderLine('Author', data["md-author"]) + + renderLineURL('URL', data["md-electronic-url"], data["md-electronic-url"]) + + renderLine('Subject', data["location"][0]["md-subject"]); + + if (data["location"][0]["@name"] != undefined) + details += renderLine('Location', data["location"][0]["@name"] + " (" +data["location"][0]["@id"] + ")"); + details += '
    '; + return details; +} + +//EOF diff --git a/www/iphone/index.html b/www/iphone/index.html new file mode 100644 index 0000000..adfd5de --- /dev/null +++ b/www/iphone/index.html @@ -0,0 +1,161 @@ + + + + + + + Mobile Masterkey + + + + + + + + + + + + + + + + + + + + + + +
    + +
    + + + +
    + + + + + + + + + + +
    + +
    +
    + +
    + + + + +
    + + +

    Results by MasterKey

    +
      + +
      + + + + + + diff --git a/www/iphone/index2.html b/www/iphone/index2.html new file mode 100644 index 0000000..2f41425 --- /dev/null +++ b/www/iphone/index2.html @@ -0,0 +1,28 @@ + + + + + + + Pazpar2 demo client + + + + + + +
      +
      +
      + Call back +
      +
      + +
      + + + diff --git a/www/iphone/indexdata_logo.png b/www/iphone/indexdata_logo.png new file mode 100644 index 0000000..171c039 Binary files /dev/null and b/www/iphone/indexdata_logo.png differ diff --git a/www/iphone/iphone.js b/www/iphone/iphone.js new file mode 100644 index 0000000..93008b1 --- /dev/null +++ b/www/iphone/iphone.js @@ -0,0 +1,56 @@ +var count = 0; +var termlist = {}; +var inApp = false; + +var callback = {}; + +callback.init = function() { + if (!inApp) { + callback.type = 'browser'; + } else { + callback.type = 'iphone'; + } +}; + +String.prototype.replaceAll = function(stringToFind,stringToReplace) { + var temp = this; + var index = temp.indexOf(stringToFind); + while(index != -1){ + temp = temp.replace(stringToFind,stringToReplace); + index = temp.indexOf(stringToFind); + } + return temp; + } + +callback.send = function() +{ + var args = [].splice.call(arguments,0); + for (var i = 0; i < args.length; i++) { + if (args[i]) + args[i] = args[i].replaceAll(':','_'); + else + alert("args was null: " + i); + } + var message = "myapp:" + args.join(":"); + if (this.type == 'iphone') + document.location = message; + else { + // Debug communication with Web View + // document.getElementById("log").innerHTML = message; + } +} + + +function search(message) { + document.search.query.value = message; + onFormSubmitEventHandler(); + return false; +} + +function loaded() { + callback.init(); +} + +function onFormSubmit() { + return search(document.search.query.value); +} diff --git a/www/iphone/logo_sub_pages.png b/www/iphone/logo_sub_pages.png new file mode 100644 index 0000000..5be04a6 Binary files /dev/null and b/www/iphone/logo_sub_pages.png differ diff --git a/www/iphone/styles.css b/www/iphone/styles.css new file mode 100644 index 0000000..e6cd2b0 --- /dev/null +++ b/www/iphone/styles.css @@ -0,0 +1,110 @@ +html { + overflow-y: scroll; + font-size: 12px; +} + +body { + font-family: tahoma, arial, sans-serif; + color: #156a16; +} + +hr { + border: 0; + color: #156a16; + background-color: #156a16; + height: 1px; +} + +thead { + font-weight: bold; +} + +a { + color: #005701; + text-decoration: none; +} + +a.extern { + color: #CC6600; +} + +a:hover { + text-decoration: underline; +} + +a.crossout:hover { + text-decoration: line-through; + font-weight: bold; +} + + +#heading { + background-color: #87c9af; + border-top: 1px solid #156a16; + color: #ffffff; + font-size: large; +} + +input#button { + border: 3px outset #132194; + background-color: #132194; + padding: 2px; + width: 6em; + color: #FFFFFF; + font-weight: bold; + text-transform: uppercase; + font-size: 10px; + margin-left: 8px; + cursor: pointer; +} + +input#query { + border: 2px inset #34cc67; + padding: 3px; + font-size: 12px; +} + +div.termtitle { + margin: 4px; + font-weight: bold; +} + +div.record { + padding: 5px; +} + +div.details { + border: 3px dashed gray; + color: gray; + padding: 5px; + margin: 4px; +} + +#switchmenu { + padding-bottom: 3px; + text-align: right; +} + +#recordview { + background-color: #fafafa; + border-bottom: 1px solid #156a16; +} + +#targetview { + background-color: #fafafa; + border-bottom: 1px solid #156a16; +} + +#bytarget { + padding: 7px; +} + +#footer { + padding-top: 4px; + color: #74c775; + text-align: center; +} + +#stat { + font-weight: bold; +} diff --git a/www/jsdemo/index.html b/www/jsdemo/index.html index 286c5f3..1041bf5 100644 --- a/www/jsdemo/index.html +++ b/www/jsdemo/index.html @@ -31,7 +31,7 @@
      - +
      PAZPAR2Pazpar2