From: Dennis Schafroth Date: Mon, 23 Apr 2012 06:22:02 +0000 (+0000) Subject: Merge branch 'protocol-version2' of ssh://git.indexdata.com/home/git/pub/pazpar2... X-Git-Tag: v1.6.13~23 X-Git-Url: http://lists.indexdata.com/cgi-bin?a=commitdiff_plain;h=d1ca7704bc7178385b725e74cb82da1b9f1b2abe;hp=6d326e724e81785a660c0bc2e54f28faffd2e36d;p=pazpar2-moved-to-github.git Merge branch 'protocol-version2' of ssh://git.indexdata.com/home/git/pub/pazpar2 into protocol-version2 --- diff --git a/src/client.c b/src/client.c index eee0396..dcbfd6c 100644 --- 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 --- 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 --- 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 --- 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 --- a/test/test_limit_limitmap_11.res +++ b/test/test_limit_limitmap_11.res @@ -22,16 +22,16 @@ Langer, Maria2 Norton, Peter2 Watt, Alan H2 -Abass, Olayide1 Aldrich, Richard W1 Appleman, Daniel1 Bainbridge, David I1 Caplin, Steve1 Cole, Eric1 -Cooley, Peter1 +De Jong, Kenneth A1 Dowd, Kevin1 Hodges, M. Susan1 Kaasgaard, Klaus1 +Lasser, Jon1 Computers22 diff --git a/test/test_limit_limitmap_12.res b/test/test_limit_limitmap_12.res index b841038..4bbf745 100644 --- a/test/test_limit_limitmap_12.res +++ b/test/test_limit_limitmap_12.res @@ -23,16 +23,16 @@ Langer, Maria2 Norton, Peter2 Watt, Alan H2 -Abass, Olayide1 Aldrich, Richard W1 Appleman, Daniel1 Bainbridge, David I1 Caplin, Steve1 Cole, Eric1 -Cooley, Peter1 +De Jong, Kenneth A1 Dowd, Kevin1 Hodges, M. Susan1 Kaasgaard, Klaus1 +Lasser, Jon1 Computers22 diff --git a/test/test_limit_limitmap_14.res b/test/test_limit_limitmap_14.res index e2db1ca..ab63fe6 100644 --- a/test/test_limit_limitmap_14.res +++ b/test/test_limit_limitmap_14.res @@ -1,2 +1,2 @@ -query \ No newline at end of file +OK \ 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 --- a/test/test_limit_limitmap_15.res +++ b/test/test_limit_limitmap_15.res @@ -1,8 +1,22 @@ OK 0 -0 -0 +1 +2016 0 -0 +1 + + +The religious teachers of Greece +1972 +Adam, James +Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures +The religious teachers of Greece +1972 +Adam, James +Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures +XXXXXXXXXX +620000 +content: title the religious teachers of greece author adam james + \ 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 --- a/test/test_limit_limitmap_22.res +++ b/test/test_limit_limitmap_22.res @@ -1,2 +1,2 @@ - \ No newline at end of file +OK \ 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 --- a/test/test_limit_limitmap_23.res +++ b/test/test_limit_limitmap_23.res @@ -1,2 +1,2 @@ -OK \ No newline at end of file +OK \ 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 --- a/test/test_limit_limitmap_24.res +++ b/test/test_limit_limitmap_24.res @@ -1,8 +1,262 @@ OK -0 -0 -0 +1 +100 +2015 0 -0 +20 + + +Adobe Illustrator for the Mac +fast & easy +2001 +Woodward, C. Michael +Adobe Illustrator for the Mac +fast & easy +2001 +Woodward, C. Michael +37125 +content: title adobe illustrator for the mac author woodward c michael + + + +Advanced computer performance modeling and simulation +1998 +Advanced computer performance modeling and simulation +1998 +37125 +content: title advanced computer performance modeling and simulation + + + +Cyberterrorism and computer crimes +issues surrounding the establishment of an international regime +2000 +Aldrich, Richard W +"April 2000." +Cyberterrorism and computer crimes +issues surrounding the establishment of an international regime +2000 +Aldrich, Richard W +"April 2000." +37125 +content: title cyberterrorism and computer crimes author aldrich richard w + + + +Computer interfacing +2000 +Smith, George A +Computer interfacing +2000 +Smith, George A +34031 +content: title computer interfacing author smith george a + + + +Software design and usability +talks with Bonnie Nardi, Jakob Nielsen, David Smith, Austin Henderson & Jed Harris, Terry Winograd, Stephanie Rosenbaum +2000 +Kaasgaard, Klaus +Software design and usability +talks with Bonnie Nardi, Jakob Nielsen, David Smith, Austin Henderson & Jed Harris, Terry Winograd, Stephanie Rosenbaum +2000 +Kaasgaard, Klaus +34031 +content: title software design and usability author kaasgaard klaus + + + +Everything you need to know about the dangers of computer hacking +2000 +Knittel, John +Explains what computer hacking is, who does it, and how dangerous it can be +Everything you need to know about the dangers of computer hacking +2000 +Knittel, John +Explains what computer hacking is, who does it, and how dangerous it can be +32544 +content: title everything you need to know about the dangers of computer hacking author knittel john + + + +Computer peripherals +1995 +Cook, Barry M +Computer peripherals +1995 +Cook, Barry M +32484 +content: title computer peripherals author cook barry m + + + +Kids' computer book +1994 +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 +Kids' computer book +1994 +"For kids and their parents"--Cover +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 +28531 +content: title kids computer book + + + +Computer friendly +1999 +Steinbacher, Raymond +Computer friendly +1999 +Steinbacher, Raymond +27843 +content: title computer friendly author steinbacher raymond + + + +Computer misuse +1999 +"Also published as Parliamentary Paper E 31AO"--T.p. verso +Computer misuse +1999 +"May 1999." +"NZLC R54"--T.p. verso +"Also published as Parliamentary Paper E 31AO"--T.p. verso +27843 +content: title computer misuse + + + +Computer networking +a top-down approach featuring the Internet +2001 +Ross, Keith W +Computer networking +a top-down approach featuring the Internet +2001 +Ross, Keith W +27843 +content: title computer networking author ross keith w + + + +CorelDRAW 8 for Windows +1998 +Davis, Phyllis +Includes index +CorelDRAW 8 for Windows +1998 +Davis, Phyllis +Includes index +27843 +content: title coreldraw for windows author davis phyllis + + + +Quicken 2001 Deluxe for Macintosh +the official guide +2001 +Langer, Maria +Includes index +Quicken 2001 Deluxe for Macintosh +the official guide +2001 +Langer, Maria +Includes index +27843 +content: title quicken deluxe for macintosh author langer maria + + + +Quicken 2000 for the Mac +the official guide +2000 +Langer, Maria +"Covers Quicken deluxe 2000 for the Mac"--Cover +Quicken 2000 for the Mac +the official guide +2000 +Langer, Maria +Includes index +"Covers Quicken deluxe 2000 for the Mac"--Cover +27843 +content: title quicken for the mac author langer maria + + + +Sicherheit und Schutz im Netz +1998 +Sicherheit und Schutz im Netz +1998 +27843 +content: title sicherheit und schutz im netz + + + +Unix Secure Shell +1999 +Carasik, Anne H +Includes index +Unix Secure Shell +1999 +Carasik, Anne H +Includes index +27843 +content: title unix secure shell author carasik anne h + + + +www.StopThief.net +protecting your identity on the Web +1999 +Marcella, Albert J +www.StopThief.net +protecting your identity on the Web +1999 +Marcella, Albert J +27843 +content: title www stopthief net author marcella albert j + + + +Eight International Conference on Computer Communications and Networks +proceedings, 11-13 October 1999, Boston, Massachusetts +1999 +"IEEE catalog number 99EX370"--T.p. verso +Eight International Conference on Computer Communications and Networks +proceedings, 11-13 October 1999, Boston, Massachusetts +1999 +"IEEE catalog number 99EX370"--T.p. verso +26297 +content: title eight international conference on computer communications and networks + + + +Building storage networks +2000 +Farley, Marc +Includes index +Building storage networks +2000 +Farley, Marc +Includes index +24750 +content: title building storage networks author farley marc + + + +Complete CL +the definitive control language programming guide +1999 +Malaga, Ernie +Includes index +Complete CL +the definitive control language programming guide +1999 +Malaga, Ernie +Includes index +24750 +content: title complete cl author malaga ernie + \ 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 --- a/test/test_limit_limitmap_26.res +++ b/test/test_limit_limitmap_26.res @@ -1,16 +1,57 @@ -OK -Target-1 -ztest-db1 -1 -0 -1 -Client_Idle - -Target-2 -LOC-SOLR -0 -0 -0 -Client_Error - \ No newline at end of file +OK +0 +4 +10 +0 +4 + + +Computer science & technology +proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976 +1977 +Computer science & technology +proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976 +1977 +XXXXXXXXXX +57536 +content: title computer science technology + + + +The Computer Bible +1973-1980 +Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates +The Computer Bible +1973-1980 +Hebrew and Greek; introductions in English +Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates +XXXXXXXXXX +57536 +content: title the computer bible + + + +The use of passwords for controlled access to computer resources +1977 +Wood, Helen M +The use of passwords for controlled access to computer resources +1977 +Wood, Helen M +XXXXXXXXXX +17260 +content: title the use of passwords for controlled access to computer resources author wood helen m + + + +Reconstruction tomography in diagnostic radiology and nuclear medicine +proceedings of the workshop +1977 +Reconstruction tomography in diagnostic radiology and nuclear medicine +proceedings of the workshop +1977 +XXXXXXXXXX +0 +content: title reconstruction tomography in diagnostic radiology and nuclear medicine + + \ 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 --- a/test/test_limit_limitmap_29.res +++ b/test/test_limit_limitmap_29.res @@ -1,128 +1,262 @@ OK 1 -9 -10 +100 +2015 0 -9 - - -How to program a computer -Jack Collins -How to program a computer -Jack Collins -XXXXXXXXXX - -How to program a computer -Jack Collins -XXXXXXXXXX -2 -25286 -content: title how to program a computer author jack collins - - - -Computer science & technology -proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976 -1977 -Computer science & technology -proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976 -1977 -XXXXXXXXXX -21072 -content: title computer science technology - - - -The Computer Bible -1973-1980 -Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates -The Computer Bible -1973-1980 -Hebrew and Greek; introductions in English -Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates -XXXXXXXXXX -21072 -content: title the computer bible - - - -A plan for community college computer development -1971 -Cover title -A plan for community college computer development -1971 -Cover title -XXXXXXXXXX -9030 -content: title a plan for community college computer development - - - -Washington metropolitan area rail computer feasibility study; -final report -1971 -Englund, Carl R -"Contract DOT-UT-10003." -Washington metropolitan area rail computer feasibility study; -final report -1971 -Englund, Carl R -"Contract DOT-UT-10003." -XXXXXXXXXX -9030 -content: title washington metropolitan area rail computer feasibility study author englund carl r - - - -The Puget Sound Region -a portfolio of thematic computer maps -1974 -Mairs, John W -Scale of maps ca. 1:1,000,000 -The Puget Sound Region -a portfolio of thematic computer maps -1974 -Mairs, John W -Scale of maps ca. 1:1,000,000 -XXXXXXXXXX -8780 -content: title the puget sound region author mairs john w - - - -Computer processing of dynamic images from an Anger scintillation camera -the proceedings of a workshop -1974 -Computer processing of dynamic images from an Anger scintillation camera -the proceedings of a workshop -1974 -XXXXXXXXXX -6321 -content: title computer processing of dynamic images from an anger scintillation camera - - - -The use of passwords for controlled access to computer resources -1977 -Wood, Helen M -The use of passwords for controlled access to computer resources -1977 -Wood, Helen M -XXXXXXXXXX -6321 -content: title the use of passwords for controlled access to computer resources author wood helen m - - - -Reconstruction tomography in diagnostic radiology and nuclear medicine -proceedings of the workshop -1977 -Reconstruction tomography in diagnostic radiology and nuclear medicine -proceedings of the workshop -1977 -XXXXXXXXXX -0 -content: title reconstruction tomography in diagnostic radiology and nuclear medicine +20 + + +Adobe Illustrator for the Mac +fast & easy +2001 +Woodward, C. Michael +Adobe Illustrator for the Mac +fast & easy +2001 +Woodward, C. Michael +37125 +content: title adobe illustrator for the mac author woodward c michael + + + +Advanced computer performance modeling and simulation +1998 +Advanced computer performance modeling and simulation +1998 +37125 +content: title advanced computer performance modeling and simulation + + + +Cyberterrorism and computer crimes +issues surrounding the establishment of an international regime +2000 +Aldrich, Richard W +"April 2000." +Cyberterrorism and computer crimes +issues surrounding the establishment of an international regime +2000 +Aldrich, Richard W +"April 2000." +37125 +content: title cyberterrorism and computer crimes author aldrich richard w + + + +Computer interfacing +2000 +Smith, George A +Computer interfacing +2000 +Smith, George A +34031 +content: title computer interfacing author smith george a + + + +Software design and usability +talks with Bonnie Nardi, Jakob Nielsen, David Smith, Austin Henderson & Jed Harris, Terry Winograd, Stephanie Rosenbaum +2000 +Kaasgaard, Klaus +Software design and usability +talks with Bonnie Nardi, Jakob Nielsen, David Smith, Austin Henderson & Jed Harris, Terry Winograd, Stephanie Rosenbaum +2000 +Kaasgaard, Klaus +34031 +content: title software design and usability author kaasgaard klaus + + + +Everything you need to know about the dangers of computer hacking +2000 +Knittel, John +Explains what computer hacking is, who does it, and how dangerous it can be +Everything you need to know about the dangers of computer hacking +2000 +Knittel, John +Explains what computer hacking is, who does it, and how dangerous it can be +32544 +content: title everything you need to know about the dangers of computer hacking author knittel john + + + +Computer peripherals +1995 +Cook, Barry M +Computer peripherals +1995 +Cook, Barry M +32484 +content: title computer peripherals author cook barry m + + + +Kids' computer book +1994 +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 +Kids' computer book +1994 +"For kids and their parents"--Cover +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 +28531 +content: title kids computer book + + + +Computer friendly +1999 +Steinbacher, Raymond +Computer friendly +1999 +Steinbacher, Raymond +27843 +content: title computer friendly author steinbacher raymond + + + +Computer misuse +1999 +"Also published as Parliamentary Paper E 31AO"--T.p. verso +Computer misuse +1999 +"May 1999." +"NZLC R54"--T.p. verso +"Also published as Parliamentary Paper E 31AO"--T.p. verso +27843 +content: title computer misuse + + + +Computer networking +a top-down approach featuring the Internet +2001 +Ross, Keith W +Computer networking +a top-down approach featuring the Internet +2001 +Ross, Keith W +27843 +content: title computer networking author ross keith w + + + +CorelDRAW 8 for Windows +1998 +Davis, Phyllis +Includes index +CorelDRAW 8 for Windows +1998 +Davis, Phyllis +Includes index +27843 +content: title coreldraw for windows author davis phyllis + + + +Quicken 2001 Deluxe for Macintosh +the official guide +2001 +Langer, Maria +Includes index +Quicken 2001 Deluxe for Macintosh +the official guide +2001 +Langer, Maria +Includes index +27843 +content: title quicken deluxe for macintosh author langer maria + + + +Quicken 2000 for the Mac +the official guide +2000 +Langer, Maria +"Covers Quicken deluxe 2000 for the Mac"--Cover +Quicken 2000 for the Mac +the official guide +2000 +Langer, Maria +Includes index +"Covers Quicken deluxe 2000 for the Mac"--Cover +27843 +content: title quicken for the mac author langer maria + + + +Sicherheit und Schutz im Netz +1998 +Sicherheit und Schutz im Netz +1998 +27843 +content: title sicherheit und schutz im netz + + + +Unix Secure Shell +1999 +Carasik, Anne H +Includes index +Unix Secure Shell +1999 +Carasik, Anne H +Includes index +27843 +content: title unix secure shell author carasik anne h + + + +www.StopThief.net +protecting your identity on the Web +1999 +Marcella, Albert J +www.StopThief.net +protecting your identity on the Web +1999 +Marcella, Albert J +27843 +content: title www stopthief net author marcella albert j + + + +Eight International Conference on Computer Communications and Networks +proceedings, 11-13 October 1999, Boston, Massachusetts +1999 +"IEEE catalog number 99EX370"--T.p. verso +Eight International Conference on Computer Communications and Networks +proceedings, 11-13 October 1999, Boston, Massachusetts +1999 +"IEEE catalog number 99EX370"--T.p. verso +26297 +content: title eight international conference on computer communications and networks + + + +Building storage networks +2000 +Farley, Marc +Includes index +Building storage networks +2000 +Farley, Marc +Includes index +24750 +content: title building storage networks author farley marc + + + +Complete CL +the definitive control language programming guide +1999 +Malaga, Ernie +Includes index +Complete CL +the definitive control language programming guide +1999 +Malaga, Ernie +Includes index +24750 +content: title complete cl author malaga ernie \ 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 --- a/test/test_limit_limitmap_service.xml +++ b/test/test_limit_limitmap_service.xml @@ -9,6 +9,7 @@ + @@ -19,8 +20,9 @@ - + + diff --git a/test/test_limit_limitmap_settings_1.xml b/test/test_limit_limitmap_settings_1.xml index 5dc8874..fe94c47 100644 --- a/test/test_limit_limitmap_settings_1.xml +++ b/test/test_limit_limitmap_settings_1.xml @@ -12,7 +12,7 @@ - + diff --git a/test/test_limit_limitmap_settings_2.xml b/test/test_limit_limitmap_settings_2.xml index 80f02ec..4fbbdf2 100644 --- a/test/test_limit_limitmap_settings_2.xml +++ b/test/test_limit_limitmap_settings_2.xml @@ -4,8 +4,9 @@ - - + + + @@ -20,6 +21,7 @@ + diff --git a/test/test_limit_limitmap_settings_4.xml b/test/test_limit_limitmap_settings_4.xml new file mode 100644 index 0000000..0d3528f --- /dev/null +++ b/test/test_limit_limitmap_settings_4.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/test/test_limit_limitmap_settings_5.xml b/test/test_limit_limitmap_settings_5.xml new file mode 100644 index 0000000..02c965f --- /dev/null +++ b/test/test_limit_limitmap_settings_5.xml @@ -0,0 +1,5 @@ + + + + +