Override setting with same name (do not append) PAZ-945

diff --git a/src/session.c b/src/session.c
index 6d7ab65..eac40a0 100644 (file)
--- a/src/session.c
+++ b/src/session.c
@@ -905,36 +905,38 @@ static struct session_database *find_session_database(struct session *se,
 }
 
 // Apply a session override to a database
-void session_apply_setting(struct session *se, char *dbname, char *setting,
+void session_apply_setting(struct session *se, char *dbname, char *name,
                            char *value)
 {
     struct session_database *sdb = find_session_database(se, dbname);
     struct conf_service *service = se->service;
-    struct setting *new = nmem_malloc(se->session_nmem, sizeof(*new));
-    int offset = settings_create_offset(service, setting);
+    struct setting *s;
+    int offset = settings_create_offset(service, name);
 
     expand_settings_array(&sdb->settings, &sdb->num_settings, offset,
                           se->session_nmem);
-    new->precedence = 0;
-    new->target = dbname;
-    new->name = setting;
-    new->value = value;
-    new->next = sdb->settings[offset];
-    sdb->settings[offset] = new;
-
-    se->settings_modified = 1;
 
     // Force later recompute of settings-driven data structures
     // (happens when a search starts and client connections are prepared)
-    switch (offset)
-    {
-    case PZ_XSLT:
-        if (sdb->map)
+    if (offset == PZ_XSLT)
+        sdb->map = 0;
+
+    se->settings_modified = 1;
+    for (s = sdb->settings[offset]; s; s = s->next)
+        if (!strcmp(s->name, name) &&
+            dbname && s->target && !strcmp(dbname, s->target))
         {
-            sdb->map = 0;
+            s->value = value;
+            return;
         }
-        break;
-    }
+    s = nmem_malloc(se->session_nmem, sizeof(*s));
+    s->precedence = 0;
+    s->target = dbname;
+    s->name = name;
+    s->value = value;
+    s->next = sdb->settings[offset];
+    sdb->settings[offset] = s;
+
 }
 
 void session_destroy(struct session *se)

diff --git a/src/settings.c b/src/settings.c
index a17d094..ece8f04 100644 (file)
--- a/src/settings.c
+++ b/src/settings.c
@@ -158,17 +158,24 @@ char *settings_name(struct conf_service *service, int offset)
 
 
 // Apply a session override to a database
-void service_apply_setting(struct conf_service *service, char *setting, char *value)
+void service_apply_setting(struct conf_service *service, char *name, char *value)
 {
-    struct setting *new = nmem_malloc(service->nmem, sizeof(*new));
-    int offset = settings_create_offset(service, setting);
+    struct setting *s;
+    int offset = settings_create_offset(service, name);
     expand_settings_array(&service->settings->settings, &service->settings->num_settings, offset, service->nmem);
-    new->precedence = 0;
-    new->target = NULL;
-    new->name = setting;
-    new->value = value;
-    new->next = service->settings->settings[offset];
-    service->settings->settings[offset] = new;
+    for (s = service->settings->settings[offset]; s; s = s->next)
+        if (!strcmp(s->name, name))
+        {
+            s->value = value;
+            return;
+        }
+    s = nmem_malloc(service->nmem, sizeof(*s));
+    s->precedence = 0;
+    s->target = NULL;
+    s->name = name;
+    s->value = value;
+    s->next = service->settings->settings[offset];
+    service->settings->settings[offset] = s;
 }
 
 

diff --git a/test/test_http_45.res b/test/test_http_45.res
index fa73966..2b2fb5b 100644 (file)
--- a/test/test_http_45.res
+++ b/test/test_http_45.res
@@ -14,7 +14,7 @@
  <md-subject>Imaging systems in medicine</md-subject>
  <md-description>Includes bibliographical references and index</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="2614320583">
+    name="marc" checksum="2614320583">
   <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>
@@ -25,15 +25,6 @@
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Radioisotope scanning</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Scintillation cameras</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Imaging systems in medicine</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>0</relevance>

diff --git a/test/test_http_49.res b/test/test_http_49.res
index 9832043..4c1f533 100644 (file)
--- a/test/test_http_49.res
+++ b/test/test_http_49.res
@@ -14,7 +14,7 @@
  <md-subject>Greece</md-subject>
  <md-description>Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="2614320583">
+    name="marc" checksum="2614320583">
   <md-title>The religious teachers of Greece</md-title>
   <md-date>1972</md-date>
   <md-author>Adam, James</md-author>
@@ -26,12 +26,6 @@
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Greek literature</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Philosophy, Ancient</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>124766</relevance>

diff --git a/test/test_http_50.res b/test/test_http_50.res
index fa73966..2b2fb5b 100644 (file)
--- a/test/test_http_50.res
+++ b/test/test_http_50.res
@@ -14,7 +14,7 @@
  <md-subject>Imaging systems in medicine</md-subject>
  <md-description>Includes bibliographical references and index</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="2614320583">
+    name="marc" checksum="2614320583">
   <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>
@@ -25,15 +25,6 @@
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Radioisotope scanning</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Scintillation cameras</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Imaging systems in medicine</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>0</relevance>

diff --git a/test/test_http_60.res b/test/test_http_60.res
index 99b482c..298cdb2 100644 (file)
--- a/test/test_http_60.res
+++ b/test/test_http_60.res
@@ -14,7 +14,7 @@
  <md-subject>Greece</md-subject>
  <md-description>Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="2614320583">
+    name="marc" checksum="2614320583">
   <md-title>The religious teachers of Greece</md-title>
   <md-date>1972</md-date>
   <md-author>Adam, James</md-author>
@@ -26,12 +26,6 @@
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Greek literature</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Philosophy, Ancient</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>291121</relevance>

diff --git a/test/test_http_63.res b/test/test_http_63.res
index 99b482c..298cdb2 100644 (file)
--- a/test/test_http_63.res
+++ b/test/test_http_63.res
@@ -14,7 +14,7 @@
  <md-subject>Greece</md-subject>
  <md-description>Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="2614320583">
+    name="marc" checksum="2614320583">
   <md-title>The religious teachers of Greece</md-title>
   <md-date>1972</md-date>
   <md-author>Adam, James</md-author>
@@ -26,12 +26,6 @@
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Greek literature</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Philosophy, Ancient</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>291121</relevance>

diff --git a/test/test_http_65.res b/test/test_http_65.res
index b24d50f..efe653d 100644 (file)
--- a/test/test_http_65.res
+++ b/test/test_http_65.res
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bytarget><status>OK</status>
 <target><id>z3950.indexdata.com/marc</id>
-<name>Index Data MARC test server</name>
+<name>marc</name>
 <hits>1</hits>
 <diagnostic>0</diagnostic>
 <records>1</records>

diff --git a/test/test_http_66.res b/test/test_http_66.res
index 99b482c..298cdb2 100644 (file)
--- a/test/test_http_66.res
+++ b/test/test_http_66.res
@@ -14,7 +14,7 @@
  <md-subject>Greece</md-subject>
  <md-description>Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="2614320583">
+    name="marc" checksum="2614320583">
   <md-title>The religious teachers of Greece</md-title>
   <md-date>1972</md-date>
   <md-author>Adam, James</md-author>
@@ -26,12 +26,6 @@
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Greek literature</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Philosophy, Ancient</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>291121</relevance>

diff --git a/test/test_http_71.res b/test/test_http_71.res
index b24d50f..efe653d 100644 (file)
--- a/test/test_http_71.res
+++ b/test/test_http_71.res
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bytarget><status>OK</status>
 <target><id>z3950.indexdata.com/marc</id>
-<name>Index Data MARC test server</name>
+<name>marc</name>
 <hits>1</hits>
 <diagnostic>0</diagnostic>
 <records>1</records>

diff --git a/test/test_http_72.res b/test/test_http_72.res
index 99b482c..298cdb2 100644 (file)
--- a/test/test_http_72.res
+++ b/test/test_http_72.res
@@ -14,7 +14,7 @@
  <md-subject>Greece</md-subject>
  <md-description>Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="2614320583">
+    name="marc" checksum="2614320583">
   <md-title>The religious teachers of Greece</md-title>
   <md-date>1972</md-date>
   <md-author>Adam, James</md-author>
@@ -26,12 +26,6 @@
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Greek literature</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Philosophy, Ancient</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>291121</relevance>

diff --git a/test/test_http_74.res b/test/test_http_74.res
index a105782..698a09e 100644 (file)
--- a/test/test_http_74.res
+++ b/test/test_http_74.res
@@ -13,7 +13,7 @@
  <md-subject>Railroads</md-subject>
  <md-description>&quot;Contract DOT-UT-10003.&quot;</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="4007858895">
+    name="marc" checksum="4007858895">
   <md-title>Washington metropolitan area rail computer feasibility study;</md-title>
   <md-title-remainder>final report</md-title-remainder>
   <md-date>1971</md-date>
@@ -23,9 +23,6 @@
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Railroads</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>59412</relevance>

diff --git a/test/test_http_76.res b/test/test_http_76.res
index 4d7509d..ad132e9 100644 (file)
--- a/test/test_http_76.res
+++ b/test/test_http_76.res
@@ -11,7 +11,7 @@
  <md-date>1977</md-date>
  <md-subject>Optical pattern recognition</md-subject>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="3659474317">
+    name="marc" checksum="3659474317">
   <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>
@@ -19,9 +19,6 @@
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Optical pattern recognition</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>102165</relevance>
@@ -43,7 +40,7 @@ score = relevance(102165);
  <md-subject>Bible</md-subject>
  <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" checksum="3136897450">
+    name="marc" checksum="3136897450">
   <md-title>The Computer Bible</md-title>
   <md-date>1973-1980</md-date>
   <md-subject>Bible. O.T</md-subject>
@@ -73,7 +70,7 @@ score = relevance(102165);
  <md-author>Wood, Helen M</md-author>
  <md-subject>Computers</md-subject>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="3833666606">
+    name="marc" checksum="3833666606">
   <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>
@@ -81,9 +78,6 @@ score = relevance(102165);
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Computers</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>30649</relevance>
@@ -105,7 +99,7 @@ score = relevance(30649);
  <md-subject>Tomography</md-subject>
  <md-description>Includes bibliographical references and index</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="3485282028">
+    name="marc" checksum="3485282028">
   <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>
@@ -114,9 +108,6 @@ score = relevance(30649);
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Tomography</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>0</relevance>

diff --git a/test/test_http_79.res b/test/test_http_79.res
index ced6941..3bbbe07 100644 (file)
--- a/test/test_http_79.res
+++ b/test/test_http_79.res
@@ -14,7 +14,7 @@
  <md-subject>Greece</md-subject>
  <md-description>Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="2614320583">
+    name="marc" checksum="2614320583">
   <md-title>The religious teachers of Greece</md-title>
   <md-date>1972</md-date>
   <md-author>Adam, James</md-author>
@@ -26,12 +26,6 @@
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Greek literature</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Philosophy, Ancient</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>60819</relevance>
@@ -53,7 +47,7 @@ score = relevance(60819);
  <md-author>Smith, George Adam</md-author>
  <md-subject>Bible</md-subject>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="2788512872">
+    name="marc" checksum="2788512872">
   <md-title>Four psalms</md-title>
   <md-title-remainder>XXIII, XXXVI, LII, CXXI</md-title-remainder>
   <md-date>1980</md-date>

diff --git a/test/test_http_81.res b/test/test_http_81.res
index ace9c5e..4633a6c 100644 (file)
--- a/test/test_http_81.res
+++ b/test/test_http_81.res
@@ -14,7 +14,7 @@
  <md-subject>Greece</md-subject>
  <md-description>Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="2614320583">
+    name="marc" checksum="2614320583">
   <md-title>The religious teachers of Greece</md-title>
   <md-date>1972</md-date>
   <md-author>Adam, James</md-author>
@@ -26,12 +26,6 @@
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Greek literature</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Philosophy, Ancient</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>48655</relevance>
@@ -56,7 +50,7 @@ score = relevance(48655);
  <md-subject>Federal aid to education</md-subject>
  <md-description>&quot;This directory was developed by the Technology for the National Diffusion Network Project, Teachers College, Columbia University pursuant to contract number OE-300-83-0253, U.S. Department of Education&quot;--T.p. verso</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="2788512872">
+    name="marc" checksum="2788512872">
   <md-title>Technology programs that work</md-title>
   <md-date>1984</md-date>
   <md-subject>United States</md-subject>
@@ -70,12 +64,6 @@ score = relevance(48655);
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Educational technology</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Federal aid to education</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>4054</relevance>

diff --git a/test/test_http_82.res b/test/test_http_82.res
index fa5a350..d7bc82b 100644 (file)
--- a/test/test_http_82.res
+++ b/test/test_http_82.res
@@ -18,7 +18,7 @@
 <list name="xtargets">
 <term>
 <id>z3950.indexdata.com/marc</id>
-<name>Index Data MARC test server</name>
+<name>marc</name>
 <frequency>2</frequency>
 <state>Client_Idle</state>
 <diagnostic>0</diagnostic>

diff --git a/test/test_http_84.res b/test/test_http_84.res
index 4f857e5..530d935 100644 (file)
--- a/test/test_http_84.res
+++ b/test/test_http_84.res
@@ -14,7 +14,7 @@
  <md-subject>Greece</md-subject>
  <md-description>Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="2614320583">
+    name="marc" checksum="2614320583">
   <md-title>The religious teachers of Greece</md-title>
   <md-date>1972</md-date>
   <md-author>Adam, James</md-author>
@@ -26,12 +26,6 @@
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Greek literature</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Philosophy, Ancient</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>48655</relevance>

diff --git a/test/test_http_88.res b/test/test_http_88.res
index ced51fb..890a78d 100644 (file)
--- a/test/test_http_88.res
+++ b/test/test_http_88.res
@@ -9,7 +9,7 @@
  <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" checksum="2614320583">
+    name="marc" checksum="2614320583">
   <md-title>How to program a computer</md-title>
   <md-author>Jack Collins</md-author>
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
@@ -17,7 +17,7 @@
         YYYYYYYYY</md-test-usersetting-2>
  </location>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="2788512872">
+    name="marc" checksum="2788512872">
   <md-title>How to program a computer</md-title>
   <md-author>Jack Collins</md-author>
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
@@ -46,7 +46,7 @@ score = relevance(48160);
  <md-date>1977</md-date>
  <md-subject>Optical pattern recognition</md-subject>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="3659474317">
+    name="marc" checksum="3659474317">
   <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>
@@ -54,9 +54,6 @@ score = relevance(48160);
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Optical pattern recognition</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>40134</relevance>
@@ -78,7 +75,7 @@ score = relevance(40134);
  <md-subject>Bible</md-subject>
  <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" checksum="3136897450">
+    name="marc" checksum="3136897450">
   <md-title>The Computer Bible</md-title>
   <md-date>1973-1980</md-date>
   <md-subject>Bible. O.T</md-subject>
@@ -109,7 +106,7 @@ score = relevance(40134);
  <md-subject>Community colleges</md-subject>
  <md-description>Cover title</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="4182051184">
+    name="marc" checksum="4182051184">
   <md-title>A plan for community college computer development</md-title>
   <md-date>1971</md-date>
   <md-subject>Universities and colleges</md-subject>
@@ -118,12 +115,6 @@ score = relevance(40134);
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Universities and colleges</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Community colleges</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>17200</relevance>
@@ -146,7 +137,7 @@ score = relevance(17200);
  <md-subject>Railroads</md-subject>
  <md-description>&quot;Contract DOT-UT-10003.&quot;</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="4007858895">
+    name="marc" checksum="4007858895">
   <md-title>Washington metropolitan area rail computer feasibility study;</md-title>
   <md-title-remainder>final report</md-title-remainder>
   <md-date>1971</md-date>
@@ -156,9 +147,6 @@ score = relevance(17200);
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Railroads</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>17200</relevance>
@@ -182,7 +170,7 @@ score = relevance(17200);
  <md-subject>Puget Sound region (Wash.)</md-subject>
  <md-description>Scale of maps ca. 1:1,000,000</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="3311089739">
+    name="marc" checksum="3311089739">
   <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>
@@ -194,9 +182,6 @@ score = relevance(17200);
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Cartography</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>16722</relevance>
@@ -220,7 +205,7 @@ score = relevance(16722);
  <md-subject>Imaging systems in medicine</md-subject>
  <md-description>Includes bibliographical references and index</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="2962705161">
+    name="marc" checksum="2962705161">
   <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>
@@ -231,15 +216,6 @@ score = relevance(16722);
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Radioisotope scanning</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Scintillation cameras</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Imaging systems in medicine</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>12040</relevance>
@@ -260,7 +236,7 @@ score = relevance(12040);
  <md-author>Wood, Helen M</md-author>
  <md-subject>Computers</md-subject>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="3833666606">
+    name="marc" checksum="3833666606">
   <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>
@@ -268,9 +244,6 @@ score = relevance(12040);
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Computers</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>12040</relevance>
@@ -292,7 +265,7 @@ score = relevance(12040);
  <md-subject>Tomography</md-subject>
  <md-description>Includes bibliographical references and index</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="3485282028">
+    name="marc" checksum="3485282028">
   <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>
@@ -301,9 +274,6 @@ score = relevance(12040);
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Tomography</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>0</relevance>

diff --git a/test/test_http_89.res b/test/test_http_89.res
index 9bb5d30..b91efcb 100644 (file)
--- a/test/test_http_89.res
+++ b/test/test_http_89.res
@@ -17,7 +17,7 @@
  <md-subject>Community colleges</md-subject>
  <md-description>&quot;Contract DOT-UT-10003.&quot;</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="3659474317">
+    name="marc" checksum="3659474317">
   <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>
@@ -25,12 +25,9 @@
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Optical pattern recognition</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="3833666606">
+    name="marc" checksum="3833666606">
   <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>
@@ -38,12 +35,9 @@
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Computers</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="4007858895">
+    name="marc" checksum="4007858895">
   <md-title>Washington metropolitan area rail computer feasibility study;</md-title>
   <md-title-remainder>final report</md-title-remainder>
   <md-date>1971</md-date>
@@ -53,12 +47,9 @@
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Railroads</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="4182051184">
+    name="marc" checksum="4182051184">
   <md-title>A plan for community college computer development</md-title>
   <md-date>1971</md-date>
   <md-subject>Universities and colleges</md-subject>
@@ -67,12 +58,6 @@
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Universities and colleges</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Community colleges</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>4</count>
  <relevance>41119</relevance>
@@ -111,7 +96,7 @@ score = relevance(41119);
  <md-subject>Tomography</md-subject>
  <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" checksum="2962705161">
+    name="marc" checksum="2962705161">
   <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>
@@ -122,18 +107,9 @@ score = relevance(41119);
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Radioisotope scanning</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Scintillation cameras</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Imaging systems in medicine</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="3136897450">
+    name="marc" checksum="3136897450">
   <md-title>The Computer Bible</md-title>
   <md-date>1973-1980</md-date>
   <md-subject>Bible. O.T</md-subject>
@@ -145,7 +121,7 @@ score = relevance(41119);
         YYYYYYYYY</md-test-usersetting-2>
  </location>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="3311089739">
+    name="marc" checksum="3311089739">
   <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>
@@ -157,12 +133,9 @@ score = relevance(41119);
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Cartography</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="3485282028">
+    name="marc" checksum="3485282028">
   <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>
@@ -171,9 +144,6 @@ score = relevance(41119);
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Tomography</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>4</count>
  <relevance>32723</relevance>
@@ -198,7 +168,7 @@ score = relevance(32723);
  <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" checksum="2614320583">
+    name="marc" checksum="2614320583">
   <md-title>How to program a computer</md-title>
   <md-author>Jack Collins</md-author>
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
@@ -222,7 +192,7 @@ score = relevance(11437);
  <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" checksum="2788512872">
+    name="marc" checksum="2788512872">
   <md-title>How to program a computer</md-title>
   <md-author>Jack Collins</md-author>
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>

diff --git a/test/test_http_90.res b/test/test_http_90.res
index 480b05e..86487ca 100644 (file)
--- a/test/test_http_90.res
+++ b/test/test_http_90.res
@@ -9,7 +9,7 @@
  <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" checksum="2614320583">
+    name="marc" checksum="2614320583">
   <md-title>How to program a computer</md-title>
   <md-author>Jack Collins</md-author>
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
@@ -17,7 +17,7 @@
         YYYYYYYYY</md-test-usersetting-2>
  </location>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="2788512872">
+    name="marc" checksum="2788512872">
   <md-title>How to program a computer</md-title>
   <md-author>Jack Collins</md-author>
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
@@ -46,7 +46,7 @@ score = relevance(48160);
  <md-date>1977</md-date>
  <md-subject>Optical pattern recognition</md-subject>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="3659474317">
+    name="marc" checksum="3659474317">
   <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>
@@ -54,9 +54,6 @@ score = relevance(48160);
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Optical pattern recognition</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>40134</relevance>
@@ -78,7 +75,7 @@ score = relevance(40134);
  <md-subject>Bible</md-subject>
  <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" checksum="3136897450">
+    name="marc" checksum="3136897450">
   <md-title>The Computer Bible</md-title>
   <md-date>1973-1980</md-date>
   <md-subject>Bible. O.T</md-subject>
@@ -109,7 +106,7 @@ score = relevance(40134);
  <md-subject>Community colleges</md-subject>
  <md-description>Cover title</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="4182051184">
+    name="marc" checksum="4182051184">
   <md-title>A plan for community college computer development</md-title>
   <md-date>1971</md-date>
   <md-subject>Universities and colleges</md-subject>
@@ -118,12 +115,6 @@ score = relevance(40134);
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Universities and colleges</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Community colleges</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>17200</relevance>
@@ -146,7 +137,7 @@ score = relevance(17200);
  <md-subject>Railroads</md-subject>
  <md-description>&quot;Contract DOT-UT-10003.&quot;</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="4007858895">
+    name="marc" checksum="4007858895">
   <md-title>Washington metropolitan area rail computer feasibility study;</md-title>
   <md-title-remainder>final report</md-title-remainder>
   <md-date>1971</md-date>
@@ -156,9 +147,6 @@ score = relevance(17200);
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Railroads</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>17200</relevance>
@@ -182,7 +170,7 @@ score = relevance(17200);
  <md-subject>Puget Sound region (Wash.)</md-subject>
  <md-description>Scale of maps ca. 1:1,000,000</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="3311089739">
+    name="marc" checksum="3311089739">
   <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>
@@ -194,9 +182,6 @@ score = relevance(17200);
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Cartography</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>16722</relevance>
@@ -220,7 +205,7 @@ score = relevance(16722);
  <md-subject>Imaging systems in medicine</md-subject>
  <md-description>Includes bibliographical references and index</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="2962705161">
+    name="marc" checksum="2962705161">
   <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>
@@ -231,15 +216,6 @@ score = relevance(16722);
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Radioisotope scanning</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Scintillation cameras</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Imaging systems in medicine</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>12040</relevance>
@@ -260,7 +236,7 @@ score = relevance(12040);
  <md-author>Wood, Helen M</md-author>
  <md-subject>Computers</md-subject>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="3833666606">
+    name="marc" checksum="3833666606">
   <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>
@@ -268,9 +244,6 @@ score = relevance(12040);
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Computers</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>12040</relevance>
@@ -292,7 +265,7 @@ score = relevance(12040);
  <md-subject>Tomography</md-subject>
  <md-description>Includes bibliographical references and index</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="3485282028">
+    name="marc" checksum="3485282028">
   <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>
@@ -301,9 +274,6 @@ score = relevance(12040);
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Tomography</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>0</relevance>

diff --git a/test/test_sort_6.res b/test/test_sort_6.res
index 7148540..294fe36 100644 (file)
--- a/test/test_sort_6.res
+++ b/test/test_sort_6.res
@@ -10,59 +10,59 @@
 </term>
 </list>
 <list name="subject">
-<term><name>Water-supply</name><frequency>370</frequency></term>
-<term><name>Water</name><frequency>338</frequency></term>
-<term><name>Groundwater</name><frequency>188</frequency></term>
-<term><name>Water resources development</name><frequency>186</frequency></term>
-<term><name>Water quality</name><frequency>174</frequency></term>
-<term><name>Mineral waters</name><frequency>104</frequency></term>
-<term><name>Water quality management</name><frequency>100</frequency></term>
-<term><name>United States</name><frequency>86</frequency></term>
-<term><name>Irrigation</name><frequency>66</frequency></term>
-<term><name>N.Y</name><frequency>56</frequency></term>
-<term><name>Hydraulic engineering</name><frequency>48</frequency></term>
-<term><name>Geology</name><frequency>46</frequency></term>
-<term><name>U.S</name><frequency>46</frequency></term>
-<term><name>Groundwater flow</name><frequency>44</frequency></term>
-<term><name>Birds</name><frequency>42</frequency></term>
+<term><name>Water-supply</name><frequency>185</frequency></term>
+<term><name>Water</name><frequency>169</frequency></term>
+<term><name>Groundwater</name><frequency>94</frequency></term>
+<term><name>Water resources development</name><frequency>93</frequency></term>
+<term><name>Water quality</name><frequency>87</frequency></term>
+<term><name>Mineral waters</name><frequency>52</frequency></term>
+<term><name>Water quality management</name><frequency>50</frequency></term>
+<term><name>United States</name><frequency>43</frequency></term>
+<term><name>Irrigation</name><frequency>33</frequency></term>
+<term><name>N.Y</name><frequency>28</frequency></term>
+<term><name>Hydraulic engineering</name><frequency>24</frequency></term>
+<term><name>Geology</name><frequency>23</frequency></term>
+<term><name>U.S</name><frequency>23</frequency></term>
+<term><name>Groundwater flow</name><frequency>22</frequency></term>
+<term><name>Birds</name><frequency>21</frequency></term>
 </list>
 <list name="author">
-<term><name>Waters, Clara Erskine Clement</name><frequency>18</frequency></term>
-<term><name>Waters, Henry F</name><frequency>16</frequency></term>
-<term><name>Moorman, J. J</name><frequency>14</frequency></term>
-<term><name>Waters, Thomas Franklin</name><frequency>12</frequency></term>
-<term><name>Basak, P</name><frequency>10</frequency></term>
-<term><name>Bergren, Lisa Tawn</name><frequency>10</frequency></term>
-<term><name>Kingsley, Charles</name><frequency>10</frequency></term>
-<term><name>Tyndall, John</name><frequency>10</frequency></term>
-<term><name>Baldwin, William J</name><frequency>8</frequency></term>
-<term><name>Holme, Charles</name><frequency>8</frequency></term>
-<term><name>James, E. J</name><frequency>8</frequency></term>
-<term><name>Nuttall, Thomas</name><frequency>8</frequency></term>
-<term><name>Walton, George Edward</name><frequency>8</frequency></term>
-<term><name>Wilkins, John H</name><frequency>8</frequency></term>
-<term><name>Arthur, Kay</name><frequency>6</frequency></term>
+<term><name>Waters, Clara Erskine Clement</name><frequency>9</frequency></term>
+<term><name>Waters, Henry F</name><frequency>8</frequency></term>
+<term><name>Moorman, J. J</name><frequency>7</frequency></term>
+<term><name>Waters, Thomas Franklin</name><frequency>6</frequency></term>
+<term><name>Basak, P</name><frequency>5</frequency></term>
+<term><name>Bergren, Lisa Tawn</name><frequency>5</frequency></term>
+<term><name>Kingsley, Charles</name><frequency>5</frequency></term>
+<term><name>Tyndall, John</name><frequency>5</frequency></term>
+<term><name>Baldwin, William J</name><frequency>4</frequency></term>
+<term><name>Holme, Charles</name><frequency>4</frequency></term>
+<term><name>James, E. J</name><frequency>4</frequency></term>
+<term><name>Nuttall, Thomas</name><frequency>4</frequency></term>
+<term><name>Walton, George Edward</name><frequency>4</frequency></term>
+<term><name>Wilkins, John H</name><frequency>4</frequency></term>
+<term><name>Arthur, Kay</name><frequency>3</frequency></term>
 </list>
 <list name="date">
-<term><name>2000</name><frequency>822</frequency></term>
-<term><name>1999</name><frequency>636</frequency></term>
-<term><name>1998</name><frequency>180</frequency></term>
-<term><name>2001</name><frequency>174</frequency></term>
-<term><name>1907</name><frequency>100</frequency></term>
-<term><name>1902</name><frequency>92</frequency></term>
-<term><name>1906</name><frequency>86</frequency></term>
-<term><name>1905</name><frequency>78</frequency></term>
-<term><name>1909</name><frequency>78</frequency></term>
-<term><name>1904</name><frequency>72</frequency></term>
-<term><name>1997</name><frequency>70</frequency></term>
-<term><name>1908</name><frequency>66</frequency></term>
-<term><name>1996</name><frequency>64</frequency></term>
-<term><name>1903</name><frequency>60</frequency></term>
-<term><name>1901</name><frequency>58</frequency></term>
+<term><name>2000</name><frequency>411</frequency></term>
+<term><name>1999</name><frequency>318</frequency></term>
+<term><name>1998</name><frequency>90</frequency></term>
+<term><name>2001</name><frequency>87</frequency></term>
+<term><name>1907</name><frequency>50</frequency></term>
+<term><name>1902</name><frequency>46</frequency></term>
+<term><name>1906</name><frequency>43</frequency></term>
+<term><name>1905</name><frequency>39</frequency></term>
+<term><name>1909</name><frequency>39</frequency></term>
+<term><name>1904</name><frequency>36</frequency></term>
+<term><name>1997</name><frequency>35</frequency></term>
+<term><name>1908</name><frequency>33</frequency></term>
+<term><name>1996</name><frequency>32</frequency></term>
+<term><name>1903</name><frequency>30</frequency></term>
+<term><name>1901</name><frequency>29</frequency></term>
 </list>
 <list name="medium">
-<term><name>book</name><frequency>3968</frequency></term>
-<term><name>web</name><frequency>16</frequency></term>
-<term><name>book (electronic)</name><frequency>6</frequency></term>
+<term><name>book</name><frequency>1984</frequency></term>
+<term><name>web</name><frequency>8</frequency></term>
+<term><name>book (electronic)</name><frequency>3</frequency></term>
 </list>
 </termlist>
\ No newline at end of file

diff --git a/test/test_sort_settings.xml b/test/test_sort_settings.xml
index f22d1dd..a970cff 100644 (file)
--- a/test/test_sort_settings.xml
+++ b/test/test_sort_settings.xml
@@ -35,10 +35,6 @@
   <set name="pz:queryencoding"  value="UTF-8" />
   <set name="pz:extra_args"  value="fl=*,score" />
   <set name="pz:termlist_term_count" value="10"/>
-  <set name="pz:facetmap:author"  value="author_exact"  />
-  <set name="pz:facetmap:subject" value="subject_exact" />
-  <set name="pz:facetmap:medium"  value="medium_exact"  />
-  <set name="pz:facetmap:date"  value="date" />
   <set name="pz:maxrecs" value="200" />
   <set name="pz:present_chunk" value="0"/>
 </settings>