Merge branch 'protocol-version2' of ssh://git.indexdata.com/home/git/pub/pazpar2...

diff --git a/src/client.c b/src/client.c
index eee0396..dcbfd6c 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -1328,7 +1328,7 @@ Odr_int client_get_hits(struct client *cl)
 Odr_int client_get_approximation(struct client *cl)
 {
     if (cl->record_offset > 0) {
-        Odr_int approx = (cl->hits * (cl->record_offset - cl->filtered)) / cl->record_offset;
+        Odr_int approx = ((10 * cl->hits * (cl->record_offset - cl->filtered)) / cl->record_offset + 5) /10;
         yaz_log(YLOG_LOG, "%s: Approx: %lld * %d / %d = %lld ", client_get_id(cl), cl->hits, cl->record_offset - cl->filtered, cl->record_offset, approx);
         return approx;
     }

diff --git a/src/settings.c b/src/settings.c
index e7d5b3d..124d9db 100644 (file)
--- a/src/settings.c
+++ b/src/settings.c
@@ -71,7 +71,7 @@ static char *hard_settings[] = {
     "pz:max_connections",
     "pz:reuse_connections",
     "pz:termlist_term_factor",
-    "pz:termlist_term_cont",
+    "pz:termlist_term_count",
     "pz:preferred",
     "pz:extra_args",
     "pz:query_syntax",
@@ -505,8 +505,6 @@ static void initialize_hard_settings(struct conf_service *service)
 void initialize_soft_settings(struct conf_service *service)
 {
     int i;
-    yaz_log(YLOG_LOG, "Init soft settings");
-
     for (i = 0; i < service->num_metadata; i++)
     {
         struct conf_metadata *md = &service->metadata[i];
@@ -516,20 +514,22 @@ void initialize_soft_settings(struct conf_service *service)
 
         // Also create setting for some metadata attributes.
         if (md->limitmap) {
-            yaz_log(YLOG_LOG, "Metadata %s has limitmap: %s ",md->name,  md->limitmap);
+            int index; 
             WRBUF wrbuf = wrbuf_alloc();
+            yaz_log(YLOG_DEBUG, "Metadata %s has limitmap: %s ",md->name,  md->limitmap);
             wrbuf_printf(wrbuf, "pz:limitmap:%s", md->name);
-            int index = settings_create_offset(service, wrbuf_cstr(wrbuf));
+            index = settings_create_offset(service, wrbuf_cstr(wrbuf));
             if (index >= 0) {
-                yaz_log(YLOG_LOG, "Service %s default %s=%s",
-                        (service->id ? service->id: "unknown"), wrbuf_cstr(wrbuf), md->limitmap);
                 struct setting new;
+                int offset;
+                yaz_log(YLOG_DEBUG, "Service %s default %s=%s",
+                        (service->id ? service->id: "unknown"), wrbuf_cstr(wrbuf), md->limitmap);
                 new.name = (char *) wrbuf_cstr(wrbuf);
                 new.value = md->limitmap;
                 new.next = 0;
                 new.target = 0;
                 new.precedence = 0;
-                int offset = settings_create_offset(service, new.name);
+                offset = settings_create_offset(service, new.name);
                 update_settings(&new, service->settings, offset, service->nmem);
             }
             wrbuf_destroy(wrbuf);

diff --git a/test/run_pazpar2.sh b/test/run_pazpar2.sh
index 55aeac6..3a56249 100755 (executable)
--- a/test/run_pazpar2.sh
+++ b/test/run_pazpar2.sh
@@ -151,6 +151,9 @@ if [ -z "$SKIP_PAZPAR2" ] ; then
     sleep 2
 fi
 
+# clean out empty diff files
+find . -name "$TEST*.dif" -empty -delete 
+
 exit $code
 
 # Local Variables:

diff --git a/test/test_limit_limitmap.urls b/test/test_limit_limitmap.urls
index eda63e7..a986e6b 100644 (file)
--- a/test/test_limit_limitmap.urls
+++ b/test/test_limit_limitmap.urls
@@ -19,12 +19,7 @@ test_limit_limitmap_settings_3.xml http://localhost:9763/search.pz2?session=1&co
 http://localhost:9763/search.pz2?session=1&command=search&query=greece&limit=author%3Dadam\,+james%7Cother_author&filter=pz%3Aid%3DTarget-1
 http://localhost:9763/search.pz2?session=1&command=bytarget
 http://localhost:9763/search.pz2?session=1&command=show
-http://localhost:9763/search.pz2?session=1&command=search&query=greece&limit=author%3Dadam\,+james%7Cother_author&filter=pz%3Aid%3Dnone
-http://localhost:9763/search.pz2?session=1&command=bytarget
-http://localhost:9763/search.pz2?session=1&command=show
-http://localhost:9763/search.pz2?session=1&command=search&query=greece&limit=author%3Dadam\,+james%7Cother_author
-http://localhost:9763/search.pz2?session=1&command=bytarget
-http://localhost:9763/search.pz2?session=1&command=show
+test_limit_limitmap_settings_4.xml http://localhost:9763/search.pz2?session=1&command=settings
 http://localhost:9763/search.pz2?session=1&command=search&query=computer&limit=Mysubject%3DRailroads
 http://localhost:9763/search.pz2?session=1&command=show&block=1
 http://localhost:9763/search.pz2?session=1&command=search&query=computer&limit=date%3D1977

diff --git a/test/test_limit_limitmap_11.res b/test/test_limit_limitmap_11.res
index dc1690c..94fb9e9 100644 (file)
--- a/test/test_limit_limitmap_11.res
+++ b/test/test_limit_limitmap_11.res
@@ -22,16 +22,16 @@
 <term><name>Langer, Maria</name><frequency>2</frequency></term>
 <term><name>Norton, Peter</name><frequency>2</frequency></term>
 <term><name>Watt, Alan H</name><frequency>2</frequency></term>
-<term><name>Abass, Olayide</name><frequency>1</frequency></term>
 <term><name>Aldrich, Richard W</name><frequency>1</frequency></term>
 <term><name>Appleman, Daniel</name><frequency>1</frequency></term>
 <term><name>Bainbridge, David I</name><frequency>1</frequency></term>
 <term><name>Caplin, Steve</name><frequency>1</frequency></term>
 <term><name>Cole, Eric</name><frequency>1</frequency></term>
-<term><name>Cooley, Peter</name><frequency>1</frequency></term>
+<term><name>De Jong, Kenneth A</name><frequency>1</frequency></term>
 <term><name>Dowd, Kevin</name><frequency>1</frequency></term>
 <term><name>Hodges, M. Susan</name><frequency>1</frequency></term>
 <term><name>Kaasgaard, Klaus</name><frequency>1</frequency></term>
+<term><name>Lasser, Jon</name><frequency>1</frequency></term>
 </list>
 <list name="subject">
 <term><name>Computers</name><frequency>22</frequency></term>

diff --git a/test/test_limit_limitmap_12.res b/test/test_limit_limitmap_12.res
index b841038..4bbf745 100644 (file)
--- a/test/test_limit_limitmap_12.res
+++ b/test/test_limit_limitmap_12.res
@@ -23,16 +23,16 @@
 <term><name>Langer, Maria</name><frequency>2</frequency></term>
 <term><name>Norton, Peter</name><frequency>2</frequency></term>
 <term><name>Watt, Alan H</name><frequency>2</frequency></term>
-<term><name>Abass, Olayide</name><frequency>1</frequency></term>
 <term><name>Aldrich, Richard W</name><frequency>1</frequency></term>
 <term><name>Appleman, Daniel</name><frequency>1</frequency></term>
 <term><name>Bainbridge, David I</name><frequency>1</frequency></term>
 <term><name>Caplin, Steve</name><frequency>1</frequency></term>
 <term><name>Cole, Eric</name><frequency>1</frequency></term>
-<term><name>Cooley, Peter</name><frequency>1</frequency></term>
+<term><name>De Jong, Kenneth A</name><frequency>1</frequency></term>
 <term><name>Dowd, Kevin</name><frequency>1</frequency></term>
 <term><name>Hodges, M. Susan</name><frequency>1</frequency></term>
 <term><name>Kaasgaard, Klaus</name><frequency>1</frequency></term>
+<term><name>Lasser, Jon</name><frequency>1</frequency></term>
 </list>
 <list name="subject">
 <term><name>Computers</name><frequency>22</frequency></term>

diff --git a/test/test_limit_limitmap_14.res b/test/test_limit_limitmap_14.res
index e2db1ca..ab63fe6 100644 (file)
--- a/test/test_limit_limitmap_14.res
+++ b/test/test_limit_limitmap_14.res
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<error code="3" msg="Malformed parameter value">query</error>
\ No newline at end of file
+<search><status>OK</status></search>
\ No newline at end of file

diff --git a/test/test_limit_limitmap_15.res b/test/test_limit_limitmap_15.res
index 5a1147b..447378b 100644 (file)
--- a/test/test_limit_limitmap_15.res
+++ b/test/test_limit_limitmap_15.res
@@ -1,8 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <show><status>OK</status>
 <activeclients>0</activeclients>
-<merged>0</merged>
-<total>0</total>
+<merged>1</merged>
+<total>2016</total>
 <start>0</start>
-<num>0</num>
+<num>1</num>
+<hit>
+
+<md-title>The religious teachers of Greece</md-title>
+<md-date>1972</md-date>
+<md-author>Adam, James</md-author>
+<md-description>Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures</md-description><location id="Target-1" name="ztest-db1">
+<md-title>The religious teachers of Greece</md-title>
+<md-date>1972</md-date>
+<md-author>Adam, James</md-author>
+<md-description>Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures</md-description>
+<md-test-usersetting>XXXXXXXXXX</md-test-usersetting></location>
+<relevance>620000</relevance>
+<recid>content: title the religious teachers of greece author adam james</recid>
+</hit>
 </show>
\ No newline at end of file

diff --git a/test/test_limit_limitmap_22.res b/test/test_limit_limitmap_22.res
index d486aeb..42534e3 100644 (file)
--- a/test/test_limit_limitmap_22.res
+++ b/test/test_limit_limitmap_22.res
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<error code="8" msg="No targets"></error>
\ No newline at end of file
+<settings><status>OK</status></settings>
\ No newline at end of file

diff --git a/test/test_limit_limitmap_23.res b/test/test_limit_limitmap_23.res
index e506085..ab63fe6 100644 (file)
--- a/test/test_limit_limitmap_23.res
+++ b/test/test_limit_limitmap_23.res
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bytarget><status>OK</status></bytarget>
\ No newline at end of file
+<search><status>OK</status></search>
\ No newline at end of file

diff --git a/test/test_limit_limitmap_24.res b/test/test_limit_limitmap_24.res
index 5a1147b..7d1c254 100644 (file)
--- a/test/test_limit_limitmap_24.res
+++ b/test/test_limit_limitmap_24.res
@@ -1,8 +1,262 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <show><status>OK</status>
-<activeclients>0</activeclients>
-<merged>0</merged>
-<total>0</total>
+<activeclients>1</activeclients>
+<merged>100</merged>
+<total>2015</total>
 <start>0</start>
-<num>0</num>
+<num>20</num>
+<hit>
+
+<md-title>Adobe Illustrator for the Mac</md-title>
+<md-title-remainder>fast &amp; easy</md-title-remainder>
+<md-date>2001</md-date>
+<md-author>Woodward, C. Michael</md-author><location id="Target-2" name="LOC-SOLR">
+<md-title>Adobe Illustrator for the Mac</md-title>
+<md-title-remainder>fast &amp; easy</md-title-remainder>
+<md-date>2001</md-date>
+<md-author>Woodward, C. Michael</md-author></location>
+<relevance>37125</relevance>
+<recid>content: title adobe illustrator for the mac author woodward c michael</recid>
+</hit>
+<hit>
+
+<md-title>Advanced computer performance modeling and simulation</md-title>
+<md-date>1998</md-date><location id="Target-2" name="LOC-SOLR">
+<md-title>Advanced computer performance modeling and simulation</md-title>
+<md-date>1998</md-date></location>
+<relevance>37125</relevance>
+<recid>content: title advanced computer performance modeling and simulation</recid>
+</hit>
+<hit>
+
+<md-title>Cyberterrorism and computer crimes</md-title>
+<md-title-remainder>issues surrounding the establishment of an international regime</md-title-remainder>
+<md-date>2000</md-date>
+<md-author>Aldrich, Richard W</md-author>
+<md-description>&quot;April 2000.&quot;</md-description><location id="Target-2" name="LOC-SOLR">
+<md-title>Cyberterrorism and computer crimes</md-title>
+<md-title-remainder>issues surrounding the establishment of an international regime</md-title-remainder>
+<md-date>2000</md-date>
+<md-author>Aldrich, Richard W</md-author>
+<md-description>&quot;April 2000.&quot;</md-description></location>
+<relevance>37125</relevance>
+<recid>content: title cyberterrorism and computer crimes author aldrich richard w</recid>
+</hit>
+<hit>
+
+<md-title>Computer interfacing</md-title>
+<md-date>2000</md-date>
+<md-author>Smith, George A</md-author><location id="Target-2" name="LOC-SOLR">
+<md-title>Computer interfacing</md-title>
+<md-date>2000</md-date>
+<md-author>Smith, George A</md-author></location>
+<relevance>34031</relevance>
+<recid>content: title computer interfacing author smith george a</recid>
+</hit>
+<hit>
+
+<md-title>Software design and usability</md-title>
+<md-title-remainder>talks with Bonnie Nardi, Jakob Nielsen, David Smith, Austin Henderson &amp; Jed Harris, Terry Winograd, Stephanie Rosenbaum</md-title-remainder>
+<md-date>2000</md-date>
+<md-author>Kaasgaard, Klaus</md-author><location id="Target-2" name="LOC-SOLR">
+<md-title>Software design and usability</md-title>
+<md-title-remainder>talks with Bonnie Nardi, Jakob Nielsen, David Smith, Austin Henderson &amp; Jed Harris, Terry Winograd, Stephanie Rosenbaum</md-title-remainder>
+<md-date>2000</md-date>
+<md-author>Kaasgaard, Klaus</md-author></location>
+<relevance>34031</relevance>
+<recid>content: title software design and usability author kaasgaard klaus</recid>
+</hit>
+<hit>
+
+<md-title>Everything you need to know about the dangers of computer hacking</md-title>
+<md-date>2000</md-date>
+<md-author>Knittel, John</md-author>
+<md-description>Explains what computer hacking is, who does it, and how dangerous it can be</md-description><location id="Target-2" name="LOC-SOLR">
+<md-title>Everything you need to know about the dangers of computer hacking</md-title>
+<md-date>2000</md-date>
+<md-author>Knittel, John</md-author>
+<md-description>Explains what computer hacking is, who does it, and how dangerous it can be</md-description></location>
+<relevance>32544</relevance>
+<recid>content: title everything you need to know about the dangers of computer hacking author knittel john</recid>
+</hit>
+<hit>
+
+<md-title>Computer peripherals</md-title>
+<md-date>1995</md-date>
+<md-author>Cook, Barry M</md-author><location id="Target-2" name="LOC-SOLR">
+<md-title>Computer peripherals</md-title>
+<md-date>1995</md-date>
+<md-author>Cook, Barry M</md-author></location>
+<relevance>32484</relevance>
+<recid>content: title computer peripherals author cook barry m</recid>
+</hit>
+<hit>
+
+<md-title>Kids&apos; computer book</md-title>
+<md-date>1994</md-date>
+<md-description>Discusses a variety of educational and game software for children  with suggestions for setting up a computer system. Includes a 3 1/2 in. disk with 6 shareware programs for children</md-description><location id="Target-2" name="LOC-SOLR">
+<md-title>Kids&apos; computer book</md-title>
+<md-date>1994</md-date>
+<md-description>&quot;For kids and their parents&quot;--Cover</md-description>
+<md-description>Discusses a variety of educational and game software for children  with suggestions for setting up a computer system. Includes a 3 1/2 in. disk with 6 shareware programs for children</md-description></location>
+<relevance>28531</relevance>
+<recid>content: title kids computer book</recid>
+</hit>
+<hit>
+
+<md-title>Computer friendly</md-title>
+<md-date>1999</md-date>
+<md-author>Steinbacher, Raymond</md-author><location id="Target-2" name="LOC-SOLR">
+<md-title>Computer friendly</md-title>
+<md-date>1999</md-date>
+<md-author>Steinbacher, Raymond</md-author></location>
+<relevance>27843</relevance>
+<recid>content: title computer friendly author steinbacher raymond</recid>
+</hit>
+<hit>
+
+<md-title>Computer misuse</md-title>
+<md-date>1999</md-date>
+<md-description>&quot;Also published as Parliamentary Paper E 31AO&quot;--T.p. verso</md-description><location id="Target-2" name="LOC-SOLR">
+<md-title>Computer misuse</md-title>
+<md-date>1999</md-date>
+<md-description>&quot;May 1999.&quot;</md-description>
+<md-description>&quot;NZLC R54&quot;--T.p. verso</md-description>
+<md-description>&quot;Also published as Parliamentary Paper E 31AO&quot;--T.p. verso</md-description></location>
+<relevance>27843</relevance>
+<recid>content: title computer misuse</recid>
+</hit>
+<hit>
+
+<md-title>Computer networking</md-title>
+<md-title-remainder>a top-down approach featuring the Internet</md-title-remainder>
+<md-date>2001</md-date>
+<md-author>Ross, Keith W</md-author><location id="Target-2" name="LOC-SOLR">
+<md-title>Computer networking</md-title>
+<md-title-remainder>a top-down approach featuring the Internet</md-title-remainder>
+<md-date>2001</md-date>
+<md-author>Ross, Keith W</md-author></location>
+<relevance>27843</relevance>
+<recid>content: title computer networking author ross keith w</recid>
+</hit>
+<hit>
+
+<md-title>CorelDRAW 8 for Windows</md-title>
+<md-date>1998</md-date>
+<md-author>Davis, Phyllis</md-author>
+<md-description>Includes index</md-description><location id="Target-2" name="LOC-SOLR">
+<md-title>CorelDRAW 8 for Windows</md-title>
+<md-date>1998</md-date>
+<md-author>Davis, Phyllis</md-author>
+<md-description>Includes index</md-description></location>
+<relevance>27843</relevance>
+<recid>content: title coreldraw for windows author davis phyllis</recid>
+</hit>
+<hit>
+
+<md-title>Quicken 2001 Deluxe for Macintosh</md-title>
+<md-title-remainder>the official guide</md-title-remainder>
+<md-date>2001</md-date>
+<md-author>Langer, Maria</md-author>
+<md-description>Includes index</md-description><location id="Target-2" name="LOC-SOLR">
+<md-title>Quicken 2001 Deluxe for Macintosh</md-title>
+<md-title-remainder>the official guide</md-title-remainder>
+<md-date>2001</md-date>
+<md-author>Langer, Maria</md-author>
+<md-description>Includes index</md-description></location>
+<relevance>27843</relevance>
+<recid>content: title quicken deluxe for macintosh author langer maria</recid>
+</hit>
+<hit>
+
+<md-title>Quicken 2000 for the Mac</md-title>
+<md-title-remainder>the official guide</md-title-remainder>
+<md-date>2000</md-date>
+<md-author>Langer, Maria</md-author>
+<md-description>&quot;Covers Quicken deluxe 2000 for the Mac&quot;--Cover</md-description><location id="Target-2" name="LOC-SOLR">
+<md-title>Quicken 2000 for the Mac</md-title>
+<md-title-remainder>the official guide</md-title-remainder>
+<md-date>2000</md-date>
+<md-author>Langer, Maria</md-author>
+<md-description>Includes index</md-description>
+<md-description>&quot;Covers Quicken deluxe 2000 for the Mac&quot;--Cover</md-description></location>
+<relevance>27843</relevance>
+<recid>content: title quicken for the mac author langer maria</recid>
+</hit>
+<hit>
+
+<md-title>Sicherheit und Schutz im Netz</md-title>
+<md-date>1998</md-date><location id="Target-2" name="LOC-SOLR">
+<md-title>Sicherheit und Schutz im Netz</md-title>
+<md-date>1998</md-date></location>
+<relevance>27843</relevance>
+<recid>content: title sicherheit und schutz im netz</recid>
+</hit>
+<hit>
+
+<md-title>Unix Secure Shell</md-title>
+<md-date>1999</md-date>
+<md-author>Carasik, Anne H</md-author>
+<md-description>Includes index</md-description><location id="Target-2" name="LOC-SOLR">
+<md-title>Unix Secure Shell</md-title>
+<md-date>1999</md-date>
+<md-author>Carasik, Anne H</md-author>
+<md-description>Includes index</md-description></location>
+<relevance>27843</relevance>
+<recid>content: title unix secure shell author carasik anne h</recid>
+</hit>
+<hit>
+
+<md-title>www.StopThief.net</md-title>
+<md-title-remainder>protecting your identity on the Web</md-title-remainder>
+<md-date>1999</md-date>
+<md-author>Marcella, Albert J</md-author><location id="Target-2" name="LOC-SOLR">
+<md-title>www.StopThief.net</md-title>
+<md-title-remainder>protecting your identity on the Web</md-title-remainder>
+<md-date>1999</md-date>
+<md-author>Marcella, Albert J</md-author></location>
+<relevance>27843</relevance>
+<recid>content: title www stopthief net author marcella albert j</recid>
+</hit>
+<hit>
+
+<md-title>Eight International Conference on Computer Communications and Networks</md-title>
+<md-title-remainder>proceedings, 11-13 October 1999, Boston, Massachusetts</md-title-remainder>
+<md-date>1999</md-date>
+<md-description>&quot;IEEE catalog number 99EX370&quot;--T.p. verso</md-description><location id="Target-2" name="LOC-SOLR">
+<md-title>Eight International Conference on Computer Communications and Networks</md-title>
+<md-title-remainder>proceedings, 11-13 October 1999, Boston, Massachusetts</md-title-remainder>
+<md-date>1999</md-date>
+<md-description>&quot;IEEE catalog number 99EX370&quot;--T.p. verso</md-description></location>
+<relevance>26297</relevance>
+<recid>content: title eight international conference on computer communications and networks</recid>
+</hit>
+<hit>
+
+<md-title>Building storage networks</md-title>
+<md-date>2000</md-date>
+<md-author>Farley, Marc</md-author>
+<md-description>Includes index</md-description><location id="Target-2" name="LOC-SOLR">
+<md-title>Building storage networks</md-title>
+<md-date>2000</md-date>
+<md-author>Farley, Marc</md-author>
+<md-description>Includes index</md-description></location>
+<relevance>24750</relevance>
+<recid>content: title building storage networks author farley marc</recid>
+</hit>
+<hit>
+
+<md-title>Complete CL</md-title>
+<md-title-remainder>the definitive control language programming guide</md-title-remainder>
+<md-date>1999</md-date>
+<md-author>Malaga, Ernie</md-author>
+<md-description>Includes index</md-description><location id="Target-2" name="LOC-SOLR">
+<md-title>Complete CL</md-title>
+<md-title-remainder>the definitive control language programming guide</md-title-remainder>
+<md-date>1999</md-date>
+<md-author>Malaga, Ernie</md-author>
+<md-description>Includes index</md-description></location>
+<relevance>24750</relevance>
+<recid>content: title complete cl author malaga ernie</recid>
+</hit>
 </show>
\ No newline at end of file

diff --git a/test/test_limit_limitmap_26.res b/test/test_limit_limitmap_26.res
index ae42f75..40370c0 100644 (file)
--- a/test/test_limit_limitmap_26.res
+++ b/test/test_limit_limitmap_26.res
@@ -1,16 +1,57 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bytarget><status>OK</status>
-<target><id>Target-1</id>
-<name>ztest-db1</name>
-<hits>1</hits>
-<diagnostic>0</diagnostic>
-<records>1</records>
-<state>Client_Idle</state>
-</target>
-<target><id>Target-2</id>
-<name>LOC-SOLR</name>
-<hits>0</hits>
-<diagnostic>0</diagnostic>
-<records>0</records>
-<state>Client_Error</state>
-</target></bytarget>
\ No newline at end of file
+<show><status>OK</status>
+<activeclients>0</activeclients>
+<merged>4</merged>
+<total>10</total>
+<start>0</start>
+<num>4</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="Target-1" name="ztest-db1">
+<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></location>
+<relevance>57536</relevance>
+<recid>content: title computer science technology</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="Target-1" name="ztest-db1">
+<md-title>The Computer Bible</md-title>
+<md-date>1973-1980</md-date>
+<md-description>Hebrew and Greek; introductions in English</md-description>
+<md-description>Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates</md-description>
+<md-test-usersetting>XXXXXXXXXX</md-test-usersetting></location>
+<relevance>57536</relevance>
+<recid>content: title the computer bible</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="Target-1" name="ztest-db1">
+<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></location>
+<relevance>17260</relevance>
+<recid>content: title the use of passwords for controlled access to computer resources author wood helen m</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="Target-1" name="ztest-db1">
+<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>
+<md-test-usersetting>XXXXXXXXXX</md-test-usersetting></location>
+<relevance>0</relevance>
+<recid>content: title reconstruction tomography in diagnostic radiology and nuclear medicine</recid>
+</hit>
+</show>
\ No newline at end of file

diff --git a/test/test_limit_limitmap_29.res b/test/test_limit_limitmap_29.res
index c4adebe..7d1c254 100644 (file)
--- a/test/test_limit_limitmap_29.res
+++ b/test/test_limit_limitmap_29.res
@@ -1,128 +1,262 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <show><status>OK</status>
 <activeclients>1</activeclients>
-<merged>9</merged>
-<total>10</total>
+<merged>100</merged>
+<total>2015</total>
 <start>0</start>
-<num>9</num>
-<hit>
-
-<md-title>How to program a computer</md-title>
-<md-author>Jack Collins</md-author><location id="Target-1" name="ztest-db1">
-<md-title>How to program a computer</md-title>
-<md-author>Jack Collins</md-author>
-<md-test-usersetting>XXXXXXXXXX</md-test-usersetting></location>
-<location id="Target-1" name="ztest-db1">
-<md-title>How to program a computer</md-title>
-<md-author>Jack Collins</md-author>
-<md-test-usersetting>XXXXXXXXXX</md-test-usersetting></location>
-<count>2</count>
-<relevance>25286</relevance>
-<recid>content: title how to program a computer author jack collins</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="Target-1" name="ztest-db1">
-<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></location>
-<relevance>21072</relevance>
-<recid>content: title computer science technology</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="Target-1" name="ztest-db1">
-<md-title>The Computer Bible</md-title>
-<md-date>1973-1980</md-date>
-<md-description>Hebrew and Greek; introductions in English</md-description>
-<md-description>Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates</md-description>
-<md-test-usersetting>XXXXXXXXXX</md-test-usersetting></location>
-<relevance>21072</relevance>
-<recid>content: title the computer bible</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="Target-1" name="ztest-db1">
-<md-title>A plan for community college computer development</md-title>
-<md-date>1971</md-date>
-<md-description>Cover title</md-description>
-<md-test-usersetting>XXXXXXXXXX</md-test-usersetting></location>
-<relevance>9030</relevance>
-<recid>content: title a plan for community college computer development</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-author>Englund, Carl R</md-author>
-<md-description>&quot;Contract DOT-UT-10003.&quot;</md-description><location id="Target-1" name="ztest-db1">
-<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-author>Englund, Carl R</md-author>
-<md-description>&quot;Contract DOT-UT-10003.&quot;</md-description>
-<md-test-usersetting>XXXXXXXXXX</md-test-usersetting></location>
-<relevance>9030</relevance>
-<recid>content: title washington metropolitan area rail computer feasibility study author englund carl r</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-author>Mairs, John W</md-author>
-<md-description>Scale of maps ca. 1:1,000,000</md-description><location id="Target-1" name="ztest-db1">
-<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-author>Mairs, John W</md-author>
-<md-description>Scale of maps ca. 1:1,000,000</md-description>
-<md-test-usersetting>XXXXXXXXXX</md-test-usersetting></location>
-<relevance>8780</relevance>
-<recid>content: title the puget sound region author mairs john w</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="Target-1" name="ztest-db1">
-<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>
-<md-test-usersetting>XXXXXXXXXX</md-test-usersetting></location>
-<relevance>6321</relevance>
-<recid>content: title computer processing of dynamic images from an anger scintillation camera</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="Target-1" name="ztest-db1">
-<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></location>
-<relevance>6321</relevance>
-<recid>content: title the use of passwords for controlled access to computer resources author wood helen m</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="Target-1" name="ztest-db1">
-<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>
-<md-test-usersetting>XXXXXXXXXX</md-test-usersetting></location>
-<relevance>0</relevance>
-<recid>content: title reconstruction tomography in diagnostic radiology and nuclear medicine</recid>
+<num>20</num>
+<hit>
+
+<md-title>Adobe Illustrator for the Mac</md-title>
+<md-title-remainder>fast &amp; easy</md-title-remainder>
+<md-date>2001</md-date>
+<md-author>Woodward, C. Michael</md-author><location id="Target-2" name="LOC-SOLR">
+<md-title>Adobe Illustrator for the Mac</md-title>
+<md-title-remainder>fast &amp; easy</md-title-remainder>
+<md-date>2001</md-date>
+<md-author>Woodward, C. Michael</md-author></location>
+<relevance>37125</relevance>
+<recid>content: title adobe illustrator for the mac author woodward c michael</recid>
+</hit>
+<hit>
+
+<md-title>Advanced computer performance modeling and simulation</md-title>
+<md-date>1998</md-date><location id="Target-2" name="LOC-SOLR">
+<md-title>Advanced computer performance modeling and simulation</md-title>
+<md-date>1998</md-date></location>
+<relevance>37125</relevance>
+<recid>content: title advanced computer performance modeling and simulation</recid>
+</hit>
+<hit>
+
+<md-title>Cyberterrorism and computer crimes</md-title>
+<md-title-remainder>issues surrounding the establishment of an international regime</md-title-remainder>
+<md-date>2000</md-date>
+<md-author>Aldrich, Richard W</md-author>
+<md-description>&quot;April 2000.&quot;</md-description><location id="Target-2" name="LOC-SOLR">
+<md-title>Cyberterrorism and computer crimes</md-title>
+<md-title-remainder>issues surrounding the establishment of an international regime</md-title-remainder>
+<md-date>2000</md-date>
+<md-author>Aldrich, Richard W</md-author>
+<md-description>&quot;April 2000.&quot;</md-description></location>
+<relevance>37125</relevance>
+<recid>content: title cyberterrorism and computer crimes author aldrich richard w</recid>
+</hit>
+<hit>
+
+<md-title>Computer interfacing</md-title>
+<md-date>2000</md-date>
+<md-author>Smith, George A</md-author><location id="Target-2" name="LOC-SOLR">
+<md-title>Computer interfacing</md-title>
+<md-date>2000</md-date>
+<md-author>Smith, George A</md-author></location>
+<relevance>34031</relevance>
+<recid>content: title computer interfacing author smith george a</recid>
+</hit>
+<hit>
+
+<md-title>Software design and usability</md-title>
+<md-title-remainder>talks with Bonnie Nardi, Jakob Nielsen, David Smith, Austin Henderson &amp; Jed Harris, Terry Winograd, Stephanie Rosenbaum</md-title-remainder>
+<md-date>2000</md-date>
+<md-author>Kaasgaard, Klaus</md-author><location id="Target-2" name="LOC-SOLR">
+<md-title>Software design and usability</md-title>
+<md-title-remainder>talks with Bonnie Nardi, Jakob Nielsen, David Smith, Austin Henderson &amp; Jed Harris, Terry Winograd, Stephanie Rosenbaum</md-title-remainder>
+<md-date>2000</md-date>
+<md-author>Kaasgaard, Klaus</md-author></location>
+<relevance>34031</relevance>
+<recid>content: title software design and usability author kaasgaard klaus</recid>
+</hit>
+<hit>
+
+<md-title>Everything you need to know about the dangers of computer hacking</md-title>
+<md-date>2000</md-date>
+<md-author>Knittel, John</md-author>
+<md-description>Explains what computer hacking is, who does it, and how dangerous it can be</md-description><location id="Target-2" name="LOC-SOLR">
+<md-title>Everything you need to know about the dangers of computer hacking</md-title>
+<md-date>2000</md-date>
+<md-author>Knittel, John</md-author>
+<md-description>Explains what computer hacking is, who does it, and how dangerous it can be</md-description></location>
+<relevance>32544</relevance>
+<recid>content: title everything you need to know about the dangers of computer hacking author knittel john</recid>
+</hit>
+<hit>
+
+<md-title>Computer peripherals</md-title>
+<md-date>1995</md-date>
+<md-author>Cook, Barry M</md-author><location id="Target-2" name="LOC-SOLR">
+<md-title>Computer peripherals</md-title>
+<md-date>1995</md-date>
+<md-author>Cook, Barry M</md-author></location>
+<relevance>32484</relevance>
+<recid>content: title computer peripherals author cook barry m</recid>
+</hit>
+<hit>
+
+<md-title>Kids&apos; computer book</md-title>
+<md-date>1994</md-date>
+<md-description>Discusses a variety of educational and game software for children  with suggestions for setting up a computer system. Includes a 3 1/2 in. disk with 6 shareware programs for children</md-description><location id="Target-2" name="LOC-SOLR">
+<md-title>Kids&apos; computer book</md-title>
+<md-date>1994</md-date>
+<md-description>&quot;For kids and their parents&quot;--Cover</md-description>
+<md-description>Discusses a variety of educational and game software for children  with suggestions for setting up a computer system. Includes a 3 1/2 in. disk with 6 shareware programs for children</md-description></location>
+<relevance>28531</relevance>
+<recid>content: title kids computer book</recid>
+</hit>
+<hit>
+
+<md-title>Computer friendly</md-title>
+<md-date>1999</md-date>
+<md-author>Steinbacher, Raymond</md-author><location id="Target-2" name="LOC-SOLR">
+<md-title>Computer friendly</md-title>
+<md-date>1999</md-date>
+<md-author>Steinbacher, Raymond</md-author></location>
+<relevance>27843</relevance>
+<recid>content: title computer friendly author steinbacher raymond</recid>
+</hit>
+<hit>
+
+<md-title>Computer misuse</md-title>
+<md-date>1999</md-date>
+<md-description>&quot;Also published as Parliamentary Paper E 31AO&quot;--T.p. verso</md-description><location id="Target-2" name="LOC-SOLR">
+<md-title>Computer misuse</md-title>
+<md-date>1999</md-date>
+<md-description>&quot;May 1999.&quot;</md-description>
+<md-description>&quot;NZLC R54&quot;--T.p. verso</md-description>
+<md-description>&quot;Also published as Parliamentary Paper E 31AO&quot;--T.p. verso</md-description></location>
+<relevance>27843</relevance>
+<recid>content: title computer misuse</recid>
+</hit>
+<hit>
+
+<md-title>Computer networking</md-title>
+<md-title-remainder>a top-down approach featuring the Internet</md-title-remainder>
+<md-date>2001</md-date>
+<md-author>Ross, Keith W</md-author><location id="Target-2" name="LOC-SOLR">
+<md-title>Computer networking</md-title>
+<md-title-remainder>a top-down approach featuring the Internet</md-title-remainder>
+<md-date>2001</md-date>
+<md-author>Ross, Keith W</md-author></location>
+<relevance>27843</relevance>
+<recid>content: title computer networking author ross keith w</recid>
+</hit>
+<hit>
+
+<md-title>CorelDRAW 8 for Windows</md-title>
+<md-date>1998</md-date>
+<md-author>Davis, Phyllis</md-author>
+<md-description>Includes index</md-description><location id="Target-2" name="LOC-SOLR">
+<md-title>CorelDRAW 8 for Windows</md-title>
+<md-date>1998</md-date>
+<md-author>Davis, Phyllis</md-author>
+<md-description>Includes index</md-description></location>
+<relevance>27843</relevance>
+<recid>content: title coreldraw for windows author davis phyllis</recid>
+</hit>
+<hit>
+
+<md-title>Quicken 2001 Deluxe for Macintosh</md-title>
+<md-title-remainder>the official guide</md-title-remainder>
+<md-date>2001</md-date>
+<md-author>Langer, Maria</md-author>
+<md-description>Includes index</md-description><location id="Target-2" name="LOC-SOLR">
+<md-title>Quicken 2001 Deluxe for Macintosh</md-title>
+<md-title-remainder>the official guide</md-title-remainder>
+<md-date>2001</md-date>
+<md-author>Langer, Maria</md-author>
+<md-description>Includes index</md-description></location>
+<relevance>27843</relevance>
+<recid>content: title quicken deluxe for macintosh author langer maria</recid>
+</hit>
+<hit>
+
+<md-title>Quicken 2000 for the Mac</md-title>
+<md-title-remainder>the official guide</md-title-remainder>
+<md-date>2000</md-date>
+<md-author>Langer, Maria</md-author>
+<md-description>&quot;Covers Quicken deluxe 2000 for the Mac&quot;--Cover</md-description><location id="Target-2" name="LOC-SOLR">
+<md-title>Quicken 2000 for the Mac</md-title>
+<md-title-remainder>the official guide</md-title-remainder>
+<md-date>2000</md-date>
+<md-author>Langer, Maria</md-author>
+<md-description>Includes index</md-description>
+<md-description>&quot;Covers Quicken deluxe 2000 for the Mac&quot;--Cover</md-description></location>
+<relevance>27843</relevance>
+<recid>content: title quicken for the mac author langer maria</recid>
+</hit>
+<hit>
+
+<md-title>Sicherheit und Schutz im Netz</md-title>
+<md-date>1998</md-date><location id="Target-2" name="LOC-SOLR">
+<md-title>Sicherheit und Schutz im Netz</md-title>
+<md-date>1998</md-date></location>
+<relevance>27843</relevance>
+<recid>content: title sicherheit und schutz im netz</recid>
+</hit>
+<hit>
+
+<md-title>Unix Secure Shell</md-title>
+<md-date>1999</md-date>
+<md-author>Carasik, Anne H</md-author>
+<md-description>Includes index</md-description><location id="Target-2" name="LOC-SOLR">
+<md-title>Unix Secure Shell</md-title>
+<md-date>1999</md-date>
+<md-author>Carasik, Anne H</md-author>
+<md-description>Includes index</md-description></location>
+<relevance>27843</relevance>
+<recid>content: title unix secure shell author carasik anne h</recid>
+</hit>
+<hit>
+
+<md-title>www.StopThief.net</md-title>
+<md-title-remainder>protecting your identity on the Web</md-title-remainder>
+<md-date>1999</md-date>
+<md-author>Marcella, Albert J</md-author><location id="Target-2" name="LOC-SOLR">
+<md-title>www.StopThief.net</md-title>
+<md-title-remainder>protecting your identity on the Web</md-title-remainder>
+<md-date>1999</md-date>
+<md-author>Marcella, Albert J</md-author></location>
+<relevance>27843</relevance>
+<recid>content: title www stopthief net author marcella albert j</recid>
+</hit>
+<hit>
+
+<md-title>Eight International Conference on Computer Communications and Networks</md-title>
+<md-title-remainder>proceedings, 11-13 October 1999, Boston, Massachusetts</md-title-remainder>
+<md-date>1999</md-date>
+<md-description>&quot;IEEE catalog number 99EX370&quot;--T.p. verso</md-description><location id="Target-2" name="LOC-SOLR">
+<md-title>Eight International Conference on Computer Communications and Networks</md-title>
+<md-title-remainder>proceedings, 11-13 October 1999, Boston, Massachusetts</md-title-remainder>
+<md-date>1999</md-date>
+<md-description>&quot;IEEE catalog number 99EX370&quot;--T.p. verso</md-description></location>
+<relevance>26297</relevance>
+<recid>content: title eight international conference on computer communications and networks</recid>
+</hit>
+<hit>
+
+<md-title>Building storage networks</md-title>
+<md-date>2000</md-date>
+<md-author>Farley, Marc</md-author>
+<md-description>Includes index</md-description><location id="Target-2" name="LOC-SOLR">
+<md-title>Building storage networks</md-title>
+<md-date>2000</md-date>
+<md-author>Farley, Marc</md-author>
+<md-description>Includes index</md-description></location>
+<relevance>24750</relevance>
+<recid>content: title building storage networks author farley marc</recid>
+</hit>
+<hit>
+
+<md-title>Complete CL</md-title>
+<md-title-remainder>the definitive control language programming guide</md-title-remainder>
+<md-date>1999</md-date>
+<md-author>Malaga, Ernie</md-author>
+<md-description>Includes index</md-description><location id="Target-2" name="LOC-SOLR">
+<md-title>Complete CL</md-title>
+<md-title-remainder>the definitive control language programming guide</md-title-remainder>
+<md-date>1999</md-date>
+<md-author>Malaga, Ernie</md-author>
+<md-description>Includes index</md-description></location>
+<relevance>24750</relevance>
+<recid>content: title complete cl author malaga ernie</recid>
 </hit>
 </show>
\ No newline at end of file

diff --git a/test/test_limit_limitmap_service.xml b/test/test_limit_limitmap_service.xml
index 1f1ae45..b9b45dd 100644 (file)
--- a/test/test_limit_limitmap_service.xml
+++ b/test/test_limit_limitmap_service.xml
@@ -9,6 +9,7 @@
 
   <set name="service" value="from-service" />
 
+  <metadata name="id"/>
   <metadata name="url" merge="unique"/>
   <metadata name="title" brief="yes" sortkey="skiparticle" merge="longest" rank="6" mergekey="required" />
   <metadata name="title-remainder" brief="yes" merge="longest" rank="5"/>
@@ -19,8 +20,9 @@
   <metadata name="subject" merge="unique" termlist="yes" rank="3" limitmap="rpn: @attr 1=21 @attr 6=3" />
 
   <metadata name="description" brief="yes" merge="longest" rank="3" />
-  <metadata name="id"/>
   <metadata name="lccn" merge="unique"/>
+  <metadata name="title-complete" />
+  <metadata name="publication-place" />
   
   <metadata name="test-usersetting" brief="yes" setting="postproc"/>
   <metadata name="test" setting="parameter"/>

diff --git a/test/test_limit_limitmap_settings_1.xml b/test/test_limit_limitmap_settings_1.xml
index 5dc8874..fe94c47 100644 (file)
--- a/test/test_limit_limitmap_settings_1.xml
+++ b/test/test_limit_limitmap_settings_1.xml
@@ -12,7 +12,7 @@
   <set name="pz:cclmap:isbn" value="u=7"/>
   <set name="pz:cclmap:issn" value="u=8"/>
   <set name="pz:cclmap:date" value="u=30 r=r"/>
-  <set name="pz:cclmap:author_phrase" value="u=1003 6=3"/>
+  <set name="pz:cclmap:au" value="u=1003"/>
 
   <!-- Retrieval settings -->
 

diff --git a/test/test_limit_limitmap_settings_2.xml b/test/test_limit_limitmap_settings_2.xml
index 80f02ec..4fbbdf2 100644 (file)
--- a/test/test_limit_limitmap_settings_2.xml
+++ b/test/test_limit_limitmap_settings_2.xml
@@ -4,8 +4,9 @@
   <set name="pz:url"   value="ocs-test.indexdata.com/solr/select" />
 
   <set name="pz:limitmap:author"  value="ccl:author_phrase" />
-  <set name="pz:limitmap:subject" value="rpn:@attr 1=21" />
-  <set name="pz:limitmap:date"    value="local:" />
+  <set name="pz:limitmap:subject" value="rpn:@attr 1=subject_exact" />
+  <set name="pz:limitmap:date"    value="rpn:@attr 1=date @attr 6=3" />
+  <set name="pz:limitmap:medium"  value="rpn:@attr 1=medium_exact @attr 6=3" />
 
   <set name="full_text_target"  value="=NO" />
   <set name="pz:termlist_term_count" value="10"/>
@@ -20,6 +21,7 @@
   <set name="pz:cclmap:issn"  value="u=8" />
   <set name="pz:cclmap:ti"  value="1=title" />
   <set name="pz:cclmap:au"  value="1=author" />
+  <set name="pz:cclmap:author_phrase" value="1=author_exact 6=3"/>
   <set name="pz:xslt"  value="solr-pz2.xsl" />
   <set name="pz:cclmap:term"  value="1=text s=Dal" />
   <set name="pz:cclmap:isbn"  value="1=isbn" />

diff --git a/test/test_limit_limitmap_settings_4.xml b/test/test_limit_limitmap_settings_4.xml
new file mode 100644 (file)
index 0000000..0d3528f
--- /dev/null
+++ b/test/test_limit_limitmap_settings_4.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings target="Target-1">
+  <set name="pz:limitmap:MySubject" value="local:subject" />
+</settings>
+
+

diff --git a/test/test_limit_limitmap_settings_5.xml b/test/test_limit_limitmap_settings_5.xml
new file mode 100644 (file)
index 0000000..02c965f
--- /dev/null
+++ b/test/test_limit_limitmap_settings_5.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings target="Target-2">
+  <set name="pz:limitmap:MySubject" value="local:subject" />
+</settings>
+