From 914b2a7a8d2483925c60f6d8828d85d479e29320 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Wed, 23 Sep 2009 16:09:43 +0200 Subject: [PATCH] Fix session in some tests. --- test/test_http_28.res | 180 +++++++++++++------------------------------------ test/test_http_32.res | 24 ++++--- test/test_http_urls | 10 +-- 3 files changed, 68 insertions(+), 146 deletions(-) diff --git a/test/test_http_28.res b/test/test_http_28.res index 4bb0e38..017a63c 100644 --- a/test/test_http_28.res +++ b/test/test_http_28.res @@ -7,188 +7,104 @@ 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 GEOCHROMOMETRY +UTAH GEOCHROMOMETRY +title utah geochromometry 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 EARTHQUAKE EPICENTERS +UTAH EARTHQUAKE EPICENTERS +title utah earthquake epicenters 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 +UTAH CRIB FILE +title utah crib file 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 OIL FIELD FILE +UTAH OIL FIELD FILE +title utah oil field 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 GEOLOGIC MAP BIBLIOGRAPHY +UTAH GEOLOGIC MAP BIBLIOGRAPHY +title utah geologic map bibliography 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 GEOLOGICAL SOCIETY PUBLICATIONS +UTAH GEOLOGICAL SOCIETY PUBLICATIONS +title utah geological society publications 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 +UTAH GEOLOGICAL ASSOCIATION PUBLICATIONS +UTAH GEOLOGICAL ASSOCIATION PUBLICATIONS +title utah geological association publications 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: - +BIBLIOGRAPHY OF UTAH GEOLOGY +BIBLIOGRAPHY OF UTAH GEOLOGY 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 GEOLOGICAL AND MINERAL SURVEY PUBLICATIONS +UTAH GEOLOGICAL AND MINERAL SURVEY PUBLICATIONS +title utah geological and mineral survey publications 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 +APPLIED GEOLOGY FILE +APPLIED GEOLOGY FILE +title applied geology file 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 +MINE MAP INDEX +MINE MAP INDEX +title mine map index 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 +COAL SAMPLE BANK +COAL SAMPLE BANK +title coal sample bank 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 +MEASURED GEOLOGIC SECTIONS +MEASURED GEOLOGIC SECTIONS +title measured geologic sections 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 +INTERMOUNTAIN ASSOCIATION OF PETROLEUM GEOLOGISTS/GEOLOGISTS PUBLICATIONS +INTERMOUNTAIN ASSOCIATION OF PETROLEUM GEOLOGISTS/GEOLOGISTS PUBLICATIONS +title intermountain association of petroleum geologists geologists publications 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 +ELECTRIC LOG LIBRARY +ELECTRIC LOG LIBRARY +title electric log library 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: - +WELL SAMPLE LIBRARY +WELL SAMPLE LIBRARY 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: - +OIL IMPREGNATED ROCK DEPOSITS +OIL IMPREGNATED ROCK DEPOSITS title oil impregnated rock deposits author medium book diff --git a/test/test_http_32.res b/test/test_http_32.res index d660d8b..fca240d 100644 --- a/test/test_http_32.res +++ b/test/test_http_32.res @@ -7,20 +7,26 @@ 3 -OIL/GAS DRILLING -OIL/GAS DRILLING -title oil gas drilling author oil gas drilling medium book +BIBLIOGRAPHY OF MAINE GEOLOGY +This data base is a computer based bibliography of marine geology. It allows searching by topic and geographic location, similar to GEOREF. It is currently under development to replace the printed Bibliography of Marine Geology +BIBLIOGRAPHY OF MAINE GEOLOGY +This data base is a computer based bibliography of marine geology. It allows searching by topic and geographic location, similar to GEOREF. It is currently under development to replace the printed Bibliography of Marine Geology +title bibliography of maine geology author bibliography of maine geology medium book -GROUNDWATER RESOURCE MAPS - COUNTY SERIES -GROUNDWATER RESOURCE MAPS - COUNTY SERIES -title groundwater resource maps county series author groundwater resource maps county series medium book +OIL/GAS DRILLING +This database contains information on oil and gas drilling such as well name, operator, driller, location, depth, copies of logs run, permits, samples (cuttings, core), completion records +OIL/GAS DRILLING +This database contains information on oil and gas drilling such as well name, operator, driller, location, depth, copies of logs run, permits, samples (cuttings, core), completion records +title oil gas drilling author oil gas drilling medium book -BIBLIOGRAPHY OF MAINE GEOLOGY -BIBLIOGRAPHY OF MAINE GEOLOGY -title bibliography of maine geology author bibliography of maine geology medium book +GROUNDWATER RESOURCE MAPS - COUNTY SERIES +A series of 1:250,000 scale maps showing well yield, well depth, and depth to bedrock for a large number of bedrock wells inventoried by the Maine Geological Survey in the mid-to late 1970's comprises this data set. Some series also show bedrock topography and potentiometric surface. Geographic coverage is restricted to Southern Maine +GROUNDWATER RESOURCE MAPS - COUNTY SERIES +A series of 1:250,000 scale maps showing well yield, well depth, and depth to bedrock for a large number of bedrock wells inventoried by the Maine Geological Survey in the mid-to late 1970's comprises this data set. Some series also show bedrock topography and potentiometric surface. Geographic coverage is restricted to Southern Maine +title groundwater resource maps county series author groundwater resource maps county series medium book diff --git a/test/test_http_urls b/test/test_http_urls index 00c08cc..b2c7e15 100644 --- a/test/test_http_urls +++ b/test/test_http_urls @@ -28,11 +28,11 @@ http://localhost:9763/search.pz2?session=1&command=record&id=title+how+to+progra 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 +http://localhost:9763/search.pz2?session=3&command=search&query=utah 2 -http://localhost:9763/search.pz2?session=2&command=show&start=0&number=1&block=1 +http://localhost:9763/search.pz2?session=3&command=show&start=0&number=1&block=1 http://localhost:9763/search.pz2?command=init&clear=1 -http://localhost:9763/search.pz2?session=3&command=settings&pz:name[z3950.indexdata.com%2Fgils]=gils&pz:requestsyntax[z3950.indexdata.com%2Fgils]=usmarc&pz:nativesyntax[z3950.indexdata.com%2Fgils]=iso2709&pz:xslt[z3950.indexdata.com%2Fgils]=marc21.mmap -http://localhost:9763/search.pz2?session=3&command=search&query=computer +http://localhost:9763/search.pz2?session=4&command=settings&pz:name[z3950.indexdata.com%2Fgils]=gils&pz:requestsyntax[z3950.indexdata.com%2Fgils]=usmarc&pz:nativesyntax[z3950.indexdata.com%2Fgils]=iso2709&pz:xslt[z3950.indexdata.com%2Fgils]=marc21.mmap +http://localhost:9763/search.pz2?session=4&command=search&query=computer 2 -http://localhost:9763/search.pz2?session=3&command=show&start=0&number=1&block=1 +http://localhost:9763/search.pz2?session=4&command=show&start=0&number=1&block=1 -- 1.7.10.4