Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorMike Taylor <mike@miketaylor.org.uk>
Thu, 19 Nov 2009 16:33:09 +0000 (16:33 +0000)
committerMike Taylor <mike@miketaylor.org.uk>
Thu, 19 Nov 2009 16:33:09 +0000 (16:33 +0000)
21 files changed:
doc/pazpar2_conf.xml
etc/marc21.mmap
js/pz2.js
src/logic.c
src/marcmap.c
src/record.h
src/relevance.c
src/relevance.h
test/run_pazpar2.sh
test/test_http_18.res
test/test_http_32.res
test/test_http_36.res
test/test_http_42.res
test/test_http_5.res
test/test_http_6.res
test/test_http_urls
test/test_icu_urls
test/test_post_10.res
test/test_post_8.res
test/test_post_urls
test/test_settings_urls

index 9782efb..7166ef7 100644 (file)
        map incoming records to the internal representation.
       </para>
       <para>
-       When mapping MARC XML records, XSLT can be bypassed for increased 
+       When mapping MARC records, XSLT can be bypassed for increased 
        performance with the alternate "MARC map" format.  Provide the
        path of a file with extension ".mmap" containing on each line:
        <programlisting>
index 17a5720..b30230f 100644 (file)
 300 g physical-unitsize
 300 3 physical-specified
 440 a series-title
-500 $ description
-505 $ description
-518 $ description
-520 $ description
-522 $ description
+500 * description
+505 * description
+518 * description
+520 * description
+522 * description
 600 a subject
 600 a subject
 610 a subject
index 3804d1a..bf6a9b8 100644 (file)
--- a/js/pz2.js
+++ b/js/pz2.js
@@ -250,6 +250,7 @@ pz2.prototype =
         this.termCounter = 0;
         this.bytargetCounter = 0;
         this.statCounter = 0;
+        this.activeClients = 1;
         
         // no proxy mode
         if( !this.initStatusOK )
index d5c8f76..3afa67c 100644 (file)
@@ -1252,7 +1252,8 @@ struct record *ingest_record(struct client *cl, const char *rec,
             // ranking of _all_ fields enabled ... 
             if (ser_md->rank)
                 relevance_countwords(se->relevance, cluster, 
-                                     (char *) value, ser_md->rank);
+                                     (char *) value, ser_md->rank,
+                                     ser_md->name);
 
             // construct facets ... 
             if (ser_md->termlist)
index 9cf0b03..fb76338 100644 (file)
@@ -138,9 +138,11 @@ xmlDoc *marcmap_apply(struct marcmap *marcmap, xmlDoc *xml_in)
     struct marcmap *mmcur;
      
     xml_out = xmlNewDoc(BAD_CAST "1.0");
+    xml_out->encoding = xmlCharStrdup("UTF-8");
     xml_out_root = xmlNewNode(NULL, BAD_CAST "record");
     xmlDocSetRootElement(xml_out, xml_out_root);
     ns_pz = xmlNewNs(xml_out_root, BAD_CAST "http://www.indexdata.com/pazpar2/1.0", BAD_CAST "pz"); 
+    xmlSetNs(xml_out_root, ns_pz);
     nmem = nmem_create();
     rec_node = xmlDocGetRootElement(xml_in);
     marchash = marchash_create(nmem);
@@ -214,7 +216,7 @@ xmlDoc *marcmap_apply(struct marcmap *marcmap, xmlDoc *xml_in)
     strncat(mergekey, " medium ", 1023 - strlen(mergekey));
     strncat(mergekey, medium, 1023 - strlen(mergekey));
 
-    xmlSetProp(xml_out_root, BAD_CAST "mergekey", BAD_CAST mergekey);
+//    xmlSetProp(xml_out_root, BAD_CAST "mergekey", BAD_CAST mergekey);
 
     nmem_destroy(nmem);
     return xml_out;
index 872c36e..ac38ad3 100644 (file)
@@ -114,6 +114,8 @@ struct record_cluster
     char *merge_key;
     int relevance;
     int *term_frequency_vec;
+    int *term_frequency_vec_tmp;
+    float *term_frequency_vecf;
     // Set-specific ID for this record
     char *recid;
     struct record *records;
index 262d517..c88676e 100644 (file)
@@ -21,151 +21,22 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <config.h>
 #endif
 
+#include <assert.h>
 #include <math.h>
 #include <stdlib.h>
 
 #include "relevance.h"
 #include "pazpar2.h"
 
-#define USE_TRIE 0
-
 struct relevance
 {
     int *doc_frequency_vec;
     int vec_len;
-#if USE_TRIE
-    struct word_trie *wt;
-#else
     struct word_entry *entries;
     pp2_charset_t pct;
-#endif
     NMEM nmem;
 };
 
-#if USE_TRIE
-#define raw_char(c) (((c) >= 'a' && (c) <= 'z') ? (c) - 'a' : -1)
-
-
-// We use this data structure to recognize terms in input records,
-// and map them to record term vectors for counting.
-struct word_trie
-{
-    struct
-    {
-        struct word_trie *child;
-        int termno;
-    } list[26];
-};
-
-static struct word_trie *create_word_trie_node(NMEM nmem)
-{
-    struct word_trie *res = nmem_malloc(nmem, sizeof(struct word_trie));
-    int i;
-    for (i = 0; i < 26; i++)
-    {
-        res->list[i].child = 0;
-        res->list[i].termno = -1;
-    }
-    return res;
-}
-
-static void word_trie_addterm(NMEM nmem, struct word_trie *n, const char *term, int num)
-{
-
-    while (*term) {
-        int c = tolower(*term);
-        if (c < 'a' || c > 'z')
-            term++;
-        else
-        {
-            c -= 'a';
-            if (!*(++term))
-                n->list[c].termno = num;
-            else
-            {
-                if (!n->list[c].child)
-                {
-                    struct word_trie *new = create_word_trie_node(nmem);
-                    n->list[c].child = new;
-                }
-                word_trie_addterm(nmem, n->list[c].child, term, num);
-            }
-            break;
-        }
-    }
-}
-
-static int word_trie_match(struct word_trie *t, const char *word, int *skipped)
-{
-    int c = raw_char(tolower(*word));
-
-    if (!*word)
-        return 0;
-
-    word++;
-    (*skipped)++;
-    if (!*word || raw_char(*word) < 0)
-    {
-        if (t->list[c].termno > 0)
-            return t->list[c].termno;
-        else
-            return 0;
-    }
-    else
-    {
-        if (t->list[c].child)
-        {
-            return word_trie_match(t->list[c].child, word, skipped);
-        }
-        else
-            return 0;
-    }
-
-}
-
-
-static struct word_trie *build_word_trie(NMEM nmem, const char **terms)
-{
-    struct word_trie *res = create_word_trie_node(nmem);
-    const char **p;
-    int i;
-
-    for (i = 1, p = terms; *p; p++, i++)
-        word_trie_addterm(nmem, res, *p, i);
-    return res;
-}
-
-
-// FIXME. The definition of a word is crude here.. should support
-// some form of localization mechanism?
-void relevance_countwords(struct relevance *r, struct record_cluster *cluster,
-                          const char *words, int multiplier)
-{
-    while (*words)
-    {
-        char c;
-        int res;
-        int skipped = 0;
-        while (*words && (c = raw_char(tolower(*words))) < 0)
-            words++;
-        if (!*words)
-            break;
-        res = word_trie_match(r->wt, words, &skipped);
-        if (res)
-        {
-            words += skipped;
-            cluster->term_frequency_vec[res] += multiplier;
-        }
-        else
-        {
-            while (*words && (c = raw_char(tolower(*words))) >= 0)
-                words++;
-        }
-        cluster->term_frequency_vec[0]++;
-    }
-}
-
-#else
 
 struct word_entry {
     const char *norm_str;
@@ -220,25 +91,37 @@ static struct word_entry *build_word_entries(pp2_charset_t pct, NMEM nmem,
 }
 
 void relevance_countwords(struct relevance *r, struct record_cluster *cluster,
-        const char *words, int multiplier)
+                          const char *words, int multiplier, const char *name)
 {
     pp2_relevance_token_t prt = pp2_relevance_tokenize(r->pct, words);
-    
+    int *mult = cluster->term_frequency_vec_tmp;
     const char *norm_str;
-    
+    int i, length = 0;
+
+    for (i = 1; i < r->vec_len; i++)
+        mult[i] = 0;
+
     while ((norm_str = pp2_relevance_token_next(prt)))
     {
         int res = word_entry_match(r->entries, norm_str);
         if (res)
-            cluster->term_frequency_vec[res] += multiplier;
-        cluster->term_frequency_vec[0]++;
+        {
+            assert(res < r->vec_len);
+            mult[res] += multiplier;
+        }
+        length++;
     }
-    pp2_relevance_token_destroy(prt);
-}
-
-#endif
 
+    for (i = 1; i < r->vec_len; i++)
+    {
+        if (length > 0) /* only add if non-empty */
+            cluster->term_frequency_vecf[i] += (double) mult[i] / length;
+        cluster->term_frequency_vec[i] += mult[i];
+    }
 
+    cluster->term_frequency_vec[0] += length;
+    pp2_relevance_token_destroy(prt);
+}
 
 struct relevance *relevance_create(pp2_charset_t pct,
                                    NMEM nmem, const char **terms)
@@ -253,12 +136,8 @@ struct relevance *relevance_create(pp2_charset_t pct,
     res->doc_frequency_vec = nmem_malloc(nmem, res->vec_len * sizeof(int));
     memset(res->doc_frequency_vec, 0, res->vec_len * sizeof(int));
     res->nmem = nmem;
-#if USE_TRIE
-    res->wt = build_word_trie(nmem, terms);
-#else
     res->entries = build_word_entries(pct, nmem, terms);
     res->pct = pct;
-#endif
     return res;
 }
 
@@ -266,8 +145,26 @@ void relevance_newrec(struct relevance *r, struct record_cluster *rec)
 {
     if (!rec->term_frequency_vec)
     {
-        rec->term_frequency_vec = nmem_malloc(r->nmem, r->vec_len * sizeof(int));
-        memset(rec->term_frequency_vec, 0, r->vec_len * sizeof(int));
+        int i;
+
+        // term frequency [1,..] . [0] is total length of all fields
+        rec->term_frequency_vec =
+            nmem_malloc(r->nmem,
+                        r->vec_len * sizeof(*rec->term_frequency_vec));
+        for (i = 0; i < r->vec_len; i++)
+            rec->term_frequency_vec[i] = 0;
+        
+        // term frequency divided by length of field [1,...]
+        rec->term_frequency_vecf =
+            nmem_malloc(r->nmem,
+                        r->vec_len * sizeof(*rec->term_frequency_vecf));
+        for (i = 0; i < r->vec_len; i++)
+            rec->term_frequency_vecf[i] = 0.0;
+        
+        // for relevance_countwords (so we don't have to xmalloc/xfree)
+        rec->term_frequency_vec_tmp =
+            nmem_malloc(r->nmem,
+                        r->vec_len * sizeof(*rec->term_frequency_vec_tmp));
     }
 }
 
@@ -320,9 +217,17 @@ void relevance_prepare_read(struct relevance *rel, struct reclist *reclist)
         for (t = 1; t < rel->vec_len; t++)
         {
             float termfreq;
-            if (!rec->term_frequency_vec[0])
-                break;
-            termfreq = (float) rec->term_frequency_vec[t] / rec->term_frequency_vec[0];
+#if 1
+            termfreq = (float) rec->term_frequency_vecf[t];
+#else
+            if (rec->term_frequency_vec[0])
+            {
+                termfreq = (float)
+                    rec->term_frequency_vec[t] / rec->term_frequency_vec[0] ;
+            }
+            else
+                termfreq = 0.0;
+#endif
             relevance += 100000 * (termfreq * idfvec[t] + 0.0000005);  
         }
         rec->relevance = relevance;
index e271d8c..28f4daa 100644 (file)
@@ -31,7 +31,7 @@ struct relevance *relevance_create(pp2_charset_t pct,
                                    NMEM nmem, const char **terms);
 void relevance_newrec(struct relevance *r, struct record_cluster *cluster);
 void relevance_countwords(struct relevance *r, struct record_cluster *cluster,
-        const char *words, int multiplier);
+                          const char *words, int multiplier, const char *name);
 void relevance_donerecord(struct relevance *r, struct record_cluster *cluster);
 
 void relevance_prepare_read(struct relevance *rel, struct reclist *rec);
index 858bd45..fd3cf49 100755 (executable)
@@ -40,11 +40,7 @@ CFG=${PREFIX}.cfg
 URLS=${PREFIX}_urls
 VALGRINDLOG=${PREFIX}_valgrind.log
 
-usevalgrind=false
 if test -n "$PAZPAR2_USE_VALGRIND"; then
-    usevalgrind=$PAZPAR2_USE_VALGRIND;
-fi
-if $usevalgrind; then
     valgrind --leak-check=full --log-file=$VALGRINDLOG ../src/pazpar2 -X -l pazpar2.log -f ${CFG} >extra_pazpar2.log 2>&1 &
 else
     YAZ_LOG=zoom,zoomdetails,debug,log,fatal ../src/pazpar2 -d -X -l pazpar2.log -f ${srcdir}/${CFG} >extra_pazpar2.log 2>&1 &
@@ -69,10 +65,6 @@ fi
 
 # We can start test for real
 
-oIFS="$IFS"
-IFS='
-'
-
 testno=1
 for f in `cat ${srcdir}/${URLS}`; do
     if echo $f | grep '^http' >/dev/null; then
@@ -121,7 +113,6 @@ for f in `cat ${srcdir}/${URLS}`; do
        exit 1
     fi
 done
-IFS="$oIFS"
 
 # Kill programs
 
index f0209cd..77b4469 100644 (file)
@@ -15,7 +15,7 @@
 <md-description tag="513">1692-PRESENT</md-description>
 <md-test-usersetting-2>test-usersetting-2 data: 
 </md-test-usersetting-2></location>
-<relevance>8239</relevance>
+<relevance>9416</relevance>
 <recid>title bibliography of maine geology author medium book</recid>
 </hit>
 <hit>
index 78d626c..58c002a 100644 (file)
 <md-description>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</md-description><location id="z3950.indexdata.com/gils" name="gils">
 <md-title>BIBLIOGRAPHY OF MAINE GEOLOGY</md-title>
 <md-description>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</md-description></location>
-<relevance>8450</relevance>
-<recid>title bibliography of maine geology author medium book</recid>
-</hit>
-<hit>
-
-<md-title>GROUNDWATER RESOURCE MAPS - COUNTY SERIES</md-title>
-<md-description>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&apos;s comprises this data set.  Some series also show bedrock topography and potentiometric surface.  Geographic coverage is restricted to Southern Maine</md-description><location id="z3950.indexdata.com/gils" name="gils">
-<md-title>GROUNDWATER RESOURCE MAPS - COUNTY SERIES</md-title>
-<md-description>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&apos;s comprises this data set.  Some series also show bedrock topography and potentiometric surface.  Geographic coverage is restricted to Southern Maine</md-description></location>
-<relevance>0</relevance>
-<recid>title groundwater resource maps county series author medium book</recid>
+<relevance>9416</relevance>
+<recid>z3950.indexdata.com/gils-3</recid>
 </hit>
 <hit>
 
 <md-title>OIL/GAS DRILLING</md-title>
 <md-description>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</md-description></location>
 <relevance>0</relevance>
-<recid>title oil gas drilling author medium book</recid>
+<recid>z3950.indexdata.com/gils-1</recid>
+</hit>
+<hit>
+
+<md-title>GROUNDWATER RESOURCE MAPS - COUNTY SERIES</md-title>
+<md-description>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&apos;s comprises this data set.  Some series also show bedrock topography and potentiometric surface.  Geographic coverage is restricted to Southern Maine</md-description><location id="z3950.indexdata.com/gils" name="gils">
+<md-title>GROUNDWATER RESOURCE MAPS - COUNTY SERIES</md-title>
+<md-description>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&apos;s comprises this data set.  Some series also show bedrock topography and potentiometric surface.  Geographic coverage is restricted to Southern Maine</md-description></location>
+<relevance>0</relevance>
+<recid>z3950.indexdata.com/gils-2</recid>
 </hit>
 </show>
index 37c6f43..6905e5a 100644 (file)
@@ -8,6 +8,35 @@
 <num>8</num>
 <hit>
 
+<md-title>Computer science &amp; technology</md-title>
+<md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
+<md-date>1977</md-date><location id="z3950.indexdata.com/marc" name="marc">
+<md-title>Computer science &amp; technology</md-title>
+<md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
+<md-date>1977</md-date>
+<md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
+<md-test-usersetting-2>test-usersetting-2 data: 
+        YYYYYYYYY</md-test-usersetting-2></location>
+<relevance>26706</relevance>
+<recid>title computer science technology author medium book</recid>
+</hit>
+<hit>
+
+<md-title>The Computer Bible</md-title>
+<md-date>1973-1980</md-date>
+<md-description>Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates</md-description><location id="z3950.indexdata.com/marc" name="marc">
+<md-title>The Computer Bible</md-title>
+<md-date>1973-1980</md-date>
+<md-description tag="500">Hebrew and Greek; introductions in English</md-description>
+<md-description tag="500">Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates</md-description>
+<md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
+<md-test-usersetting-2>test-usersetting-2 data: 
+        YYYYYYYYY</md-test-usersetting-2></location>
+<relevance>26706</relevance>
+<recid>title the computer bible author medium book</recid>
+</hit>
+<hit>
+
 <md-title>A plan for community college computer development</md-title>
 <md-date>1971</md-date>
 <md-description>Cover title</md-description><location id="z3950.indexdata.com/marc" name="marc">
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>5722</relevance>
+<relevance>11445</relevance>
 <recid>title a plan for community college computer development author medium book</recid>
 </hit>
 <hit>
 
-<md-title>The use of passwords for controlled access to computer resources</md-title>
-<md-date>1977</md-date>
-<md-author>Wood, Helen M</md-author><location id="z3950.indexdata.com/marc" name="marc">
-<md-title>The use of passwords for controlled access to computer resources</md-title>
-<md-date>1977</md-date>
-<md-author>Wood, Helen M</md-author>
-<md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
-<md-test-usersetting-2>test-usersetting-2 data: 
-        YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>5722</relevance>
-<recid>title the use of passwords for controlled access to computer resources author wood helen m medium book</recid>
-</hit>
-<hit>
-
 <md-title>Washington metropolitan area rail computer feasibility study;</md-title>
 <md-title-remainder>final report</md-title-remainder>
 <md-date>1971</md-date>
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>5007</relevance>
+<relevance>11445</relevance>
 <recid>title washington metropolitan area rail computer feasibility study author englund carl r medium book</recid>
 </hit>
 <hit>
 
-<md-title>Computer science &amp; technology</md-title>
-<md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
-<md-date>1977</md-date><location id="z3950.indexdata.com/marc" name="marc">
-<md-title>Computer science &amp; technology</md-title>
-<md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
-<md-date>1977</md-date>
-<md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
-<md-test-usersetting-2>test-usersetting-2 data: 
-        YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>4005</relevance>
-<recid>title computer science technology author medium book</recid>
-</hit>
-<hit>
-
-<md-title>The Computer Bible</md-title>
-<md-date>1973-1980</md-date>
-<md-description>Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates</md-description><location id="z3950.indexdata.com/marc" name="marc">
-<md-title>The Computer Bible</md-title>
-<md-date>1973-1980</md-date>
-<md-description tag="500">Hebrew and Greek; introductions in English</md-description>
-<md-description tag="500">Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates</md-description>
-<md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
-<md-test-usersetting-2>test-usersetting-2 data: 
-        YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>4005</relevance>
-<recid>title the computer bible author medium book</recid>
-</hit>
-<hit>
-
 <md-title>The Puget Sound Region</md-title>
 <md-title-remainder>a portfolio of thematic computer maps</md-title-remainder>
 <md-date>1974</md-date>
@@ -97,7 +83,7 @@
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>3338</relevance>
+<relevance>11127</relevance>
 <recid>title the puget sound region author mairs john w medium book</recid>
 </hit>
 <hit>
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>2861</relevance>
+<relevance>8011</relevance>
 <recid>title computer processing of dynamic images from an anger scintillation camera author medium book</recid>
 </hit>
 <hit>
 
+<md-title>The use of passwords for controlled access to computer resources</md-title>
+<md-date>1977</md-date>
+<md-author>Wood, Helen M</md-author><location id="z3950.indexdata.com/marc" name="marc">
+<md-title>The use of passwords for controlled access to computer resources</md-title>
+<md-date>1977</md-date>
+<md-author>Wood, Helen M</md-author>
+<md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
+<md-test-usersetting-2>test-usersetting-2 data: 
+        YYYYYYYYY</md-test-usersetting-2></location>
+<relevance>8011</relevance>
+<recid>title the use of passwords for controlled access to computer resources author wood helen m medium book</recid>
+</hit>
+<hit>
+
 <md-title>Reconstruction tomography in diagnostic radiology and nuclear medicine</md-title>
 <md-title-remainder>proceedings of the workshop</md-title-remainder>
 <md-date>1977</md-date>
index 357f780..8bd663c 100644 (file)
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>48000</relevance>
+<relevance>174545</relevance>
 <recid>title the religious teachers of greece author adam james medium book</recid>
 </hit>
 <hit>
 
-<md-title>The use of passwords for controlled access to computer resources</md-title>
-<md-date>1977</md-date>
-<md-author>Wood, Helen M</md-author><location id="z3950.indexdata.com/marc" name="marc">
-<md-title>The use of passwords for controlled access to computer resources</md-title>
-<md-date>1977</md-date>
-<md-author>Wood, Helen M</md-author>
-<md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
-<md-test-usersetting-2>test-usersetting-2 data: 
-        YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>42857</relevance>
-<recid>title the use of passwords for controlled access to computer resources author wood helen m medium book</recid>
-</hit>
-<hit>
-
 <md-title>The Puget Sound Region</md-title>
 <md-title-remainder>a portfolio of thematic computer maps</md-title-remainder>
 <md-date>1974</md-date>
@@ -53,7 +39,7 @@
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>30000</relevance>
+<relevance>150000</relevance>
 <recid>title the puget sound region author mairs john w medium book</recid>
 </hit>
 <hit>
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>27777</relevance>
+<relevance>125000</relevance>
 <recid>title reconstruction tomography in diagnostic radiology and nuclear medicine author medium book</recid>
 </hit>
 <hit>
 
+<md-title>The use of passwords for controlled access to computer resources</md-title>
+<md-date>1977</md-date>
+<md-author>Wood, Helen M</md-author><location id="z3950.indexdata.com/marc" name="marc">
+<md-title>The use of passwords for controlled access to computer resources</md-title>
+<md-date>1977</md-date>
+<md-author>Wood, Helen M</md-author>
+<md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
+<md-test-usersetting-2>test-usersetting-2 data: 
+        YYYYYYYYY</md-test-usersetting-2></location>
+<relevance>60000</relevance>
+<recid>title the use of passwords for controlled access to computer resources author wood helen m medium book</recid>
+</hit>
+<hit>
+
 <md-title>Computer science &amp; technology</md-title>
 <md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
 <md-date>1977</md-date><location id="z3950.indexdata.com/marc" name="marc">
@@ -83,7 +83,7 @@
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>25000</relevance>
+<relevance>35714</relevance>
 <recid>title computer science technology author medium book</recid>
 </hit>
 </show>
index d324e23..a884f56 100644 (file)
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
 <count>2</count>
-<relevance>9030</relevance>
+<relevance>25286</relevance>
 <recid>title how to program a computer author jack collins medium book</recid>
 </hit>
 <hit>
 
+<md-title>Computer science &amp; technology</md-title>
+<md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
+<md-date>1977</md-date><location id="z3950.indexdata.com/marc" name="Index Data MARC test server">
+<md-title>Computer science &amp; technology</md-title>
+<md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
+<md-date>1977</md-date>
+<md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
+<md-test-usersetting-2>test-usersetting-2 data: 
+        YYYYYYYYY</md-test-usersetting-2></location>
+<relevance>21072</relevance>
+<recid>title computer science technology author medium book</recid>
+</hit>
+<hit>
+
+<md-title>The Computer Bible</md-title>
+<md-date>1973-1980</md-date>
+<md-description>Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates</md-description><location id="z3950.indexdata.com/marc" name="Index Data MARC test server">
+<md-title>The Computer Bible</md-title>
+<md-date>1973-1980</md-date>
+<md-description tag="500">Hebrew and Greek; introductions in English</md-description>
+<md-description tag="500">Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates</md-description>
+<md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
+<md-test-usersetting-2>test-usersetting-2 data: 
+        YYYYYYYYY</md-test-usersetting-2></location>
+<relevance>21072</relevance>
+<recid>title the computer bible author medium book</recid>
+</hit>
+<hit>
+
 <md-title>A plan for community college computer development</md-title>
 <md-date>1971</md-date>
 <md-description>Cover title</md-description><location id="z3950.indexdata.com/marc" name="Index Data MARC test server">
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>4515</relevance>
+<relevance>9030</relevance>
 <recid>title a plan for community college computer development author medium book</recid>
 </hit>
 <hit>
 
-<md-title>The use of passwords for controlled access to computer resources</md-title>
-<md-date>1977</md-date>
-<md-author>Wood, Helen M</md-author><location id="z3950.indexdata.com/marc" name="Index Data MARC test server">
-<md-title>The use of passwords for controlled access to computer resources</md-title>
-<md-date>1977</md-date>
-<md-author>Wood, Helen M</md-author>
-<md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
-<md-test-usersetting-2>test-usersetting-2 data: 
-        YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>4515</relevance>
-<recid>title the use of passwords for controlled access to computer resources author wood helen m medium book</recid>
-</hit>
-<hit>
-
 <md-title>Washington metropolitan area rail computer feasibility study;</md-title>
 <md-title-remainder>final report</md-title-remainder>
 <md-date>1971</md-date>
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>3951</relevance>
+<relevance>9030</relevance>
 <recid>title washington metropolitan area rail computer feasibility study author englund carl r medium book</recid>
 </hit>
 <hit>
 
-<md-title>Computer science &amp; technology</md-title>
-<md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
-<md-date>1977</md-date><location id="z3950.indexdata.com/marc" name="Index Data MARC test server">
-<md-title>Computer science &amp; technology</md-title>
-<md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
-<md-date>1977</md-date>
-<md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
-<md-test-usersetting-2>test-usersetting-2 data: 
-        YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>3160</relevance>
-<recid>title computer science technology author medium book</recid>
-</hit>
-<hit>
-
-<md-title>The Computer Bible</md-title>
-<md-date>1973-1980</md-date>
-<md-description>Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates</md-description><location id="z3950.indexdata.com/marc" name="Index Data MARC test server">
-<md-title>The Computer Bible</md-title>
-<md-date>1973-1980</md-date>
-<md-description tag="500">Hebrew and Greek; introductions in English</md-description>
-<md-description tag="500">Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates</md-description>
-<md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
-<md-test-usersetting-2>test-usersetting-2 data: 
-        YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>3160</relevance>
-<recid>title the computer bible author medium book</recid>
-</hit>
-<hit>
-
 <md-title>The Puget Sound Region</md-title>
 <md-title-remainder>a portfolio of thematic computer maps</md-title-remainder>
 <md-date>1974</md-date>
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>2634</relevance>
+<relevance>8780</relevance>
 <recid>title the puget sound region author mairs john w medium book</recid>
 </hit>
 <hit>
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>2257</relevance>
+<relevance>6321</relevance>
 <recid>title computer processing of dynamic images from an anger scintillation camera author medium book</recid>
 </hit>
 <hit>
 
+<md-title>The use of passwords for controlled access to computer resources</md-title>
+<md-date>1977</md-date>
+<md-author>Wood, Helen M</md-author><location id="z3950.indexdata.com/marc" name="Index Data MARC test server">
+<md-title>The use of passwords for controlled access to computer resources</md-title>
+<md-date>1977</md-date>
+<md-author>Wood, Helen M</md-author>
+<md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
+<md-test-usersetting-2>test-usersetting-2 data: 
+        YYYYYYYYY</md-test-usersetting-2></location>
+<relevance>6321</relevance>
+<recid>title the use of passwords for controlled access to computer resources author wood helen m medium book</recid>
+</hit>
+<hit>
+
 <md-title>Reconstruction tomography in diagnostic radiology and nuclear medicine</md-title>
 <md-title-remainder>proceedings of the workshop</md-title-remainder>
 <md-date>1977</md-date>
index bd664dd..c0c00f3 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <record>
 <recid>title how to program a computer author jack collins medium book</recid>
-<nextrecid>title a plan for community college computer development author medium book</nextrecid>
+<nextrecid>title computer science technology author medium book</nextrecid>
 <activeclients>0</activeclients>
 
 <md-title>How to program a computer</md-title>
index facd11a..93cf534 100644 (file)
@@ -2,8 +2,7 @@ http://localhost:9763/search.pz2?command=init&pz:elements%5Bz3950.indexdata.com%
 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
+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
@@ -16,35 +15,28 @@ 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.xsl
 http://localhost:9763/search.pz2?session=2&command=search&query=computer
-2
-http://localhost:9763/search.pz2?session=2&command=show&block=1
+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
+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
+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=xml
 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
+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
+2 http://localhost:9763/search.pz2?session=4&command=show&block=1
 http://localhost:9763/search.pz2?command=init&clear=1
 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.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
+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
+2 http://localhost:9763/search.pz2?session=3&command=show&block=1
 http://localhost:9763/search.pz2?session=5&command=show&block=1
index 7667cd3..57bd419 100644 (file)
@@ -1,8 +1,7 @@
 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
+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
index 4ec240f..4ad81c0 100644 (file)
@@ -8,15 +8,6 @@
 <num>9</num>
 <hit>
 
-<md-title>The Computer Bible</md-title>
-<md-date>1973-1980</md-date><location id="z3950.indexdata.com/marc" name="Index Data MARC test server">
-<md-title>The Computer Bible</md-title>
-<md-date>1973-1980</md-date></location>
-<relevance>21072</relevance>
-<recid>title the computer bible author medium book</recid>
-</hit>
-<hit>
-
 <md-title>How to program a computer</md-title>
 <md-author>Jack Collins</md-author><location id="z3950.indexdata.com/marc" name="Index Data MARC test server">
 <md-title>How to program a computer</md-title>
 <md-title>How to program a computer</md-title>
 <md-author>Jack Collins</md-author></location>
 <count>2</count>
-<relevance>9030</relevance>
+<relevance>25286</relevance>
 <recid>title how to program a computer author jack collins medium book</recid>
 </hit>
 <hit>
 
+<md-title>Computer science &amp; technology</md-title>
+<md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
+<md-date>1977</md-date><location id="z3950.indexdata.com/marc" name="Index Data MARC test server">
+<md-title>Computer science &amp; technology</md-title>
+<md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
+<md-date>1977</md-date></location>
+<relevance>21072</relevance>
+<recid>title computer science technology author medium book</recid>
+</hit>
+<hit>
+
+<md-title>The Computer Bible</md-title>
+<md-date>1973-1980</md-date><location id="z3950.indexdata.com/marc" name="Index Data MARC test server">
+<md-title>The Computer Bible</md-title>
+<md-date>1973-1980</md-date></location>
+<relevance>21072</relevance>
+<recid>title the computer bible author medium book</recid>
+</hit>
+<hit>
+
 <md-title>A plan for community college computer development</md-title>
 <md-date>1971</md-date><location id="z3950.indexdata.com/marc" name="Index Data MARC test server">
 <md-title>A plan for community college computer development</md-title>
 <md-date>1971</md-date></location>
-<relevance>5268</relevance>
+<relevance>9030</relevance>
 <recid>title a plan for community college computer development author medium book</recid>
 </hit>
 <hit>
 <md-title-remainder>final report</md-title-remainder>
 <md-date>1971</md-date>
 <md-author>Englund, Carl R</md-author></location>
-<relevance>4862</relevance>
+<relevance>9030</relevance>
 <recid>title washington metropolitan area rail computer feasibility study author englund carl r medium book</recid>
 </hit>
 <hit>
 
-<md-title>The use of passwords for controlled access to computer resources</md-title>
-<md-date>1977</md-date>
-<md-author>Wood, Helen M</md-author><location id="z3950.indexdata.com/marc" name="Index Data MARC test server">
-<md-title>The use of passwords for controlled access to computer resources</md-title>
-<md-date>1977</md-date>
-<md-author>Wood, Helen M</md-author></location>
-<relevance>4515</relevance>
-<recid>title the use of passwords for controlled access to computer resources author wood helen m medium book</recid>
-</hit>
-<hit>
-
 <md-title>The Puget Sound Region</md-title>
 <md-title-remainder>a portfolio of thematic computer maps</md-title-remainder>
 <md-date>1974</md-date>
 <md-title-remainder>a portfolio of thematic computer maps</md-title-remainder>
 <md-date>1974</md-date>
 <md-author>Mairs, John W</md-author></location>
-<relevance>3762</relevance>
+<relevance>8780</relevance>
 <recid>title the puget sound region author mairs john w medium book</recid>
 </hit>
 <hit>
 
-<md-title>Computer science &amp; technology</md-title>
-<md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
-<md-date>1977</md-date><location id="z3950.indexdata.com/marc" name="Index Data MARC test server">
-<md-title>Computer science &amp; technology</md-title>
-<md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
-<md-date>1977</md-date></location>
-<relevance>3160</relevance>
-<recid>title computer science technology author medium book</recid>
-</hit>
-<hit>
-
 <md-title>Computer processing of dynamic images from an Anger scintillation camera</md-title>
 <md-title-remainder>the proceedings of a workshop</md-title-remainder>
 <md-date>1974</md-date><location id="z3950.indexdata.com/marc" name="Index Data MARC test server">
 <md-title>Computer processing of dynamic images from an Anger scintillation camera</md-title>
 <md-title-remainder>the proceedings of a workshop</md-title-remainder>
 <md-date>1974</md-date></location>
-<relevance>2748</relevance>
+<relevance>6321</relevance>
 <recid>title computer processing of dynamic images from an anger scintillation camera author medium book</recid>
 </hit>
 <hit>
 
+<md-title>The use of passwords for controlled access to computer resources</md-title>
+<md-date>1977</md-date>
+<md-author>Wood, Helen M</md-author><location id="z3950.indexdata.com/marc" name="Index Data MARC test server">
+<md-title>The use of passwords for controlled access to computer resources</md-title>
+<md-date>1977</md-date>
+<md-author>Wood, Helen M</md-author></location>
+<relevance>6321</relevance>
+<recid>title the use of passwords for controlled access to computer resources author wood helen m medium book</recid>
+</hit>
+<hit>
+
 <md-title>Reconstruction tomography in diagnostic radiology and nuclear medicine</md-title>
 <md-title-remainder>proceedings of the workshop</md-title-remainder>
 <md-date>1977</md-date><location id="z3950.indexdata.com/marc" name="Index Data MARC test server">
index 4ec240f..4ad81c0 100644 (file)
@@ -8,15 +8,6 @@
 <num>9</num>
 <hit>
 
-<md-title>The Computer Bible</md-title>
-<md-date>1973-1980</md-date><location id="z3950.indexdata.com/marc" name="Index Data MARC test server">
-<md-title>The Computer Bible</md-title>
-<md-date>1973-1980</md-date></location>
-<relevance>21072</relevance>
-<recid>title the computer bible author medium book</recid>
-</hit>
-<hit>
-
 <md-title>How to program a computer</md-title>
 <md-author>Jack Collins</md-author><location id="z3950.indexdata.com/marc" name="Index Data MARC test server">
 <md-title>How to program a computer</md-title>
 <md-title>How to program a computer</md-title>
 <md-author>Jack Collins</md-author></location>
 <count>2</count>
-<relevance>9030</relevance>
+<relevance>25286</relevance>
 <recid>title how to program a computer author jack collins medium book</recid>
 </hit>
 <hit>
 
+<md-title>Computer science &amp; technology</md-title>
+<md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
+<md-date>1977</md-date><location id="z3950.indexdata.com/marc" name="Index Data MARC test server">
+<md-title>Computer science &amp; technology</md-title>
+<md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
+<md-date>1977</md-date></location>
+<relevance>21072</relevance>
+<recid>title computer science technology author medium book</recid>
+</hit>
+<hit>
+
+<md-title>The Computer Bible</md-title>
+<md-date>1973-1980</md-date><location id="z3950.indexdata.com/marc" name="Index Data MARC test server">
+<md-title>The Computer Bible</md-title>
+<md-date>1973-1980</md-date></location>
+<relevance>21072</relevance>
+<recid>title the computer bible author medium book</recid>
+</hit>
+<hit>
+
 <md-title>A plan for community college computer development</md-title>
 <md-date>1971</md-date><location id="z3950.indexdata.com/marc" name="Index Data MARC test server">
 <md-title>A plan for community college computer development</md-title>
 <md-date>1971</md-date></location>
-<relevance>5268</relevance>
+<relevance>9030</relevance>
 <recid>title a plan for community college computer development author medium book</recid>
 </hit>
 <hit>
 <md-title-remainder>final report</md-title-remainder>
 <md-date>1971</md-date>
 <md-author>Englund, Carl R</md-author></location>
-<relevance>4862</relevance>
+<relevance>9030</relevance>
 <recid>title washington metropolitan area rail computer feasibility study author englund carl r medium book</recid>
 </hit>
 <hit>
 
-<md-title>The use of passwords for controlled access to computer resources</md-title>
-<md-date>1977</md-date>
-<md-author>Wood, Helen M</md-author><location id="z3950.indexdata.com/marc" name="Index Data MARC test server">
-<md-title>The use of passwords for controlled access to computer resources</md-title>
-<md-date>1977</md-date>
-<md-author>Wood, Helen M</md-author></location>
-<relevance>4515</relevance>
-<recid>title the use of passwords for controlled access to computer resources author wood helen m medium book</recid>
-</hit>
-<hit>
-
 <md-title>The Puget Sound Region</md-title>
 <md-title-remainder>a portfolio of thematic computer maps</md-title-remainder>
 <md-date>1974</md-date>
 <md-title-remainder>a portfolio of thematic computer maps</md-title-remainder>
 <md-date>1974</md-date>
 <md-author>Mairs, John W</md-author></location>
-<relevance>3762</relevance>
+<relevance>8780</relevance>
 <recid>title the puget sound region author mairs john w medium book</recid>
 </hit>
 <hit>
 
-<md-title>Computer science &amp; technology</md-title>
-<md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
-<md-date>1977</md-date><location id="z3950.indexdata.com/marc" name="Index Data MARC test server">
-<md-title>Computer science &amp; technology</md-title>
-<md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
-<md-date>1977</md-date></location>
-<relevance>3160</relevance>
-<recid>title computer science technology author medium book</recid>
-</hit>
-<hit>
-
 <md-title>Computer processing of dynamic images from an Anger scintillation camera</md-title>
 <md-title-remainder>the proceedings of a workshop</md-title-remainder>
 <md-date>1974</md-date><location id="z3950.indexdata.com/marc" name="Index Data MARC test server">
 <md-title>Computer processing of dynamic images from an Anger scintillation camera</md-title>
 <md-title-remainder>the proceedings of a workshop</md-title-remainder>
 <md-date>1974</md-date></location>
-<relevance>2748</relevance>
+<relevance>6321</relevance>
 <recid>title computer processing of dynamic images from an anger scintillation camera author medium book</recid>
 </hit>
 <hit>
 
+<md-title>The use of passwords for controlled access to computer resources</md-title>
+<md-date>1977</md-date>
+<md-author>Wood, Helen M</md-author><location id="z3950.indexdata.com/marc" name="Index Data MARC test server">
+<md-title>The use of passwords for controlled access to computer resources</md-title>
+<md-date>1977</md-date>
+<md-author>Wood, Helen M</md-author></location>
+<relevance>6321</relevance>
+<recid>title the use of passwords for controlled access to computer resources author wood helen m medium book</recid>
+</hit>
+<hit>
+
 <md-title>Reconstruction tomography in diagnostic radiology and nuclear medicine</md-title>
 <md-title-remainder>proceedings of the workshop</md-title-remainder>
 <md-date>1977</md-date><location id="z3950.indexdata.com/marc" name="Index Data MARC test server">
index 4a96ddc..3bf0975 100644 (file)
@@ -1,16 +1,12 @@
-marc_service.xml
-http://localhost:9763/search.pz2?command=init
+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
+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
+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
+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
index 4222fbc..32e1cda 100644 (file)
@@ -1,5 +1,4 @@
 http://localhost:9763/search.pz2?session=1&command=init
 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
-2
-http://localhost:9763/search.pz2?session=1&command=bytarget&settings=1
+2 http://localhost:9763/search.pz2?session=1&command=bytarget&settings=1