From: Adam Dickmeiss Date: Thu, 15 Nov 2012 12:50:14 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2 X-Git-Tag: v1.6.24~23 X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=79e39b03629642d9496a381a07b0aed79096c7ad;hp=7118da8de283be0e294bbaf4501ba002cca22d89;p=pazpar2-moved-to-github.git Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2 --- diff --git a/src/client.c b/src/client.c index 44ee5d5..54d5f51 100644 --- a/src/client.c +++ b/src/client.c @@ -1414,7 +1414,7 @@ int client_parse_sort(struct client *cl, struct reclist_sortparms *sp) cl->sort_criteria = 0; } } else { - yaz_log(YLOG_LOG, "Client %s: No sort strategy and spec found.", client_get_id(cl)); + yaz_log(YLOG_DEBUG, "Client %s: No sort strategy and spec found.", client_get_id(cl)); xfree(cl->sort_strategy); cl->sort_strategy = 0; xfree(cl->sort_criteria); diff --git a/test/test_filter.cfg b/test/test_filter.cfg index afa0e19..27c8c2c 100644 --- a/test/test_filter.cfg +++ b/test/test_filter.cfg @@ -11,7 +11,7 @@ - + diff --git a/test/test_filter.urls b/test/test_filter.urls index 057edb9..2924132 100644 --- a/test/test_filter.urls +++ b/test/test_filter.urls @@ -1,17 +1,17 @@ http://localhost:9763/search.pz2?command=init -http://localhost:9763/search.pz2?session=1&command=search&query=the +http://localhost:9763/search.pz2?session=1&command=search&query=0+or+the http://localhost:9763/search.pz2?session=1&command=show&block=1 http://localhost:9763/search.pz2?session=1&command=termlist&name=author,date,subject,xtargets -http://localhost:9763/search.pz2?session=1&command=search&query=the%207&filter=pz%3Aid%3Dlocalhost%3A9999%2FSlow +http://localhost:9763/search.pz2?session=1&command=search&query=the%207&filter=pz%3Aid%3Dlocalhost%3A9999 http://localhost:9763/search.pz2?session=1&command=show&block=1 http://localhost:9763/search.pz2?session=1&command=termlist&name=author,date,subject,xtargets -http://localhost:9763/search.pz2?session=1&command=search&query=the%207&filter=pz%3Aid%3Dlocalhost%3A9999%2FSlow +http://localhost:9763/search.pz2?session=1&command=search&query=the%207&filter=pz%3Aid%3Dlocalhost%3A9999 http://localhost:9763/search.pz2?session=1&command=show http://localhost:9763/search.pz2?session=1&command=termlist&name=author,date,subject,xtargets http://localhost:9763/search.pz2?session=1&command=search&query=the&filter=pz%3Aid%3Dz3950.indexdata.com%2Fmarc http://localhost:9763/search.pz2?session=1&command=show&block=1 http://localhost:9763/search.pz2?session=1&command=termlist&name=author,date,subject,xtargets http://localhost:9763/search.pz2?command=init -http://localhost:9763/search.pz2?session=2&command=search&query=the%2022&filter=pz%3Aid%3Dlocalhost%3A9999%2FSlow +http://localhost:9763/search.pz2?session=2&command=search&query=the%2022&filter=pz%3Aid%3Dlocalhost%3A9999 http://localhost:9763/search.pz2?session=2&command=show&sort=title:0&block=1 http://localhost:9763/search.pz2?session=2&command=show&sort=title:0&block=1 diff --git a/test/test_filter_10.res b/test/test_filter_10.res index ae1d3a0..59210ec 100644 --- a/test/test_filter_10.res +++ b/test/test_filter_10.res @@ -23,7 +23,7 @@ -localhost:9999/Slow +localhost:9999 ztest slow 7 Client_Idle diff --git a/test/test_filter_16.res b/test/test_filter_16.res index e290d20..20cc9d5 100644 --- a/test/test_filter_16.res +++ b/test/test_filter_16.res @@ -1,10 +1,10 @@ OK -1 -19 +0 +21 22 0 -19 +20 Washington metropolitan area rail computer feasibility study; final report @@ -12,8 +12,8 @@ Englund, Carl R Railroads "Contract DOT-UT-10003." - + Washington metropolitan area rail computer feasibility study; final report 1971 @@ -29,8 +29,8 @@ 1977 Wood, Helen M Computers - + The use of passwords for controlled access to computer resources 1977 Wood, Helen M @@ -46,8 +46,8 @@ Educational technology 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 - + Technology programs that work 1984 United States @@ -70,8 +70,8 @@ Philosophy, Ancient Greece Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures - + The religious teachers of Greece 1972 Adam, James @@ -90,8 +90,8 @@ 1977 Tomography Includes bibliographical references and index - + Reconstruction tomography in diagnostic radiology and nuclear medicine proceedings of the workshop 1977 @@ -109,8 +109,8 @@ Cartography Puget Sound region (Wash.) Scale of maps ca. 1:1,000,000 - + The Puget Sound Region a portfolio of thematic computer maps 1974 @@ -129,8 +129,8 @@ Universities and colleges Community colleges Cover title - + A plan for community college computer development 1971 Universities and colleges @@ -141,6 +141,26 @@ content: title a plan for community college computer development author medium book + National dissemination model for the I'M SPECIAL Program of Physical Education for the Handicapped, 1983-1986 + final report, I'M SPECIAL network + 1986 + Physical education + Handicapped children + Distributed to depository libraries in microfiche + + National dissemination model for the I'M SPECIAL Program of Physical Education for the Handicapped, 1983-1986 + final report, I'M SPECIAL network + 1986 + Physical education + Handicapped children + Microfiche + Distributed to depository libraries in microfiche + + 1 + content: title national dissemination model for the i m special program of physical education for the handicapped author medium + + The late shift Letterman, Leno, and the network battle for the night 1993 @@ -150,8 +170,8 @@ Leno, Jay Talk shows Includes index - + The late shift Letterman, Leno, and the network battle for the night 1993 @@ -174,8 +194,8 @@ Computer Systems Online Systems Title from caption - + Internet world 1992 Internet (Computer network) @@ -195,8 +215,8 @@ Internet (Computer network) Mailing lists Includes index - + Internet mailing lists 1993 @@ -211,8 +231,8 @@ Info Canada 1991 Includes: Network world Canada, Sept. 1991-Jan. 1992 - + Info Canada 1991 Title from caption @@ -224,13 +244,13 @@ How to program a computer Jack Collins - + How to program a computer Jack Collins - + How to program a computer Jack Collins @@ -243,8 +263,8 @@ 1980 Smith, George Adam Bible - + Four psalms XXIII, XXXVI, LII, CXXI 1980 @@ -263,8 +283,8 @@ Library information networks Libraries, Governmental, administrative, etc Description based on: 1990 - + FEDLINK services directory for fiscal year FEDLINK (Network) Library information networks @@ -280,8 +300,8 @@ Oberst, Bruce Bible. O.T. Deuteronomy Bibliography: p. 449-452 - + Deuteronomy 1968 Oberst, Bruce @@ -292,12 +312,32 @@ content: title deuteronomy author oberst bruce medium book + Dealing with dropouts + the urban superintendents' call to action + 1987 + Paulu, Nancy + Dropouts + Distributed to depository libraries in microfiche + + Dealing with dropouts + the urban superintendents' call to action + 1987 + Paulu, Nancy + Dropouts + Microfiche + Distributed to depository libraries in microfiche + + 1 + content: title dealing with dropouts author paulu nancy medium + + Computer science & technology proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976 1977 Optical pattern recognition - + Computer science & technology proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976 1977 @@ -314,8 +354,8 @@ Scintillation cameras Imaging systems in medicine Includes bibliographical references and index - + Computer processing of dynamic images from an Anger scintillation camera the proceedings of a workshop 1974 @@ -333,8 +373,8 @@ Bible. O.T Bible Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates - + The Computer Bible 1973-1980 Bible. O.T @@ -345,34 +385,4 @@ 1 content: title the computer bible author medium book - - Check this out - library program models - 1987 - Seager, Andrew J - Libraries and community - Libraries and education - School libraries - Instructional materials centers - Public libraries - Distributed to depository libraries in microfiche - - Check this out - library program models - 1987 - Seager, Andrew J - Libraries and community - Libraries and education - School libraries - Instructional materials centers - Public libraries - Distributed to depository libraries in microfiche - "July 1987." - Includes bibliographical references - "LP 87-403c." - - 1 - content: title check this out author seager andrew j medium book - \ No newline at end of file diff --git a/test/test_filter_17.res b/test/test_filter_17.res index c216196..20cc9d5 100644 --- a/test/test_filter_17.res +++ b/test/test_filter_17.res @@ -12,8 +12,8 @@ Englund, Carl R Railroads "Contract DOT-UT-10003." - + Washington metropolitan area rail computer feasibility study; final report 1971 @@ -29,8 +29,8 @@ 1977 Wood, Helen M Computers - + The use of passwords for controlled access to computer resources 1977 Wood, Helen M @@ -46,8 +46,8 @@ Educational technology 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 - + Technology programs that work 1984 United States @@ -70,8 +70,8 @@ Philosophy, Ancient Greece Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures - + The religious teachers of Greece 1972 Adam, James @@ -90,8 +90,8 @@ 1977 Tomography Includes bibliographical references and index - + Reconstruction tomography in diagnostic radiology and nuclear medicine proceedings of the workshop 1977 @@ -109,8 +109,8 @@ Cartography Puget Sound region (Wash.) Scale of maps ca. 1:1,000,000 - + The Puget Sound Region a portfolio of thematic computer maps 1974 @@ -129,8 +129,8 @@ Universities and colleges Community colleges Cover title - + A plan for community college computer development 1971 Universities and colleges @@ -147,8 +147,8 @@ Physical education Handicapped children Distributed to depository libraries in microfiche - + National dissemination model for the I'M SPECIAL Program of Physical Education for the Handicapped, 1983-1986 final report, I'M SPECIAL network 1986 @@ -170,8 +170,8 @@ Leno, Jay Talk shows Includes index - + The late shift Letterman, Leno, and the network battle for the night 1993 @@ -194,8 +194,8 @@ Computer Systems Online Systems Title from caption - + Internet world 1992 Internet (Computer network) @@ -215,8 +215,8 @@ Internet (Computer network) Mailing lists Includes index - + Internet mailing lists 1993 @@ -231,8 +231,8 @@ Info Canada 1991 Includes: Network world Canada, Sept. 1991-Jan. 1992 - + Info Canada 1991 Title from caption @@ -244,13 +244,13 @@ How to program a computer Jack Collins - + How to program a computer Jack Collins - + How to program a computer Jack Collins @@ -263,8 +263,8 @@ 1980 Smith, George Adam Bible - + Four psalms XXIII, XXXVI, LII, CXXI 1980 @@ -283,8 +283,8 @@ Library information networks Libraries, Governmental, administrative, etc Description based on: 1990 - + FEDLINK services directory for fiscal year FEDLINK (Network) Library information networks @@ -300,8 +300,8 @@ Oberst, Bruce Bible. O.T. Deuteronomy Bibliography: p. 449-452 - + Deuteronomy 1968 Oberst, Bruce @@ -318,8 +318,8 @@ Paulu, Nancy Dropouts Distributed to depository libraries in microfiche - + Dealing with dropouts the urban superintendents' call to action 1987 @@ -336,8 +336,8 @@ proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976 1977 Optical pattern recognition - + Computer science & technology proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976 1977 @@ -354,8 +354,8 @@ Scintillation cameras Imaging systems in medicine Includes bibliographical references and index - + Computer processing of dynamic images from an Anger scintillation camera the proceedings of a workshop 1974 @@ -373,8 +373,8 @@ Bible. O.T Bible Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates - + The Computer Bible 1973-1980 Bible. O.T diff --git a/test/test_filter_3.res b/test/test_filter_3.res index e693c44..c24b060 100644 --- a/test/test_filter_3.res +++ b/test/test_filter_3.res @@ -1,6 +1,6 @@ OK -1 +0 12 12 0 diff --git a/test/test_filter_4.res b/test/test_filter_4.res index fdb19a1..bdacc97 100644 --- a/test/test_filter_4.res +++ b/test/test_filter_4.res @@ -1,5 +1,5 @@ -1 +0 Adam, James1 Carter, Bill1 diff --git a/test/test_filter_6.res b/test/test_filter_6.res index e63ac01..b274741 100644 --- a/test/test_filter_6.res +++ b/test/test_filter_6.res @@ -11,8 +11,8 @@ Bible. O.T Bible Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates - + The Computer Bible 1973-1980 Bible. O.T @@ -32,8 +32,8 @@ Cartography Puget Sound region (Wash.) Scale of maps ca. 1:1,000,000 - + The Puget Sound Region a portfolio of thematic computer maps 1974 @@ -53,8 +53,8 @@ 1977 Tomography Includes bibliographical references and index - + Reconstruction tomography in diagnostic radiology and nuclear medicine proceedings of the workshop 1977 @@ -73,8 +73,8 @@ Scintillation cameras Imaging systems in medicine Includes bibliographical references and index - + Computer processing of dynamic images from an Anger scintillation camera the proceedings of a workshop 1974 @@ -92,8 +92,8 @@ proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976 1977 Optical pattern recognition - + Computer science & technology proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976 1977 @@ -106,13 +106,13 @@ How to program a computer Jack Collins - + How to program a computer Jack Collins - + How to program a computer Jack Collins diff --git a/test/test_filter_7.res b/test/test_filter_7.res index ae1d3a0..59210ec 100644 --- a/test/test_filter_7.res +++ b/test/test_filter_7.res @@ -23,7 +23,7 @@ -localhost:9999/Slow +localhost:9999 ztest slow 7 Client_Idle diff --git a/test/test_filter_9.res b/test/test_filter_9.res index e63ac01..b274741 100644 --- a/test/test_filter_9.res +++ b/test/test_filter_9.res @@ -11,8 +11,8 @@ Bible. O.T Bible Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates - + The Computer Bible 1973-1980 Bible. O.T @@ -32,8 +32,8 @@ Cartography Puget Sound region (Wash.) Scale of maps ca. 1:1,000,000 - + The Puget Sound Region a portfolio of thematic computer maps 1974 @@ -53,8 +53,8 @@ 1977 Tomography Includes bibliographical references and index - + Reconstruction tomography in diagnostic radiology and nuclear medicine proceedings of the workshop 1977 @@ -73,8 +73,8 @@ Scintillation cameras Imaging systems in medicine Includes bibliographical references and index - + Computer processing of dynamic images from an Anger scintillation camera the proceedings of a workshop 1974 @@ -92,8 +92,8 @@ proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976 1977 Optical pattern recognition - + Computer science & technology proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976 1977 @@ -106,13 +106,13 @@ How to program a computer Jack Collins - + How to program a computer Jack Collins - + How to program a computer Jack Collins diff --git a/test/test_termlist_block.sh b/test/test_termlist_block.sh index e7b1203..fb9e31b 100755 --- a/test/test_termlist_block.sh +++ b/test/test_termlist_block.sh @@ -1,24 +1,45 @@ #!/bin/sh +# # srcdir might be set by make srcdir=${srcdir:-"."} -#TODO set up solr target. For now use donut -#F=../solr/client.sh -# -#rm -f solr.pid -#$F -l solr.log -p ztest.pid -D @:9999 -#sleep 1 -#if test ! -f ztest.pid; then -# echo "yaz-ztest could not be started" -# exit 0 -#fi +TEST=test_termlist_block -${srcdir}/run_pazpar2.sh test_termlist_block -E=$? +# look for yaz-ztest in PATH +oIFS=$IFS +IFS=: +F='' +for p in $PATH; do + if test -x $p/yaz-ztest -a -x $p/yaz-client; then + VERSION=`$p/yaz-client -V|awk '{print $3;}'|awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` + if test $VERSION -ge 4000000; then + F=$p/yaz-ztest + break + fi + fi +done +IFS=$oIFS -#kill `cat ztest.pid` -#rm ztest.pid +if test -z "$F"; then + echo "yaz-ztest not found" + exit 0 +fi + +rm -f ztest.pid +rm -f ${TEST}_ztest.log +$F -l ${TEST}_ztest.log -p ztest.pid -D tcp:localhost:9999 +sleep 1 +if test ! -f ztest.pid; then + echo "yaz-ztest could not be started" + exit 0 +fi + +# Test using test_http.cfg +${srcdir}/run_pazpar2.sh ${TEST} +E=$? +kill `cat ztest.pid` +rm ztest.pid exit $E # Local Variables: diff --git a/test/test_termlist_block_10.res b/test/test_termlist_block_10.res index ba3ef40..5cb76eb 100644 --- a/test/test_termlist_block_10.res +++ b/test/test_termlist_block_10.res @@ -2,11 +2,10 @@ OK localhost:9999/db1 db1 -0 -10000 -localhost:9999/db1 -0 -Client_Error +22 +0 +22 +Client_Idle id_solr LOC (SOLR) diff --git a/test/test_termlist_block_11.res b/test/test_termlist_block_11.res index 2495a3a..a651123 100644 --- a/test/test_termlist_block_11.res +++ b/test/test_termlist_block_11.res @@ -8,12 +8,21 @@ Client_Idle 0 + +localhost:9999/db1 +db1 +22 +Client_Idle +0 + Davis, Phyllis2 +Jack Collins2 Norton, Peter2 Watt, Alan H2 Abass, Olayide1 +Adam, James1 Aldrich, Richard W1 Appleman, Daniel1 Bainbridge, David I1 @@ -23,14 +32,12 @@ Bott, Ed1 Brogden, William B1 Caplin, Steve1 -Carasik, Anne H1 -Casey, Jean Marie1 Computer file24 -Computers20 +Computers21 +Computer networks14 Computer graphics13 -Computer networks13 Computer program language10 Computer science10 Computer security9 @@ -39,20 +46,25 @@ Computer programs6 Computer software6 Operating systems6 +Bible5 Computer5 Computer crimes5 -Computer architecture4 200047 200120 199916 199810 +19773 +19712 +19742 +19802 +19872 +19922 +19932 19972 -19921 -19941 -19951 -19961 -20021 +19681 +19721 +19731 \ No newline at end of file diff --git a/test/test_termlist_block_12.res b/test/test_termlist_block_12.res index 8cf83dc..c05f58f 100644 --- a/test/test_termlist_block_12.res +++ b/test/test_termlist_block_12.res @@ -9,12 +9,21 @@ Client_Idle 0 + +localhost:9999/db1 +db1 +22 +Client_Idle +0 + Davis, Phyllis2 +Jack Collins2 Norton, Peter2 Watt, Alan H2 Abass, Olayide1 +Adam, James1 Aldrich, Richard W1 Appleman, Daniel1 Bainbridge, David I1 @@ -24,14 +33,12 @@ Bott, Ed1 Brogden, William B1 Caplin, Steve1 -Carasik, Anne H1 -Casey, Jean Marie1 Computer file24 -Computers20 +Computers21 +Computer networks14 Computer graphics13 -Computer networks13 Computer program language10 Computer science10 Computer security9 @@ -40,20 +47,25 @@ Computer programs6 Computer software6 Operating systems6 +Bible5 Computer5 Computer crimes5 -Computer architecture4 200047 200120 199916 199810 +19773 +19712 +19742 +19802 +19872 +19922 +19932 19972 -19921 -19941 -19951 -19961 -20021 +19681 +19721 +19731 \ No newline at end of file diff --git a/test/test_termlist_block_13.res b/test/test_termlist_block_13.res index ba3ef40..5cb76eb 100644 --- a/test/test_termlist_block_13.res +++ b/test/test_termlist_block_13.res @@ -2,11 +2,10 @@ OK localhost:9999/db1 db1 -0 -10000 -localhost:9999/db1 -0 -Client_Error +22 +0 +22 +Client_Idle id_solr LOC (SOLR) diff --git a/test/test_termlist_block_4.res b/test/test_termlist_block_4.res index 5a1147b..b1c2baa 100644 --- a/test/test_termlist_block_4.res +++ b/test/test_termlist_block_4.res @@ -1,8 +1,100 @@ OK 0 -0 -0 +6 +7 0 -0 +6 + + How to program a computer + Jack Collins + + How to program a computer + Jack Collins + + + How to program a computer + Jack Collins + + 2 + 69043 + 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 + + 1 + 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 + + 1 + 57536 + content: title the computer bible + + + 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 + + 1 + 23973 + 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 + + 1 + 17260 + content: title computer processing of dynamic images from an anger scintillation camera + + + 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 + + 1 + 0 + content: title reconstruction tomography in diagnostic radiology and nuclear medicine + \ No newline at end of file diff --git a/test/test_termlist_block_5.res b/test/test_termlist_block_5.res index 0595f75..8b8a807 100644 --- a/test/test_termlist_block_5.res +++ b/test/test_termlist_block_5.res @@ -2,9 +2,8 @@ OK localhost:9999/db1 db1 -0 -10000 -localhost:9999/db1 -0 -Client_Error +7 +0 +7 +Client_Idle \ No newline at end of file diff --git a/test/test_termlist_block_6.res b/test/test_termlist_block_6.res index cda4aea..f78c7dc 100644 --- a/test/test_termlist_block_6.res +++ b/test/test_termlist_block_6.res @@ -1,8 +1,33 @@ 0 + +localhost:9999/db1 +db1 +7 +Client_Idle +0 + + + +Jack Collins2 +Mairs, John W1 + + +Bible1 +Bible. O.T1 +Cartography1 +Imaging systems in medicine1 +Optical pattern recognition1 +Puget Sound region (Wash.)1 +Radioisotope scanning1 +Scintillation cameras1 +Tomography1 + + +19742 +19772 +19731 +19801 - - - \ No newline at end of file diff --git a/test/test_termlist_block_9.res b/test/test_termlist_block_9.res index 56b0b3a..20fa7b7 100644 --- a/test/test_termlist_block_9.res +++ b/test/test_termlist_block_9.res @@ -1,8 +1,8 @@ OK 0 -100 -2015 +121 +2037 0 20 @@ -18,7 +18,7 @@ Woodward, C. Michael 1 - 49512 + 100676 content: title adobe illustrator for the mac author woodward c michael @@ -30,7 +30,7 @@ 1998 1 - 49512 + 100676 content: title advanced computer performance modeling and simulation @@ -48,7 +48,7 @@ "April 2000." 1 - 49512 + 100676 content: title cyberterrorism and computer crimes author aldrich richard w @@ -64,7 +64,7 @@ Kaasgaard, Klaus 1 - 45386 + 92286 content: title software design and usability author kaasgaard klaus @@ -80,7 +80,7 @@ Explains what computer hacking is, who does it, and how dangerous it can be 1 - 43403 + 88255 content: title everything you need to know about the dangers of computer hacking author knittel john @@ -94,7 +94,7 @@ Cook, Barry M 1 - 43323 + 88091 content: title computer peripherals author cook barry m @@ -109,7 +109,7 @@ 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 1 - 38051 + 77371 content: title kids computer book @@ -123,7 +123,7 @@ Steinbacher, Raymond 1 - 37134 + 75507 content: title computer friendly author steinbacher raymond @@ -139,7 +139,7 @@ "Also published as Parliamentary Paper E 31AO"--T.p. verso 1 - 37134 + 75507 content: title computer misuse @@ -155,7 +155,7 @@ Ross, Keith W 1 - 37134 + 75507 content: title computer networking author ross keith w @@ -171,7 +171,7 @@ Includes index 1 - 37134 + 75507 content: title coreldraw for windows author davis phyllis @@ -190,7 +190,7 @@ "Covers Quicken deluxe 2000 for the Mac"--Cover 1 - 37134 + 75507 content: title quicken for the mac author langer maria @@ -202,7 +202,7 @@ 1998 1 - 37134 + 75507 content: title sicherheit und schutz im netz @@ -218,7 +218,7 @@ Includes index 1 - 37134 + 75507 content: title unix secure shell author carasik anne h @@ -234,7 +234,7 @@ "IEEE catalog number 99EX370"--T.p. verso 1 - 35071 + 71312 content: title eight international conference on computer communications and networks @@ -250,7 +250,7 @@ Includes index 1 - 33008 + 67117 content: title building storage networks author farley marc @@ -268,7 +268,7 @@ Includes index 1 - 33008 + 67117 content: title complete cl author malaga ernie @@ -284,10 +284,24 @@ Watt, Alan H 1 - 33008 + 67117 content: title d games author watt alan h + Internet world + 1992 + Title from caption + + Internet world + 1992 + Title from caption + + 1 + 67117 + content: title internet world + + Java applications strategies for the AS/400 1999 Denoncourt, Don @@ -298,24 +312,7 @@ Denoncourt, Don 1 - 33008 + 67117 content: title java applications strategies for the as author denoncourt don - - Mastering algorithms with C - 1999 - Loudon, Kyle - "Useful techniques from sorting to encryption"--Cover - - Mastering algorithms with C - 1999 - Loudon, Kyle - "Useful techniques from sorting to encryption"--Cover - Includes index - - 1 - 33008 - content: title mastering algorithms with c author loudon kyle - \ No newline at end of file