From 08198c03e496d2936920e563e93bdf1768ffdf35 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 8 Sep 2009 09:01:44 +0200 Subject: [PATCH] Test server with multiple services --- test/Makefile.am | 3 +- test/run_pazpar2.sh | 4 +- test/test_http.cfg | 15 +++ test/test_http.xml | 34 ------- test/test_http_26.res | 1 + test/test_http_27.res | 1 + test/test_http_28.res | 194 +++++++++++++++++++++++++++++++++++++ test/test_http_urls | 4 + test/test_icu.cfg | 2 + test/z3950_indexdata_com_gils.xml | 34 +++++++ test/z3950_indexdata_com_marc.xml | 34 +++++++ 11 files changed, 289 insertions(+), 37 deletions(-) delete mode 100644 test/test_http.xml create mode 100644 test/test_http_26.res create mode 100644 test/test_http_27.res create mode 100644 test/test_http_28.res create mode 100644 test/z3950_indexdata_com_gils.xml create mode 100644 test/z3950_indexdata_com_marc.xml diff --git a/test/Makefile.am b/test/Makefile.am index 9be0625..c84a8e1 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,7 +1,8 @@ # This file is part of Pazpar2. check_SCRIPTS = test_http.sh test_icu.sh -EXTRA_DIST = run_pazpar2.sh marc21.xsl test_http.xml test_http.cfg \ +EXTRA_DIST = run_pazpar2.sh marc21.xsl z3950_indexdata_com_marc.xml \ + z3950_indexdata_com_gils.xml test_http.cfg \ test_http_urls test_icu.cfg test_icu_urls $(check_SCRIPTS) TESTS = $(check_SCRIPTS) diff --git a/test/run_pazpar2.sh b/test/run_pazpar2.sh index 712282f..5b0c9b0 100755 --- a/test/run_pazpar2.sh +++ b/test/run_pazpar2.sh @@ -32,9 +32,9 @@ CFG=${PREFIX}.cfg URLS=${PREFIX}_urls if test "$usevalgrind"; then - valgrind --log-file=valgrind ../src/pazpar2 -X -l pazpar2.log -f ${CFG} -t ${srcdir}/test_http.xml >extra_pazpar2.log 2>&1 & + valgrind --log-file=valgrind ../src/pazpar2 -X -l pazpar2.log -f ${CFG} >extra_pazpar2.log 2>&1 & else - YAZ_LOG=zoom,zoomdetails,debug,log,fatal ../src/pazpar2 -d -X -l pazpar2.log -f ${srcdir}/${CFG} -t ${srcdir}/test_http.xml >extra_pazpar2.log 2>&1 & + YAZ_LOG=zoom,zoomdetails,debug,log,fatal ../src/pazpar2 -d -X -l pazpar2.log -f ${srcdir}/${CFG} >extra_pazpar2.log 2>&1 & fi diff --git a/test/test_http.cfg b/test/test_http.cfg index 23de8a9..2ca4acd 100644 --- a/test/test_http.cfg +++ b/test/test_http.cfg @@ -6,6 +6,7 @@ + @@ -22,6 +23,20 @@ + + + + + + + + + + + + + diff --git a/test/test_http.xml b/test/test_http.xml deleted file mode 100644 index b713b3b..0000000 --- a/test/test_http.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/test/test_http_26.res b/test/test_http_26.res new file mode 100644 index 0000000..c610a3b --- /dev/null +++ b/test/test_http_26.res @@ -0,0 +1 @@ +OK31 \ No newline at end of file diff --git a/test/test_http_27.res b/test/test_http_27.res new file mode 100644 index 0000000..d2e0e58 --- /dev/null +++ b/test/test_http_27.res @@ -0,0 +1 @@ +OK \ No newline at end of file diff --git a/test/test_http_28.res b/test/test_http_28.res new file mode 100644 index 0000000..4bb0e38 --- /dev/null +++ b/test/test_http_28.res @@ -0,0 +1,194 @@ + +OK +0 +17 +17 +0 +17 + + +UTAH GEOLOGICAL ASSOCIATION PUBLICATIONS +Guidebooks and field logs of selected Utah sites comprise this data set +UTAH GEOLOGICAL ASSOCIATION PUBLICATIONS +Guidebooks and field logs of selected Utah sites comprise this data set +1970-PRESENT +test-usersetting-2 data: + +title utah geological association publications author medium book + + + +UTAH GEOLOGICAL SOCIETY PUBLICATIONS +Guidebooks and field logs of selected areas in Utah and neighboring states comprise this data set +UTAH GEOLOGICAL SOCIETY PUBLICATIONS +Guidebooks and field logs of selected areas in Utah and neighboring states comprise this data set +1946-1970 +test-usersetting-2 data: + +title utah geological society publications author medium book + + + +UTAH GEOCHROMOMETRY +Utah radiometric dates, formations, investigations, constants, references comprise this data set. Searches by formation, age, location, constants, methodology, and rock type will be possible +UTAH GEOCHROMOMETRY +Utah radiometric dates, formations, investigations, constants, references comprise this data set. Searches by formation, age, location, constants, methodology, and rock type will be possible +test-usersetting-2 data: + +title utah geochromometry author medium book + + + +UTAH CRIB FILE +CRIB-UTAH is a data base covering mineral occurrences in Utah, including metals, non-metals, and fuels. Each mineral occurrence is plotted on topographic maps and described in a six page report +UTAH CRIB FILE +CRIB-UTAH is a data base covering mineral occurrences in Utah, including metals, non-metals, and fuels. Each mineral occurrence is plotted on topographic maps and described in a six page report +-PRESENT +test-usersetting-2 data: + +title utah crib file author medium book + + + +UTAH GEOLOGICAL AND MINERAL SURVEY PUBLICATIONS +Publications of the Utah Geological and Mineral Survey include reports of investigation, special studies, bulletins, open-file reports, geologic map of Utah, publications of geological societies, geologic and oil and mineral maps, coal monographs, circulars, water resource bulletins, and reprints of articles +UTAH GEOLOGICAL AND MINERAL SURVEY PUBLICATIONS +Publications of the Utah Geological and Mineral Survey include reports of investigation, special studies, bulletins, open-file reports, geologic map of Utah, publications of geological societies, geologic and oil and mineral maps, coal monographs, circulars, water resource bulletins, and reprints of articles +-PRESENT +test-usersetting-2 data: + +title utah geological and mineral survey publications author medium book + + + +UTAH OIL FIELD FILE +Complete Utah oil field data including geology, production, recovery methods, structure maps, index map of wells within field, type section logs, operations, field history, bibliography, references, reservoir data, and completion practices comprise this data set +UTAH OIL FIELD FILE +Complete Utah oil field data including geology, production, recovery methods, structure maps, index map of wells within field, type section logs, operations, field history, bibliography, references, reservoir data, and completion practices comprise this data set +1900-PRESENT +test-usersetting-2 data: + +title utah oil field file author medium book + + + +UTAH GEOLOGIC MAP BIBLIOGRAPHY +This collection consists of theses, dissertations, and other unpublished maps as well as published maps of the geology of Utah. Some maps of the collection are xeroxed from limited collections. Cross-sections are included in set. Data file consists of map bibliography +UTAH GEOLOGIC MAP BIBLIOGRAPHY +This collection consists of theses, dissertations, and other unpublished maps as well as published maps of the geology of Utah. Some maps of the collection are xeroxed from limited collections. Cross-sections are included in set. Data file consists of map bibliography +-PRESENT +test-usersetting-2 data: + +title utah geologic map bibliography author medium book + + + +BIBLIOGRAPHY OF UTAH GEOLOGY +Keyworded compilation of 11,300 bibliographic entries consisting of commodities, applied geology, investigation procedures and stratigraphic units related to Utah comprise this data set. Entries are searchable by state, county, quadrangle, as well as keywords. Entries include theses and dissertations referenced in GEOREF to 1980 +BIBLIOGRAPHY OF UTAH GEOLOGY +Keyworded compilation of 11,300 bibliographic entries consisting of commodities, applied geology, investigation procedures and stratigraphic units related to Utah comprise this data set. Entries are searchable by state, county, quadrangle, as well as keywords. Entries include theses and dissertations referenced in GEOREF to 1980 +-PRESENT +test-usersetting-2 data: + +title bibliography of utah geology author medium book + + + +MEASURED GEOLOGIC SECTIONS +Selected geologic sections and references to geologic sections concerning Utah geology comprise this data set. Formation, lithologic description, fossils, thickness, location of section, and Utah type sections are included in this data set +MEASURED GEOLOGIC SECTIONS +Selected geologic sections and references to geologic sections concerning Utah geology comprise this data set. Formation, lithologic description, fossils, thickness, location of section, and Utah type sections are included in this data set +-PRESENT +test-usersetting-2 data: + +title measured geologic sections author medium book + + + +UTAH EARTHQUAKE EPICENTERS +Five files of epicenter data arranged by date comprise this data set. These files are searchable by magnitude and longitude/latitude. Hardcopy of listing and plot of requested area available. Epicenter location and date, magnitude, and focal depth available +UTAH EARTHQUAKE EPICENTERS +Five files of epicenter data arranged by date comprise this data set. These files are searchable by magnitude and longitude/latitude. Hardcopy of listing and plot of requested area available. Epicenter location and date, magnitude, and focal depth available +-PRESENT +test-usersetting-2 data: + +title utah earthquake epicenters author medium book + + + +COAL SAMPLE BANK +This data set contains methane data, chemical analysis data, and petrographic analysis data on core samples in Utah +COAL SAMPLE BANK +This data set contains methane data, chemical analysis data, and petrographic analysis data on core samples in Utah +-PRESENT +test-usersetting-2 data: + +title coal sample bank author medium book + + + +INTERMOUNTAIN ASSOCIATION OF PETROLEUM GEOLOGISTS/GEOLOGISTS PUBLICATIONS +Guidebooks and field trip logs covering intermountain states: Utah, New Mexico, Colorado, Wyoming, Montana, Nevada, Idaho, Arizona comprise this data set +INTERMOUNTAIN ASSOCIATION OF PETROLEUM GEOLOGISTS/GEOLOGISTS PUBLICATIONS +Guidebooks and field trip logs covering intermountain states: Utah, New Mexico, Colorado, Wyoming, Montana, Nevada, Idaho, Arizona comprise this data set +1950-1970 +test-usersetting-2 data: + +title intermountain association of petroleum geologists geologists publications author medium book + + + +ELECTRIC LOG LIBRARY +Logs for selected petroleum wells include electric (all varieties) and lithologic or hydrocarbon logs. Duplicates from OG&M well records file, supplied by private concerns. The areal coverage is Utah and vicinity +ELECTRIC LOG LIBRARY +Logs for selected petroleum wells include electric (all varieties) and lithologic or hydrocarbon logs. Duplicates from OG&M well records file, supplied by private concerns. The areal coverage is Utah and vicinity +-PRESENT +test-usersetting-2 data: + +title electric log library author medium book + + + +APPLIED GEOLOGY FILE +Reports and memorandums completed by the Site Investigation Section comprise this data set. Subjects include geotechnical appraisal of public facility sites before and during construction and evaluations of hazardous waste problems +APPLIED GEOLOGY FILE +Reports and memorandums completed by the Site Investigation Section comprise this data set. Subjects include geotechnical appraisal of public facility sites before and during construction and evaluations of hazardous waste problems +1970-PRESENT +test-usersetting-2 data: + +title applied geology file author medium book + + + +MINE MAP INDEX +Mine Map Index is an index of mine maps located in the UGMS energy section. All maps are rescaled by hand to 1:24,000. Maps show areal extent of mine and coal seams. Maps are used for production, control, and resource calculations +MINE MAP INDEX +Mine Map Index is an index of mine maps located in the UGMS energy section. All maps are rescaled by hand to 1:24,000. Maps show areal extent of mine and coal seams. Maps are used for production, control, and resource calculations +-PRESENT +test-usersetting-2 data: + +title mine map index author medium book + + + +WELL SAMPLE LIBRARY +Petroleum, mining, geothermal, and stratigraphic samples, including cores, core chips and drill cuttings comprise this data set. This does not include logs or description. These data are supplied by outside agencies and private organizations +WELL SAMPLE LIBRARY +Petroleum, mining, geothermal, and stratigraphic samples, including cores, core chips and drill cuttings comprise this data set. This does not include logs or description. These data are supplied by outside agencies and private organizations +-PRESENT +test-usersetting-2 data: + +title well sample library author medium book + + + +OIL IMPREGNATED ROCK DEPOSITS +High viscosity, low volatile content, hydrocarbon deposits which are developed using unconventional petroleum methods comprise this data set. Deposits include tar sands, limestones, basalts but not shales or solid hydrocarbons. This file includes outcrop maps, field notes, references, logs, stratigraphy, geologic report, and production from outside or in-house sources +OIL IMPREGNATED ROCK DEPOSITS +High viscosity, low volatile content, hydrocarbon deposits which are developed using unconventional petroleum methods comprise this data set. Deposits include tar sands, limestones, basalts but not shales or solid hydrocarbons. This file includes outcrop maps, field notes, references, logs, stratigraphy, geologic report, and production from outside or in-house sources +-PRESENT +test-usersetting-2 data: + +title oil impregnated rock deposits author medium book + + diff --git a/test/test_http_urls b/test/test_http_urls index d91243c..1361d16 100644 --- a/test/test_http_urls +++ b/test/test_http_urls @@ -27,3 +27,7 @@ http://localhost:9763/search.pz2?session=1&command=search&query=computer http://localhost:9763/search.pz2?session=1&command=record&id=title+how+to+program+a+computer+author+jack+collins+medium+book http://localhost:9763/search.pz2?session=1&command=record&id=title+how+to+program+a+computer+author+jack+collins+medium+book&offset=0&binary=1 http://localhost:9763/search.pz2?session=1&command=record&id=title+how+to+program+a+computer+author+jack+collins+medium+book&offset=0&binary=1&syntax=xml +http://localhost:9763/search.pz2?command=init&service=gils +http://localhost:9763/search.pz2?session=2&command=search&query=utah +2 +http://localhost:9763/search.pz2?session=2&command=show&start=0&number=1&block=1 diff --git a/test/test_icu.cfg b/test/test_icu.cfg index b569ddf..1daae47 100644 --- a/test/test_icu.cfg +++ b/test/test_icu.cfg @@ -4,6 +4,7 @@ + @@ -30,6 +31,7 @@ + diff --git a/test/z3950_indexdata_com_gils.xml b/test/z3950_indexdata_com_gils.xml new file mode 100644 index 0000000..4964c7b --- /dev/null +++ b/test/z3950_indexdata_com_gils.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/z3950_indexdata_com_marc.xml b/test/z3950_indexdata_com_marc.xml new file mode 100644 index 0000000..b713b3b --- /dev/null +++ b/test/z3950_indexdata_com_marc.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- 1.7.10.4