From 8a442adae8eeca9cd02dd397837d7c40b321476a Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Fri, 4 Jul 2014 14:32:43 +0200 Subject: [PATCH] Override setting with same name (do not append) PAZ-945 --- src/session.c | 38 +++++++++-------- src/settings.c | 25 +++++++---- test/test_http_45.res | 11 +---- test/test_http_49.res | 8 +--- test/test_http_50.res | 11 +---- test/test_http_60.res | 8 +--- test/test_http_63.res | 8 +--- test/test_http_65.res | 2 +- test/test_http_66.res | 8 +--- test/test_http_71.res | 2 +- test/test_http_72.res | 8 +--- test/test_http_74.res | 5 +-- test/test_http_76.res | 17 ++------ test/test_http_79.res | 10 +---- test/test_http_81.res | 16 +------- test/test_http_82.res | 2 +- test/test_http_84.res | 8 +--- test/test_http_88.res | 50 +++++----------------- test/test_http_89.res | 50 +++++----------------- test/test_http_90.res | 50 +++++----------------- test/test_sort_6.res | 96 +++++++++++++++++++++---------------------- test/test_sort_settings.xml | 4 -- 22 files changed, 134 insertions(+), 303 deletions(-) diff --git a/src/session.c b/src/session.c index 6d7ab65..eac40a0 100644 --- 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 --- 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 --- a/test/test_http_45.res +++ b/test/test_http_45.res @@ -14,7 +14,7 @@ Imaging systems in medicine Includes bibliographical references and index + name="marc" checksum="2614320583"> Computer processing of dynamic images from an Anger scintillation camera the proceedings of a workshop 1974 @@ -25,15 +25,6 @@ XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Radioisotope scanning - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Scintillation cameras - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Imaging systems in medicine - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 0 diff --git a/test/test_http_49.res b/test/test_http_49.res index 9832043..4c1f533 100644 --- a/test/test_http_49.res +++ b/test/test_http_49.res @@ -14,7 +14,7 @@ Greece Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures + name="marc" checksum="2614320583"> The religious teachers of Greece 1972 Adam, James @@ -26,12 +26,6 @@ XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Greek literature - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Philosophy, Ancient - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 124766 diff --git a/test/test_http_50.res b/test/test_http_50.res index fa73966..2b2fb5b 100644 --- a/test/test_http_50.res +++ b/test/test_http_50.res @@ -14,7 +14,7 @@ Imaging systems in medicine Includes bibliographical references and index + name="marc" checksum="2614320583"> Computer processing of dynamic images from an Anger scintillation camera the proceedings of a workshop 1974 @@ -25,15 +25,6 @@ XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Radioisotope scanning - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Scintillation cameras - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Imaging systems in medicine - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 0 diff --git a/test/test_http_60.res b/test/test_http_60.res index 99b482c..298cdb2 100644 --- a/test/test_http_60.res +++ b/test/test_http_60.res @@ -14,7 +14,7 @@ Greece Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures + name="marc" checksum="2614320583"> The religious teachers of Greece 1972 Adam, James @@ -26,12 +26,6 @@ XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Greek literature - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Philosophy, Ancient - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 291121 diff --git a/test/test_http_63.res b/test/test_http_63.res index 99b482c..298cdb2 100644 --- a/test/test_http_63.res +++ b/test/test_http_63.res @@ -14,7 +14,7 @@ Greece Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures + name="marc" checksum="2614320583"> The religious teachers of Greece 1972 Adam, James @@ -26,12 +26,6 @@ XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Greek literature - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Philosophy, Ancient - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 291121 diff --git a/test/test_http_65.res b/test/test_http_65.res index b24d50f..efe653d 100644 --- a/test/test_http_65.res +++ b/test/test_http_65.res @@ -1,7 +1,7 @@ OK z3950.indexdata.com/marc -Index Data MARC test server +marc 1 0 1 diff --git a/test/test_http_66.res b/test/test_http_66.res index 99b482c..298cdb2 100644 --- a/test/test_http_66.res +++ b/test/test_http_66.res @@ -14,7 +14,7 @@ Greece Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures + name="marc" checksum="2614320583"> The religious teachers of Greece 1972 Adam, James @@ -26,12 +26,6 @@ XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Greek literature - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Philosophy, Ancient - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 291121 diff --git a/test/test_http_71.res b/test/test_http_71.res index b24d50f..efe653d 100644 --- a/test/test_http_71.res +++ b/test/test_http_71.res @@ -1,7 +1,7 @@ OK z3950.indexdata.com/marc -Index Data MARC test server +marc 1 0 1 diff --git a/test/test_http_72.res b/test/test_http_72.res index 99b482c..298cdb2 100644 --- a/test/test_http_72.res +++ b/test/test_http_72.res @@ -14,7 +14,7 @@ Greece Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures + name="marc" checksum="2614320583"> The religious teachers of Greece 1972 Adam, James @@ -26,12 +26,6 @@ XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Greek literature - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Philosophy, Ancient - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 291121 diff --git a/test/test_http_74.res b/test/test_http_74.res index a105782..698a09e 100644 --- a/test/test_http_74.res +++ b/test/test_http_74.res @@ -13,7 +13,7 @@ Railroads "Contract DOT-UT-10003." + name="marc" checksum="4007858895"> Washington metropolitan area rail computer feasibility study; final report 1971 @@ -23,9 +23,6 @@ XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Railroads - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 59412 diff --git a/test/test_http_76.res b/test/test_http_76.res index 4d7509d..ad132e9 100644 --- a/test/test_http_76.res +++ b/test/test_http_76.res @@ -11,7 +11,7 @@ 1977 Optical pattern recognition + name="marc" checksum="3659474317"> Computer science & technology proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976 1977 @@ -19,9 +19,6 @@ XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Optical pattern recognition - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 102165 @@ -43,7 +40,7 @@ score = relevance(102165); Bible Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates + name="marc" checksum="3136897450"> The Computer Bible 1973-1980 Bible. O.T @@ -73,7 +70,7 @@ score = relevance(102165); Wood, Helen M Computers + name="marc" checksum="3833666606"> The use of passwords for controlled access to computer resources 1977 Wood, Helen M @@ -81,9 +78,6 @@ score = relevance(102165); XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Computers - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 30649 @@ -105,7 +99,7 @@ score = relevance(30649); Tomography Includes bibliographical references and index + name="marc" checksum="3485282028"> Reconstruction tomography in diagnostic radiology and nuclear medicine proceedings of the workshop 1977 @@ -114,9 +108,6 @@ score = relevance(30649); XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Tomography - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 0 diff --git a/test/test_http_79.res b/test/test_http_79.res index ced6941..3bbbe07 100644 --- a/test/test_http_79.res +++ b/test/test_http_79.res @@ -14,7 +14,7 @@ Greece Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures + name="marc" checksum="2614320583"> The religious teachers of Greece 1972 Adam, James @@ -26,12 +26,6 @@ XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Greek literature - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Philosophy, Ancient - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 60819 @@ -53,7 +47,7 @@ score = relevance(60819); Smith, George Adam Bible + name="marc" checksum="2788512872"> Four psalms XXIII, XXXVI, LII, CXXI 1980 diff --git a/test/test_http_81.res b/test/test_http_81.res index ace9c5e..4633a6c 100644 --- a/test/test_http_81.res +++ b/test/test_http_81.res @@ -14,7 +14,7 @@ Greece Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures + name="marc" checksum="2614320583"> The religious teachers of Greece 1972 Adam, James @@ -26,12 +26,6 @@ XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Greek literature - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Philosophy, Ancient - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 48655 @@ -56,7 +50,7 @@ score = relevance(48655); Federal aid to education "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"--T.p. verso + name="marc" checksum="2788512872"> Technology programs that work 1984 United States @@ -70,12 +64,6 @@ score = relevance(48655); XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Educational technology - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Federal aid to education - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 4054 diff --git a/test/test_http_82.res b/test/test_http_82.res index fa5a350..d7bc82b 100644 --- a/test/test_http_82.res +++ b/test/test_http_82.res @@ -18,7 +18,7 @@ z3950.indexdata.com/marc -Index Data MARC test server +marc 2 Client_Idle 0 diff --git a/test/test_http_84.res b/test/test_http_84.res index 4f857e5..530d935 100644 --- a/test/test_http_84.res +++ b/test/test_http_84.res @@ -14,7 +14,7 @@ Greece Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures + name="marc" checksum="2614320583"> The religious teachers of Greece 1972 Adam, James @@ -26,12 +26,6 @@ XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Greek literature - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Philosophy, Ancient - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 48655 diff --git a/test/test_http_88.res b/test/test_http_88.res index ced51fb..890a78d 100644 --- a/test/test_http_88.res +++ b/test/test_http_88.res @@ -9,7 +9,7 @@ How to program a computer Jack Collins + name="marc" checksum="2614320583"> How to program a computer Jack Collins XXXXXXXXXX @@ -17,7 +17,7 @@ YYYYYYYYY + name="marc" checksum="2788512872"> How to program a computer Jack Collins XXXXXXXXXX @@ -46,7 +46,7 @@ score = relevance(48160); 1977 Optical pattern recognition + name="marc" checksum="3659474317"> Computer science & technology proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976 1977 @@ -54,9 +54,6 @@ score = relevance(48160); XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Optical pattern recognition - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 40134 @@ -78,7 +75,7 @@ score = relevance(40134); Bible Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates + name="marc" checksum="3136897450"> The Computer Bible 1973-1980 Bible. O.T @@ -109,7 +106,7 @@ score = relevance(40134); Community colleges Cover title + name="marc" checksum="4182051184"> A plan for community college computer development 1971 Universities and colleges @@ -118,12 +115,6 @@ score = relevance(40134); XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Universities and colleges - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Community colleges - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 17200 @@ -146,7 +137,7 @@ score = relevance(17200); Railroads "Contract DOT-UT-10003." + name="marc" checksum="4007858895"> Washington metropolitan area rail computer feasibility study; final report 1971 @@ -156,9 +147,6 @@ score = relevance(17200); XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Railroads - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 17200 @@ -182,7 +170,7 @@ score = relevance(17200); Puget Sound region (Wash.) Scale of maps ca. 1:1,000,000 + name="marc" checksum="3311089739"> The Puget Sound Region a portfolio of thematic computer maps 1974 @@ -194,9 +182,6 @@ score = relevance(17200); XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Cartography - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 16722 @@ -220,7 +205,7 @@ score = relevance(16722); Imaging systems in medicine Includes bibliographical references and index + name="marc" checksum="2962705161"> Computer processing of dynamic images from an Anger scintillation camera the proceedings of a workshop 1974 @@ -231,15 +216,6 @@ score = relevance(16722); XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Radioisotope scanning - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Scintillation cameras - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Imaging systems in medicine - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 12040 @@ -260,7 +236,7 @@ score = relevance(12040); Wood, Helen M Computers + name="marc" checksum="3833666606"> The use of passwords for controlled access to computer resources 1977 Wood, Helen M @@ -268,9 +244,6 @@ score = relevance(12040); XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Computers - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 12040 @@ -292,7 +265,7 @@ score = relevance(12040); Tomography Includes bibliographical references and index + name="marc" checksum="3485282028"> Reconstruction tomography in diagnostic radiology and nuclear medicine proceedings of the workshop 1977 @@ -301,9 +274,6 @@ score = relevance(12040); XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Tomography - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 0 diff --git a/test/test_http_89.res b/test/test_http_89.res index 9bb5d30..b91efcb 100644 --- a/test/test_http_89.res +++ b/test/test_http_89.res @@ -17,7 +17,7 @@ Community colleges "Contract DOT-UT-10003." + name="marc" checksum="3659474317"> Computer science & technology proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976 1977 @@ -25,12 +25,9 @@ XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Optical pattern recognition - PAZPAR2_NULL_b - PAZPAR2_NULL_c + name="marc" checksum="3833666606"> The use of passwords for controlled access to computer resources 1977 Wood, Helen M @@ -38,12 +35,9 @@ XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Computers - PAZPAR2_NULL_b - PAZPAR2_NULL_c + name="marc" checksum="4007858895"> Washington metropolitan area rail computer feasibility study; final report 1971 @@ -53,12 +47,9 @@ XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Railroads - PAZPAR2_NULL_b - PAZPAR2_NULL_c + name="marc" checksum="4182051184"> A plan for community college computer development 1971 Universities and colleges @@ -67,12 +58,6 @@ XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Universities and colleges - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Community colleges - PAZPAR2_NULL_b - PAZPAR2_NULL_c 4 41119 @@ -111,7 +96,7 @@ score = relevance(41119); Tomography Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates + name="marc" checksum="2962705161"> Computer processing of dynamic images from an Anger scintillation camera the proceedings of a workshop 1974 @@ -122,18 +107,9 @@ score = relevance(41119); XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Radioisotope scanning - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Scintillation cameras - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Imaging systems in medicine - PAZPAR2_NULL_b - PAZPAR2_NULL_c + name="marc" checksum="3136897450"> The Computer Bible 1973-1980 Bible. O.T @@ -145,7 +121,7 @@ score = relevance(41119); YYYYYYYYY + name="marc" checksum="3311089739"> The Puget Sound Region a portfolio of thematic computer maps 1974 @@ -157,12 +133,9 @@ score = relevance(41119); XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Cartography - PAZPAR2_NULL_b - PAZPAR2_NULL_c + name="marc" checksum="3485282028"> Reconstruction tomography in diagnostic radiology and nuclear medicine proceedings of the workshop 1977 @@ -171,9 +144,6 @@ score = relevance(41119); XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Tomography - PAZPAR2_NULL_b - PAZPAR2_NULL_c 4 32723 @@ -198,7 +168,7 @@ score = relevance(32723); How to program a computer Jack Collins + name="marc" checksum="2614320583"> How to program a computer Jack Collins XXXXXXXXXX @@ -222,7 +192,7 @@ score = relevance(11437); How to program a computer Jack Collins + name="marc" checksum="2788512872"> How to program a computer Jack Collins XXXXXXXXXX diff --git a/test/test_http_90.res b/test/test_http_90.res index 480b05e..86487ca 100644 --- a/test/test_http_90.res +++ b/test/test_http_90.res @@ -9,7 +9,7 @@ How to program a computer Jack Collins + name="marc" checksum="2614320583"> How to program a computer Jack Collins XXXXXXXXXX @@ -17,7 +17,7 @@ YYYYYYYYY + name="marc" checksum="2788512872"> How to program a computer Jack Collins XXXXXXXXXX @@ -46,7 +46,7 @@ score = relevance(48160); 1977 Optical pattern recognition + name="marc" checksum="3659474317"> Computer science & technology proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976 1977 @@ -54,9 +54,6 @@ score = relevance(48160); XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Optical pattern recognition - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 40134 @@ -78,7 +75,7 @@ score = relevance(40134); Bible Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates + name="marc" checksum="3136897450"> The Computer Bible 1973-1980 Bible. O.T @@ -109,7 +106,7 @@ score = relevance(40134); Community colleges Cover title + name="marc" checksum="4182051184"> A plan for community college computer development 1971 Universities and colleges @@ -118,12 +115,6 @@ score = relevance(40134); XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Universities and colleges - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Community colleges - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 17200 @@ -146,7 +137,7 @@ score = relevance(17200); Railroads "Contract DOT-UT-10003." + name="marc" checksum="4007858895"> Washington metropolitan area rail computer feasibility study; final report 1971 @@ -156,9 +147,6 @@ score = relevance(17200); XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Railroads - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 17200 @@ -182,7 +170,7 @@ score = relevance(17200); Puget Sound region (Wash.) Scale of maps ca. 1:1,000,000 + name="marc" checksum="3311089739"> The Puget Sound Region a portfolio of thematic computer maps 1974 @@ -194,9 +182,6 @@ score = relevance(17200); XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Cartography - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 16722 @@ -220,7 +205,7 @@ score = relevance(16722); Imaging systems in medicine Includes bibliographical references and index + name="marc" checksum="2962705161"> Computer processing of dynamic images from an Anger scintillation camera the proceedings of a workshop 1974 @@ -231,15 +216,6 @@ score = relevance(16722); XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Radioisotope scanning - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Scintillation cameras - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Imaging systems in medicine - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 12040 @@ -260,7 +236,7 @@ score = relevance(12040); Wood, Helen M Computers + name="marc" checksum="3833666606"> The use of passwords for controlled access to computer resources 1977 Wood, Helen M @@ -268,9 +244,6 @@ score = relevance(12040); XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Computers - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 12040 @@ -292,7 +265,7 @@ score = relevance(12040); Tomography Includes bibliographical references and index + name="marc" checksum="3485282028"> Reconstruction tomography in diagnostic radiology and nuclear medicine proceedings of the workshop 1977 @@ -301,9 +274,6 @@ score = relevance(12040); XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Tomography - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 0 diff --git a/test/test_sort_6.res b/test/test_sort_6.res index 7148540..294fe36 100644 --- a/test/test_sort_6.res +++ b/test/test_sort_6.res @@ -10,59 +10,59 @@ -Water-supply370 -Water338 -Groundwater188 -Water resources development186 -Water quality174 -Mineral waters104 -Water quality management100 -United States86 -Irrigation66 -N.Y56 -Hydraulic engineering48 -Geology46 -U.S46 -Groundwater flow44 -Birds42 +Water-supply185 +Water169 +Groundwater94 +Water resources development93 +Water quality87 +Mineral waters52 +Water quality management50 +United States43 +Irrigation33 +N.Y28 +Hydraulic engineering24 +Geology23 +U.S23 +Groundwater flow22 +Birds21 -Waters, Clara Erskine Clement18 -Waters, Henry F16 -Moorman, J. J14 -Waters, Thomas Franklin12 -Basak, P10 -Bergren, Lisa Tawn10 -Kingsley, Charles10 -Tyndall, John10 -Baldwin, William J8 -Holme, Charles8 -James, E. J8 -Nuttall, Thomas8 -Walton, George Edward8 -Wilkins, John H8 -Arthur, Kay6 +Waters, Clara Erskine Clement9 +Waters, Henry F8 +Moorman, J. J7 +Waters, Thomas Franklin6 +Basak, P5 +Bergren, Lisa Tawn5 +Kingsley, Charles5 +Tyndall, John5 +Baldwin, William J4 +Holme, Charles4 +James, E. J4 +Nuttall, Thomas4 +Walton, George Edward4 +Wilkins, John H4 +Arthur, Kay3 -2000822 -1999636 -1998180 -2001174 -1907100 -190292 -190686 -190578 -190978 -190472 -199770 -190866 -199664 -190360 -190158 +2000411 +1999318 +199890 +200187 +190750 +190246 +190643 +190539 +190939 +190436 +199735 +190833 +199632 +190330 +190129 -book3968 -web16 -book (electronic)6 +book1984 +web8 +book (electronic)3 \ No newline at end of file diff --git a/test/test_sort_settings.xml b/test/test_sort_settings.xml index f22d1dd..a970cff 100644 --- a/test/test_sort_settings.xml +++ b/test/test_sort_settings.xml @@ -35,10 +35,6 @@ - - - - -- 1.7.10.4