From: Adam Dickmeiss Date: Wed, 8 Sep 2010 14:05:08 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2 X-Git-Tag: v1.5.0~11^2 X-Git-Url: http://lists.indexdata.com/cgi-bin?a=commitdiff_plain;h=45aad521b4244ec88371b742340fd8f4cf757149;hp=c0a76422c4b7674180b723d019ab08dbe3066639;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 f8af926..a931ca8 100644 --- a/src/client.c +++ b/src/client.c @@ -97,6 +97,7 @@ struct client { int maxrecs; int startrecs; int diagnostic; + int preferred; enum client_state state; struct show_raw *show_raw; ZOOM_resultset resultset; @@ -146,9 +147,13 @@ void client_set_state(struct client *cl, enum client_state st) that session is not mutex locked if client is already active */ if (was_active && !client_is_active(cl) && cl->session) { + int no_active = session_active_clients(cl->session); - if (no_active == 0) + yaz_log(YLOG_DEBUG, "%s: releasing watches on zero active: %d", client_get_url(cl), no_active); + if (no_active == 0) { session_alert_watch(cl->session, SESSION_WATCH_SHOW); + session_alert_watch(cl->session, SESSION_WATCH_SHOW_PREF); + } } } @@ -442,6 +447,26 @@ static void ingest_raw_record(struct client *cl, ZOOM_record rec) client_show_raw_dequeue(cl); } +static void client_check_preferred_watch(struct client *cl) +{ + yaz_log(YLOG_DEBUG, "client_check_preferred_watch: %s ", client_get_url(cl)); + struct session *se = cl->session; + if (se) + { + client_unlock(cl); + if (session_is_preferred_clients_ready(se)) { + session_alert_watch(se, SESSION_WATCH_SHOW_PREF); + } + else + yaz_log(YLOG_DEBUG, "client_check_preferred_watch: %s ", client_get_url(cl)); + + client_lock(cl); + } + else + yaz_log(YLOG_WARN, "client_check_preferred_watch: %s. No session!", client_get_url(cl)); + +} + void client_search_response(struct client *cl) { struct connection *co = cl->connection; @@ -465,6 +490,8 @@ void client_search_response(struct client *cl) cl->hits = ZOOM_resultset_size(resultset); if (se) se->total_hits += cl->hits; + if (cl->preferred) + client_check_preferred_watch(cl); } } @@ -620,13 +647,14 @@ void client_start_search(struct client *cl) ZOOM_connection link = connection_get_link(co); ZOOM_resultset rs; char *databaseName = sdb->database->databases[0]; - const char *opt_piggyback = session_setting_oneval(sdb, PZ_PIGGYBACK); - const char *opt_queryenc = session_setting_oneval(sdb, PZ_QUERYENCODING); - const char *opt_elements = session_setting_oneval(sdb, PZ_ELEMENTS); - const char *opt_requestsyn = session_setting_oneval(sdb, PZ_REQUESTSYNTAX); - const char *opt_maxrecs = session_setting_oneval(sdb, PZ_MAXRECS); - const char *opt_sru = session_setting_oneval(sdb, PZ_SRU); - const char *opt_sort = session_setting_oneval(sdb, PZ_SORT); + const char *opt_piggyback = session_setting_oneval(sdb, PZ_PIGGYBACK); + const char *opt_queryenc = session_setting_oneval(sdb, PZ_QUERYENCODING); + const char *opt_elements = session_setting_oneval(sdb, PZ_ELEMENTS); + const char *opt_requestsyn = session_setting_oneval(sdb, PZ_REQUESTSYNTAX); + const char *opt_maxrecs = session_setting_oneval(sdb, PZ_MAXRECS); + const char *opt_sru = session_setting_oneval(sdb, PZ_SRU); + const char *opt_sort = session_setting_oneval(sdb, PZ_SORT); + const char *opt_preferred = session_setting_oneval(sdb, PZ_PREFERRED); char maxrecs_str[24], startrecs_str[24]; assert(link); @@ -634,6 +662,11 @@ void client_start_search(struct client *cl) cl->hits = -1; cl->record_offset = 0; cl->diagnostic = 0; + + if (opt_preferred) { + cl->preferred = atoi(opt_preferred); + yaz_log(YLOG_LOG, "Target %s has preferred: %d", sdb->database->url, cl->preferred); + } client_set_state(cl, Client_Working); if (*opt_piggyback) @@ -669,6 +702,7 @@ void client_start_search(struct client *cl) ZOOM_connection_option_set(link, "databaseName", databaseName); /* TODO Verify does it break something for CQL targets(non-SOLR) ? */ + /* facets definition is in PQF */ client_set_facets_request(cl, link); if (cl->cqlquery) @@ -709,7 +743,7 @@ struct client *client_create(void) r->resultset = 0; r->mutex = 0; pazpar2_mutex_create(&r->mutex, "client"); - + r->preferred = 0; r->ref_count = 1; client_use(1); @@ -970,6 +1004,19 @@ int client_is_active(struct client *cl) return 0; } +int client_is_active_preferred(struct client *cl) +{ + /* only count if this is a preferred target. */ + if (!cl->preferred) + return 0; + /* TODO No sure this the condition that Seb wants */ + if (cl->connection && (cl->state == Client_Connecting || + cl->state == Client_Working)) + return 1; + return 0; +} + + Odr_int client_get_hits(struct client *cl) { return cl->hits; @@ -1018,6 +1065,12 @@ void client_set_startrecs(struct client *cl, int v) cl->startrecs = v; } +void client_set_preferred(struct client *cl, int v) +{ + cl->preferred = v; +} + + /* * Local variables: * c-basic-offset: 4 diff --git a/src/client.h b/src/client.h index b550129..70ba6d1 100644 --- a/src/client.h +++ b/src/client.h @@ -77,6 +77,7 @@ int client_prep_connection(struct client *cl, void client_start_search(struct client *cl); void client_set_session(struct client *cl, struct session *se); int client_is_active(struct client *cl); +int client_is_active_preferred(struct client *cl); struct client *client_next_in_session(struct client *cl); int client_parse_query(struct client *cl, const char *query); diff --git a/src/http_command.c b/src/http_command.c index a905750..567037f 100644 --- a/src/http_command.c +++ b/src/http_command.c @@ -936,7 +936,19 @@ static void cmd_show(struct http_channel *c) if (block) { - if (status && reclist_get_num_records(s->psession->reclist) == 0) + if (!strcmp(block, "preferred") && !session_is_preferred_clients_ready(s->psession)) { + // if there is already a watch/block. we do not block this one + if (session_set_watch(s->psession, SESSION_WATCH_SHOW_PREF, + show_records_ready, c, c) != 0) + { + yaz_log(c->http_sessions->log_level, + "%p Session %u: Blocking on cmd_show. Waiting for preferred targets", s, s->session_id); + } + release_session(c,s); + return; + + } + else if (status && reclist_get_num_records(s->psession->reclist) == 0) { // if there is already a watch/block. we do not block this one if (session_set_watch(s->psession, SESSION_WATCH_SHOW, diff --git a/src/session.c b/src/session.c index f7c0b99..4d64e32 100644 --- a/src/session.c +++ b/src/session.c @@ -436,7 +436,7 @@ void session_alert_watch(struct session *s, int what) session_watchfun fun; http_remove_observer(s->watchlist[what].obs); - fun = s->watchlist[what].fun; + fun = s->watchlist[what].fun; data = s->watchlist[what].data; /* reset watch before fun is invoked - in case fun wants to set @@ -446,6 +446,7 @@ void session_alert_watch(struct session *s, int what) s->watchlist[what].obs = 0; session_leave(s); + yaz_log(YLOG_DEBUG, "session_alert_watch: %d calling function: %p", what, fun); fun(data); } else @@ -509,6 +510,19 @@ int session_active_clients(struct session *s) return res; } +int session_is_preferred_clients_ready(struct session *s) +{ + struct client_list *l; + int res = 0; + + for (l = s->clients; l; l = l->next) + if (client_is_active_preferred(l->client)) + res++; + yaz_log(YLOG_DEBUG, "%p Session has %d active preferred clients.", s, res); + return res == 0; +} + + enum pazpar2_error_code search(struct session *se, const char *query, diff --git a/src/session.h b/src/session.h index d7f3efb..d16f3fb 100644 --- a/src/session.h +++ b/src/session.h @@ -79,7 +79,8 @@ struct session_database #define SESSION_WATCH_SHOW 0 #define SESSION_WATCH_RECORD 1 -#define SESSION_WATCH_MAX 1 +#define SESSION_WATCH_SHOW_PREF 2 +#define SESSION_WATCH_MAX 2 #define SESSION_MAX_TERMLISTS 10 @@ -167,6 +168,7 @@ void show_single_stop(struct session *s, struct record_cluster *rec); struct termlist_score **termlist(struct session *s, const char *name, int *num); int session_set_watch(struct session *s, int what, session_watchfun fun, void *data, struct http_channel *c); int session_active_clients(struct session *s); +int session_is_preferred_clients_ready(struct session *s); void session_apply_setting(struct session *se, char *dbname, char *setting, char *value); const char *session_setting_oneval(struct session_database *db, int offset); diff --git a/src/settings.c b/src/settings.c index 7ce16f0..ecd37ed 100644 --- a/src/settings.c +++ b/src/settings.c @@ -70,9 +70,10 @@ static char *hard_settings[] = { "pz:pqf_strftime", "pz:negotiation_charset", "pz:max_connections", - "pz:reuse_connections", // PZ_REUSE_CONNECTION - "pz:termlist_term_sort", // PZ_TERMLIST_TERM_SORT - "pz:termlist_term_count", // PZ_TERMLIST_TERM_COUNT + "pz:reuse_connections", /* PZ_REUSE_CONNECTION */ + "pz:termlist_term_sort", /* PZ_TERMLIST_TERM_SORT */ + "pz:termlist_term_count", /* PZ_TERMLIST_TERM_COUNT */ + "pz:preferred", /* PZ_PREFERRED */ 0 }; diff --git a/src/settings.h b/src/settings.h index b7ed827..d9c8789 100644 --- a/src/settings.h +++ b/src/settings.h @@ -46,7 +46,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define PZ_REUSE_CONNECTIONS 23 #define PZ_TERMLIST_TERM_SORT 24 #define PZ_TERMLIST_TERM_COUNT 25 -#define PZ_MAX_EOF 26 +#define PZ_PREFERRED 26 +#define PZ_MAX_EOF 27 struct setting { diff --git a/test/test_solr_10.res b/test/test_solr_10.res index 1ec476a..c39fff4 100644 --- a/test/test_solr_10.res +++ b/test/test_solr_10.res @@ -4,49 +4,60 @@ donut:8983/solr/select SOLR Test -29 +1128 Client_Idle 0 -Rosenberg, Donald1 -Lencevicius, Raimondas1 -Mills, Kyle1 -Simon, Frank1 -Myers, Katherine1 -Compton, Jason1 -Adair, Cherry1 -Shearer, Beverly1 -Arnold, Ken1 -Steinberg, Gene1 -Smith, George A1 -Crookston, Newell W1 -Ferguson, Derek1 -Thomas, Thomas M1 -Mitchell, Will David1 +D'Ignazio, Fred4 +Lampton, Christopher2 +Grauer, Robert T2 +Carlson, Edward H2 +Nevile, Liddy2 +Jones, Aubrey B2 +Boren, Sharon2 +Fiday, David2 +Groner, Gabriel F2 +Orkin, Michael1 +Thornburg, David D1 +Pradels, Jean Louis1 +Dietzler, Andrew John1 +Haverty, J. P1 +Eland, Dave Ronald1 -Debugging in computer science7 -Women computer programmers4 -Virtual computer systems4 -Cataloging of computer network resources3 -Embedded computer systems3 -Internet searching2 -Computer software2 -Microcomputers2 -Library surveys2 -Microprocessors2 -Computer simulation2 -Interactive computer systems2 -Real-time data processing2 -Chinese1 -Computer viruses1 +Apple computer40 +BASIC (Computer program language)38 +Atari computer35 +Programming (Computers)30 +Digital computer simulation20 +Computer graphics18 +LOGO (Computer program language)14 +Computer games14 +Debugging in computer science8 +Time-sharing computer systems8 +Virtual computer systems8 +Interactive computer systems8 +Embedded computer systems7 +Computers6 +Engineering6 -200017 -20016 -19995 -19861 +198423 +200018 +19839 +20017 +19996 +19856 +19704 +19864 +19732 +19642 +19662 +19931 +20031 +20061 +19821 diff --git a/test/test_solr_11.res b/test/test_solr_11.res index 27bc92e..03c7c0d 100644 --- a/test/test_solr_11.res +++ b/test/test_solr_11.res @@ -2,262 +2,308 @@ OK 0 -29 -29 +96 +1128 0 20 -Computer interfacing -2000 -Smith, George A -Computer interfacing -2000 -Smith, George A -525000 -title computer interfacing author smith george a +6502 assembly-language programming for Apple, Commodore, and Atari computers +1985 +Lampton, Christopher +Instructs those who have already programmed in high-level languages in programming with the more powerful and versatile assembly or machine language +6502 assembly-language programming for Apple, Commodore, and Atari computers +1985 +Lampton, Christopher +Cover title: 6502 assembly language +Series statement from jacket +Includes index +Instructs those who have already programmed in high-level languages in programming with the more powerful and versatile assembly or machine language +1020000 +title assembly language programming for apple commodore and atari computers author lampton christopher -Proceedings, 1999 EUROGRAPHICS/SIGGRAPH Workshop on Graphics Hardware, Los Angeles, California, August 8-9, 1999 -1999 -"ACM Order Number: 434998"--T.p. verso -Proceedings, 1999 EUROGRAPHICS/SIGGRAPH Workshop on Graphics Hardware, Los Angeles, California, August 8-9, 1999 -1999 -"ACM Order Number: 434998"--T.p. verso -350000 -title proceedings eurographics siggraph workshop on graphics hardware los angeles california august +Let's talk Apple Turtle +1984 +Nevile, Liddy +An introduction to the LOGO computer language using hands-on activities with the Apple computer and hands-off activities which relate to other skills areas in the curriculum +Let's talk Apple Turtle +1984 +Nevile, Liddy +Cataloging based on CIP information +An introduction to the LOGO computer language using hands-on activities with the Apple computer and hands-off activities which relate to other skills areas in the curriculum + +Let's talk Apple Turtle +1984 +Nevile, Liddy +Cataloging based on CIP information +An introduction to the LOGO computer language using hands-on activities with the Apple computer and hands-off activities which relate to other skills areas in the curriculum +2 +942857 +title let s talk apple turtle author nevile liddy -Embedded controller hardware design -2001 -Arnold, Ken -Includes index -Embedded controller hardware design -2001 -Arnold, Ken -Includes index -325000 -title embedded controller hardware design author arnold ken +Proceedings of the 1999 International Conference on Web-Based Modeling and Simulation +[held as part of] 1999 Western MultiConference, San Francisco, California, January 17-20, 1999, Cathedral Hill Hotel +1999-2000 +Network modeling -- Civil applications -- Education and training -- Military applications -- Parallel and distributed simulation -- DEVS-based approaches -- Modeling and simulation environments -- High-level architecture -- Visualization and animation -- Real-time applications +Proceedings of the International Conference on Web-based Modeling and Simulation +2000 +Both conferences held as parts of the 2000 Western MultiConference, San Diego, California, January 23-27, 2000, Catamaran Resort Hotel +"Sponsored by the Society for Computer Simulation International"--T.p + +Proceedings of the 1999 International Conference on Web-Based Modeling and Simulation +[held as part of] 1999 Western MultiConference, San Francisco, California, January 17-20, 1999, Cathedral Hill Hotel +1999 +Network modeling -- Civil applications -- Education and training -- Military applications -- Parallel and distributed simulation -- DEVS-based approaches -- Modeling and simulation environments -- High-level architecture -- Visualization and animation -- Real-time applications +2 +930000 +title proceedings of the international conference on web based modeling and simulation -Fourth IEEE International Workshop on Distributed Simulation and Real-Time Applications (DS-RT 2000) -proceedings : August 24-26, 2000, San Francisco, California -2000 -"IEEE Computer Society order number PR00838"--T.p. verso -Fourth IEEE International Workshop on Distributed Simulation and Real-Time Applications (DS-RT 2000) -proceedings : August 24-26, 2000, San Francisco, California -2000 -Workshop is being held jointly with MASCOTS 2000 -"IEEE Computer Society order number PR00838"--T.p. verso -283333 -title fourth ieee international workshop on distributed simulation and real time applications ds rt +Computer art and animation +a user's guide to Atari logo +1984 +Thornburg, David D +Explains how to use a computer to create graphic designs and animated sequences +Computer art and animation +a user's guide to Atari logo +1984 +Thornburg, David D +Includes index +Explains how to use a computer to create graphic designs and animated sequences +923076 +title computer art and animation author thornburg david d -Modeling, simulation, and visualization for real and virtual environments -7-8 April 1999, Orlando, Florida -1999 -Modeling, simulation, and visualization for real and virtual environments -7-8 April 1999, Orlando, Florida -1999 -250000 -title modeling simulation and visualization for real and virtual environments +Random alley adventure for the Atari computer +1984 +Orkin, Michael +Programs written in BASIC for an Atari computer provide experience in games of chance which demonstrate the law of averages +Random alley adventure for the Atari computer +1984 +Orkin, Michael +"A Reston Computer Group book." +Programs written in BASIC for an Atari computer provide experience in games of chance which demonstrate the law of averages +910714 +title random alley adventure for the atari computer author orkin michael -The raptor virus -a novel -2001 -Simon, Frank -The raptor virus -a novel -2001 -Simon, Frank -250000 -title the raptor virus author simon frank +I speak BASIC to my Atari +teacher's manual +1983 +Jones, Aubrey B +An introduction to the operation and applications of computers, with practice exercises +I speak BASIC to my Atari +1983 +Jones, Aubrey B +An introduction to the operation and applications of computers, with practice exercises + +I speak BASIC to my Atari +teacher's manual +1983 +Jones, Aubrey B +An introduction to the operation and applications of computers, with practice exercises +2 +900000 +title i speak basic to my atari author jones aubrey b -Workshop on Information Technology for Virtual Enterprises -ITVE 2001 : proceedings : January 29-30, 2001, Gold Coast, Queensland, Australia -2001 -Workshop on Information Technology for Virtual Enterprises -ITVE 2001 : proceedings : January 29-30, 2001, Gold Coast, Queensland, Australia -2001 -250000 -title workshop on information technology for virtual enterprises +School days for the Atari computer +1984 +Passantino, Claire Bailey +Presents twenty programs that include games, contests, riddles, songs, and other activities to use with BASIC on the Atari computer +School days for the Atari computer +1984 +Passantino, Claire Bailey +Presents twenty programs that include games, contests, riddles, songs, and other activities to use with BASIC on the Atari computer +865000 +title school days for the atari computer author passantino claire bailey -Upgrading & troubleshooting your Mac -2000 -Steinberg, Gene -CD-ROM includes: Adobe Acrobat Reader (freeware), Stuffit Expander (freeware), DropStuff (shareware), DragStrip (shareware), MacTicker (shareware), Conflict Catcher 8 (demoware), Spell Catcher 8 (demoware), et al -Upgrading & troubleshooting your Mac -2000 -Steinberg, Gene -Covers the iBook, iMac, G3/G4, & Powerbook computers -CD-ROM includes: Adobe Acrobat Reader (freeware), Stuffit Expander (freeware), DropStuff (shareware), DragStrip (shareware), MacTicker (shareware), Conflict Catcher 8 (demoware), Spell Catcher 8 (demoware), et al -Includes index -225000 -title upgrading troubleshooting your mac author steinberg gene +The Apple LOGO manual +1985 +Instructions for doing computer graphics on an Apple computer in LOGO +The Apple LOGO manual +1985 +Includes index +Instructions for doing computer graphics on an Apple computer in LOGO +804545 +title the apple logo manual -The UCITA revolution -the new e-commerce model for software and database licensing -2000 -Prepared for distribution at a program of the same name held April-May 2000 -The UCITA revolution -the new e-commerce model for software and database licensing -2000 -Prepared for distribution at a program of the same name held April-May 2000 -"G0-00D9"--Spine -210000 -title the ucita revolution +Kid-powered Logo +1984 +Fiday, David +Explains how to use the computer language LOGO to write fundamental programs and create graphics on the Apple computer +Kid-powered Logo +1984 +Fiday, David +Includes index +Explains how to use the computer language LOGO to write fundamental programs and create graphics on the Apple computer +781578 +title kid powered logo author fiday david -Debugging Java -troubleshooting for programmers -2000 -Mitchell, Will David -Includes index -Debugging Java -troubleshooting for programmers -2000 -Mitchell, Will David -Includes index -150000 -title debugging java author mitchell will david +Basic fun with graphics, the Atari computer way +1983 +Zuanich, Margaret Ann +Instructions for graphics programming on an Atari computer using BASIC +Basic fun with graphics, the Atari computer way +1983 +Zuanich, Margaret Ann +Instructions for graphics programming on an Atari computer using BASIC +780000 +title basic fun with graphics the atari computer way author zuanich margaret ann -Debugging Visual Basic -troubleshooting for programmers -2000 -Jung, David G -Includes index -Debugging Visual Basic -troubleshooting for programmers -2000 -Jung, David G -Includes index -150000 -title debugging visual basic author jung david g +Turtlesteps, an introduction to Apple Logo and Terrapin Logo +1984 +Sharp, Pamela +Introduces computer graphics and beginning programming in Apple Logo and Terrapin Logo +Turtlesteps, an introduction to Apple Logo and Terrapin Logo +1984 +Sharp, Pamela +Includes index +Introduces computer graphics and beginning programming in Apple Logo and Terrapin Logo +775000 +title turtlesteps an introduction to apple logo and terrapin logo author sharp pamela -Internet searching and indexing -the subject approach -2000 -Published also as v. 2, no. 3/4 2000 of the Journal of Internet cataloging -Internet searching and indexing -the subject approach -2000 -Published also as v. 2, no. 3/4 2000 of the Journal of Internet cataloging -120000 -title internet searching and indexing +Graphics and animation on the Atari +800, 400, 1200XL, 800XL, and 600XL +1986 +Lampton, Christopher +Instructions for creating simple and advanced graphics using BASIC on the Atari computer. Includes suggestions for projects +Graphics and animation on the Atari +800, 400, 1200XL, 800XL, and 600XL +1986 +Lampton, Christopher +Includes index +Instructions for creating simple and advanced graphics using BASIC on the Atari computer. Includes suggestions for projects +767647 +title graphics and animation on the atari author lampton christopher -Troubleshooting with SNMP and analyzing MIBS -2000 -Steinberg, Louis A -Preface -- Acknowledgments -- Foreword -- Sect. 1. Optimizing your environment -- Sect. 2. Introduction to using MIB data -- Sect. 3. Introduction to monitoring MIB objects -- Glossary -- Appendix A. -- Index -Troubleshooting with SNMP and analyzing MIBS -2000 -Steinberg, Louis A -Includes index -Preface -- Acknowledgments -- Foreword -- Sect. 1. Optimizing your environment -- Sect. 2. Introduction to using MIB data -- Sect. 3. Introduction to monitoring MIB objects -- Glossary -- Appendix A. -- Index -117857 -title troubleshooting with snmp and analyzing mibs author steinberg louis a +Apple building blocks +featuring Denby, the robot +1985 +D'Ignazio, Fred +Explains how to write fundamental programs for the Apple computer and use it to play forty-six educational games +Apple building blocks +featuring Denby, the robot +1985 +D'Ignazio, Fred +On t.p. the circled symbol "R" is superscript following "Apple" in the title +Explains how to write fundamental programs for the Apple computer and use it to play forty-six educational games +765789 +title apple building blocks author d ignazio fred -Proceedings, International Test Conference 1999 -1999 -Proceedings of the 30th ITC Conference held Sept. 28-30, 1999 in Atlantic City, N.J., sponsored by IEEE Computer Society -Proceedings, International Test Conference 1999 -1999 -Proceedings of the 30th ITC Conference held Sept. 28-30, 1999 in Atlantic City, N.J., sponsored by IEEE Computer Society -"IEEE Catalog Number 99CH37034"--T.p. verso -116666 -title proceedings international test conference +Apple in wonderland +1984 +D'Ignazio, Fred +System requirements for floppy disk: Apple II with Applesoft, II+, IIe, or IIc; DOS 3.3; 1 disk drive and controller card; color TV or monitor recommended +Apple in wonderland +1984 +D'Ignazio, Fred +System requirements for floppy disk: Apple II with Applesoft, II+, IIe, or IIc; DOS 3.3; 1 disk drive and controller card; color TV or monitor recommended +Issued in plastic case +Provides programs for twenty-two learning games written in BASIC for an Apple II computer. Includes a floppy disk +765789 +title apple in wonderland author d ignazio fred -Burn factor -2001 -Mills, Kyle -Burn factor -2001 -Mills, Kyle -100000 -title burn factor author mills kyle +Atari in Wonderland +1983 +D'Ignazio, Fred +Contains twenty-two short, simple games to use with an Atari computer on such topics as colors, sounds, multiplication, state names, spelling, fractions, and Spanish and French languages +Atari in Wonderland +1983 +D'Ignazio, Fred +Contains twenty-two short, simple games to use with an Atari computer on such topics as colors, sounds, multiplication, state names, spelling, fractions, and Spanish and French languages +685714 +title atari in wonderland author d ignazio fred -Code breaker -2000 -Myers, Katherine -Code breaker -2000 -Myers, Katherine -100000 -title code breaker author myers katherine +BASIC is child's play, Apple edition +1984 +Grauer, Robert T +Offers instructions for computer novices in programming with BASIC on an Apple personal computer +BASIC is child's play, Apple edition +1984 +Grauer, Robert T +Includes index +Offers instructions for computer novices in programming with BASIC on an Apple personal computer +642857 +title basic is child s play apple edition author grauer robert t -Information technology and people with disabilities -the current state of federal accessibility -2000 -Shipping list no.: 2000-0280-P -Information technology and people with disabilities -the current state of federal accessibility -2000 -Cover title -Shipping list no.: 2000-0280-P -"April 2000." -100000 -title information technology and people with disabilities +The Atari playground +1983 +D'Ignazio, Fred +Twenty-three learning games, grouped by subject, for use on an Atari computer. There are separate instructional sections for parents/teachers and for children +The Atari playground +1983 +D'Ignazio, Fred +Twenty-three learning games, grouped by subject, for use on an Atari computer. There are separate instructional sections for parents/teachers and for children +612500 +title the atari playground author d ignazio fred -Kiss and tell -2000 -Adair, Cherry -Kiss and tell -2000 -Adair, Cherry -100000 -title kiss and tell author adair cherry +Computer software +supplying it and finding it +1983 +Tagg, W +Computer software +supplying it and finding it +1983 +Tagg, W +600000 +title computer software author tagg w -Languages, compilers, and tools for embedded systems -ACM SIGPLAN Workshop LCTES '99, Atlanga, Georgia, May 5, 1999 : proceedings -1999 -Languages, compilers, and tools for embedded systems -ACM SIGPLAN Workshop LCTES '99, Atlanga, Georgia, May 5, 1999 : proceedings -1999 -100000 -title languages compilers and tools for embedded systems +Kid-powered graphics +1984 +Fiday, David +Includes index +Kid-powered graphics +1984 +Fiday, David +Includes index +600000 +title kid powered graphics author fiday david -Open Source -the unauthorized white papers -2000 -Rosenberg, Donald -Open Source -the unauthorized white papers -2000 -Rosenberg, Donald -100000 -title open source author rosenberg donald +BASIC on the ATARI computer for kids +1984 +Wyner, Keith +Instructions for the elementary school student in programming BASIC on an Atari computer +BASIC on the ATARI computer for kids +1984 +Wyner, Keith +Includes index +Instructions for the elementary school student in programming BASIC on an Atari computer +558791 +title basic on the atari computer for kids author wyner keith diff --git a/test/test_solr_4.res b/test/test_solr_4.res index 27bc92e..03c7c0d 100644 --- a/test/test_solr_4.res +++ b/test/test_solr_4.res @@ -2,262 +2,308 @@ OK 0 -29 -29 +96 +1128 0 20 -Computer interfacing -2000 -Smith, George A -Computer interfacing -2000 -Smith, George A -525000 -title computer interfacing author smith george a +6502 assembly-language programming for Apple, Commodore, and Atari computers +1985 +Lampton, Christopher +Instructs those who have already programmed in high-level languages in programming with the more powerful and versatile assembly or machine language +6502 assembly-language programming for Apple, Commodore, and Atari computers +1985 +Lampton, Christopher +Cover title: 6502 assembly language +Series statement from jacket +Includes index +Instructs those who have already programmed in high-level languages in programming with the more powerful and versatile assembly or machine language +1020000 +title assembly language programming for apple commodore and atari computers author lampton christopher -Proceedings, 1999 EUROGRAPHICS/SIGGRAPH Workshop on Graphics Hardware, Los Angeles, California, August 8-9, 1999 -1999 -"ACM Order Number: 434998"--T.p. verso -Proceedings, 1999 EUROGRAPHICS/SIGGRAPH Workshop on Graphics Hardware, Los Angeles, California, August 8-9, 1999 -1999 -"ACM Order Number: 434998"--T.p. verso -350000 -title proceedings eurographics siggraph workshop on graphics hardware los angeles california august +Let's talk Apple Turtle +1984 +Nevile, Liddy +An introduction to the LOGO computer language using hands-on activities with the Apple computer and hands-off activities which relate to other skills areas in the curriculum +Let's talk Apple Turtle +1984 +Nevile, Liddy +Cataloging based on CIP information +An introduction to the LOGO computer language using hands-on activities with the Apple computer and hands-off activities which relate to other skills areas in the curriculum + +Let's talk Apple Turtle +1984 +Nevile, Liddy +Cataloging based on CIP information +An introduction to the LOGO computer language using hands-on activities with the Apple computer and hands-off activities which relate to other skills areas in the curriculum +2 +942857 +title let s talk apple turtle author nevile liddy -Embedded controller hardware design -2001 -Arnold, Ken -Includes index -Embedded controller hardware design -2001 -Arnold, Ken -Includes index -325000 -title embedded controller hardware design author arnold ken +Proceedings of the 1999 International Conference on Web-Based Modeling and Simulation +[held as part of] 1999 Western MultiConference, San Francisco, California, January 17-20, 1999, Cathedral Hill Hotel +1999-2000 +Network modeling -- Civil applications -- Education and training -- Military applications -- Parallel and distributed simulation -- DEVS-based approaches -- Modeling and simulation environments -- High-level architecture -- Visualization and animation -- Real-time applications +Proceedings of the International Conference on Web-based Modeling and Simulation +2000 +Both conferences held as parts of the 2000 Western MultiConference, San Diego, California, January 23-27, 2000, Catamaran Resort Hotel +"Sponsored by the Society for Computer Simulation International"--T.p + +Proceedings of the 1999 International Conference on Web-Based Modeling and Simulation +[held as part of] 1999 Western MultiConference, San Francisco, California, January 17-20, 1999, Cathedral Hill Hotel +1999 +Network modeling -- Civil applications -- Education and training -- Military applications -- Parallel and distributed simulation -- DEVS-based approaches -- Modeling and simulation environments -- High-level architecture -- Visualization and animation -- Real-time applications +2 +930000 +title proceedings of the international conference on web based modeling and simulation -Fourth IEEE International Workshop on Distributed Simulation and Real-Time Applications (DS-RT 2000) -proceedings : August 24-26, 2000, San Francisco, California -2000 -"IEEE Computer Society order number PR00838"--T.p. verso -Fourth IEEE International Workshop on Distributed Simulation and Real-Time Applications (DS-RT 2000) -proceedings : August 24-26, 2000, San Francisco, California -2000 -Workshop is being held jointly with MASCOTS 2000 -"IEEE Computer Society order number PR00838"--T.p. verso -283333 -title fourth ieee international workshop on distributed simulation and real time applications ds rt +Computer art and animation +a user's guide to Atari logo +1984 +Thornburg, David D +Explains how to use a computer to create graphic designs and animated sequences +Computer art and animation +a user's guide to Atari logo +1984 +Thornburg, David D +Includes index +Explains how to use a computer to create graphic designs and animated sequences +923076 +title computer art and animation author thornburg david d -Modeling, simulation, and visualization for real and virtual environments -7-8 April 1999, Orlando, Florida -1999 -Modeling, simulation, and visualization for real and virtual environments -7-8 April 1999, Orlando, Florida -1999 -250000 -title modeling simulation and visualization for real and virtual environments +Random alley adventure for the Atari computer +1984 +Orkin, Michael +Programs written in BASIC for an Atari computer provide experience in games of chance which demonstrate the law of averages +Random alley adventure for the Atari computer +1984 +Orkin, Michael +"A Reston Computer Group book." +Programs written in BASIC for an Atari computer provide experience in games of chance which demonstrate the law of averages +910714 +title random alley adventure for the atari computer author orkin michael -The raptor virus -a novel -2001 -Simon, Frank -The raptor virus -a novel -2001 -Simon, Frank -250000 -title the raptor virus author simon frank +I speak BASIC to my Atari +teacher's manual +1983 +Jones, Aubrey B +An introduction to the operation and applications of computers, with practice exercises +I speak BASIC to my Atari +1983 +Jones, Aubrey B +An introduction to the operation and applications of computers, with practice exercises + +I speak BASIC to my Atari +teacher's manual +1983 +Jones, Aubrey B +An introduction to the operation and applications of computers, with practice exercises +2 +900000 +title i speak basic to my atari author jones aubrey b -Workshop on Information Technology for Virtual Enterprises -ITVE 2001 : proceedings : January 29-30, 2001, Gold Coast, Queensland, Australia -2001 -Workshop on Information Technology for Virtual Enterprises -ITVE 2001 : proceedings : January 29-30, 2001, Gold Coast, Queensland, Australia -2001 -250000 -title workshop on information technology for virtual enterprises +School days for the Atari computer +1984 +Passantino, Claire Bailey +Presents twenty programs that include games, contests, riddles, songs, and other activities to use with BASIC on the Atari computer +School days for the Atari computer +1984 +Passantino, Claire Bailey +Presents twenty programs that include games, contests, riddles, songs, and other activities to use with BASIC on the Atari computer +865000 +title school days for the atari computer author passantino claire bailey -Upgrading & troubleshooting your Mac -2000 -Steinberg, Gene -CD-ROM includes: Adobe Acrobat Reader (freeware), Stuffit Expander (freeware), DropStuff (shareware), DragStrip (shareware), MacTicker (shareware), Conflict Catcher 8 (demoware), Spell Catcher 8 (demoware), et al -Upgrading & troubleshooting your Mac -2000 -Steinberg, Gene -Covers the iBook, iMac, G3/G4, & Powerbook computers -CD-ROM includes: Adobe Acrobat Reader (freeware), Stuffit Expander (freeware), DropStuff (shareware), DragStrip (shareware), MacTicker (shareware), Conflict Catcher 8 (demoware), Spell Catcher 8 (demoware), et al -Includes index -225000 -title upgrading troubleshooting your mac author steinberg gene +The Apple LOGO manual +1985 +Instructions for doing computer graphics on an Apple computer in LOGO +The Apple LOGO manual +1985 +Includes index +Instructions for doing computer graphics on an Apple computer in LOGO +804545 +title the apple logo manual -The UCITA revolution -the new e-commerce model for software and database licensing -2000 -Prepared for distribution at a program of the same name held April-May 2000 -The UCITA revolution -the new e-commerce model for software and database licensing -2000 -Prepared for distribution at a program of the same name held April-May 2000 -"G0-00D9"--Spine -210000 -title the ucita revolution +Kid-powered Logo +1984 +Fiday, David +Explains how to use the computer language LOGO to write fundamental programs and create graphics on the Apple computer +Kid-powered Logo +1984 +Fiday, David +Includes index +Explains how to use the computer language LOGO to write fundamental programs and create graphics on the Apple computer +781578 +title kid powered logo author fiday david -Debugging Java -troubleshooting for programmers -2000 -Mitchell, Will David -Includes index -Debugging Java -troubleshooting for programmers -2000 -Mitchell, Will David -Includes index -150000 -title debugging java author mitchell will david +Basic fun with graphics, the Atari computer way +1983 +Zuanich, Margaret Ann +Instructions for graphics programming on an Atari computer using BASIC +Basic fun with graphics, the Atari computer way +1983 +Zuanich, Margaret Ann +Instructions for graphics programming on an Atari computer using BASIC +780000 +title basic fun with graphics the atari computer way author zuanich margaret ann -Debugging Visual Basic -troubleshooting for programmers -2000 -Jung, David G -Includes index -Debugging Visual Basic -troubleshooting for programmers -2000 -Jung, David G -Includes index -150000 -title debugging visual basic author jung david g +Turtlesteps, an introduction to Apple Logo and Terrapin Logo +1984 +Sharp, Pamela +Introduces computer graphics and beginning programming in Apple Logo and Terrapin Logo +Turtlesteps, an introduction to Apple Logo and Terrapin Logo +1984 +Sharp, Pamela +Includes index +Introduces computer graphics and beginning programming in Apple Logo and Terrapin Logo +775000 +title turtlesteps an introduction to apple logo and terrapin logo author sharp pamela -Internet searching and indexing -the subject approach -2000 -Published also as v. 2, no. 3/4 2000 of the Journal of Internet cataloging -Internet searching and indexing -the subject approach -2000 -Published also as v. 2, no. 3/4 2000 of the Journal of Internet cataloging -120000 -title internet searching and indexing +Graphics and animation on the Atari +800, 400, 1200XL, 800XL, and 600XL +1986 +Lampton, Christopher +Instructions for creating simple and advanced graphics using BASIC on the Atari computer. Includes suggestions for projects +Graphics and animation on the Atari +800, 400, 1200XL, 800XL, and 600XL +1986 +Lampton, Christopher +Includes index +Instructions for creating simple and advanced graphics using BASIC on the Atari computer. Includes suggestions for projects +767647 +title graphics and animation on the atari author lampton christopher -Troubleshooting with SNMP and analyzing MIBS -2000 -Steinberg, Louis A -Preface -- Acknowledgments -- Foreword -- Sect. 1. Optimizing your environment -- Sect. 2. Introduction to using MIB data -- Sect. 3. Introduction to monitoring MIB objects -- Glossary -- Appendix A. -- Index -Troubleshooting with SNMP and analyzing MIBS -2000 -Steinberg, Louis A -Includes index -Preface -- Acknowledgments -- Foreword -- Sect. 1. Optimizing your environment -- Sect. 2. Introduction to using MIB data -- Sect. 3. Introduction to monitoring MIB objects -- Glossary -- Appendix A. -- Index -117857 -title troubleshooting with snmp and analyzing mibs author steinberg louis a +Apple building blocks +featuring Denby, the robot +1985 +D'Ignazio, Fred +Explains how to write fundamental programs for the Apple computer and use it to play forty-six educational games +Apple building blocks +featuring Denby, the robot +1985 +D'Ignazio, Fred +On t.p. the circled symbol "R" is superscript following "Apple" in the title +Explains how to write fundamental programs for the Apple computer and use it to play forty-six educational games +765789 +title apple building blocks author d ignazio fred -Proceedings, International Test Conference 1999 -1999 -Proceedings of the 30th ITC Conference held Sept. 28-30, 1999 in Atlantic City, N.J., sponsored by IEEE Computer Society -Proceedings, International Test Conference 1999 -1999 -Proceedings of the 30th ITC Conference held Sept. 28-30, 1999 in Atlantic City, N.J., sponsored by IEEE Computer Society -"IEEE Catalog Number 99CH37034"--T.p. verso -116666 -title proceedings international test conference +Apple in wonderland +1984 +D'Ignazio, Fred +System requirements for floppy disk: Apple II with Applesoft, II+, IIe, or IIc; DOS 3.3; 1 disk drive and controller card; color TV or monitor recommended +Apple in wonderland +1984 +D'Ignazio, Fred +System requirements for floppy disk: Apple II with Applesoft, II+, IIe, or IIc; DOS 3.3; 1 disk drive and controller card; color TV or monitor recommended +Issued in plastic case +Provides programs for twenty-two learning games written in BASIC for an Apple II computer. Includes a floppy disk +765789 +title apple in wonderland author d ignazio fred -Burn factor -2001 -Mills, Kyle -Burn factor -2001 -Mills, Kyle -100000 -title burn factor author mills kyle +Atari in Wonderland +1983 +D'Ignazio, Fred +Contains twenty-two short, simple games to use with an Atari computer on such topics as colors, sounds, multiplication, state names, spelling, fractions, and Spanish and French languages +Atari in Wonderland +1983 +D'Ignazio, Fred +Contains twenty-two short, simple games to use with an Atari computer on such topics as colors, sounds, multiplication, state names, spelling, fractions, and Spanish and French languages +685714 +title atari in wonderland author d ignazio fred -Code breaker -2000 -Myers, Katherine -Code breaker -2000 -Myers, Katherine -100000 -title code breaker author myers katherine +BASIC is child's play, Apple edition +1984 +Grauer, Robert T +Offers instructions for computer novices in programming with BASIC on an Apple personal computer +BASIC is child's play, Apple edition +1984 +Grauer, Robert T +Includes index +Offers instructions for computer novices in programming with BASIC on an Apple personal computer +642857 +title basic is child s play apple edition author grauer robert t -Information technology and people with disabilities -the current state of federal accessibility -2000 -Shipping list no.: 2000-0280-P -Information technology and people with disabilities -the current state of federal accessibility -2000 -Cover title -Shipping list no.: 2000-0280-P -"April 2000." -100000 -title information technology and people with disabilities +The Atari playground +1983 +D'Ignazio, Fred +Twenty-three learning games, grouped by subject, for use on an Atari computer. There are separate instructional sections for parents/teachers and for children +The Atari playground +1983 +D'Ignazio, Fred +Twenty-three learning games, grouped by subject, for use on an Atari computer. There are separate instructional sections for parents/teachers and for children +612500 +title the atari playground author d ignazio fred -Kiss and tell -2000 -Adair, Cherry -Kiss and tell -2000 -Adair, Cherry -100000 -title kiss and tell author adair cherry +Computer software +supplying it and finding it +1983 +Tagg, W +Computer software +supplying it and finding it +1983 +Tagg, W +600000 +title computer software author tagg w -Languages, compilers, and tools for embedded systems -ACM SIGPLAN Workshop LCTES '99, Atlanga, Georgia, May 5, 1999 : proceedings -1999 -Languages, compilers, and tools for embedded systems -ACM SIGPLAN Workshop LCTES '99, Atlanga, Georgia, May 5, 1999 : proceedings -1999 -100000 -title languages compilers and tools for embedded systems +Kid-powered graphics +1984 +Fiday, David +Includes index +Kid-powered graphics +1984 +Fiday, David +Includes index +600000 +title kid powered graphics author fiday david -Open Source -the unauthorized white papers -2000 -Rosenberg, Donald -Open Source -the unauthorized white papers -2000 -Rosenberg, Donald -100000 -title open source author rosenberg donald +BASIC on the ATARI computer for kids +1984 +Wyner, Keith +Instructions for the elementary school student in programming BASIC on an Atari computer +BASIC on the ATARI computer for kids +1984 +Wyner, Keith +Includes index +Instructions for the elementary school student in programming BASIC on an Atari computer +558791 +title basic on the atari computer for kids author wyner keith diff --git a/test/test_solr_5.res b/test/test_solr_5.res index b1b21f8..099b86e 100644 --- a/test/test_solr_5.res +++ b/test/test_solr_5.res @@ -2,8 +2,8 @@ OK donut:8983/solr/select SOLR Test -29 +1128 0 -29 +100 Client_Idle \ No newline at end of file diff --git a/test/test_solr_6.res b/test/test_solr_6.res index 1ec476a..801e7cf 100644 --- a/test/test_solr_6.res +++ b/test/test_solr_6.res @@ -4,49 +4,60 @@ donut:8983/solr/select SOLR Test -29 +1128 Client_Idle 0 -Rosenberg, Donald1 -Lencevicius, Raimondas1 -Mills, Kyle1 -Simon, Frank1 -Myers, Katherine1 -Compton, Jason1 -Adair, Cherry1 -Shearer, Beverly1 -Arnold, Ken1 -Steinberg, Gene1 -Smith, George A1 -Crookston, Newell W1 -Ferguson, Derek1 -Thomas, Thomas M1 -Mitchell, Will David1 +D'Ignazio, Fred4 +Lampton, Christopher2 +Grauer, Robert T2 +Carlson, Edward H2 +Groner, Gabriel F2 +Jones, Aubrey B2 +Boren, Sharon2 +Fiday, David2 +Nevile, Liddy2 +Ledin, Jim1 +Tagg, W1 +Zaks, Rodnay1 +Wyner, Keith1 +Zuanich, Margaret Ann1 +Salz, Fredrick R1 -Debugging in computer science7 -Women computer programmers4 -Virtual computer systems4 -Cataloging of computer network resources3 -Embedded computer systems3 -Internet searching2 -Computer software2 -Microcomputers2 -Library surveys2 -Microprocessors2 -Computer simulation2 -Interactive computer systems2 -Real-time data processing2 -Chinese1 -Computer viruses1 +Apple computer40 +BASIC (Computer program language)38 +Atari computer35 +Programming (Computers)30 +Digital computer simulation20 +Computer graphics18 +LOGO (Computer program language)14 +Computer games14 +Debugging in computer science8 +Time-sharing computer systems8 +Virtual computer systems8 +Interactive computer systems8 +Embedded computer systems7 +Computers6 +Engineering6 -200017 -20016 -19995 -19861 +198423 +200018 +19839 +20017 +19996 +19856 +19864 +19704 +19662 +19642 +19732 +19711 +19871 +19601 +19591 diff --git a/test/test_solr_urls b/test/test_solr_urls index ba81a05..2d9a424 100644 --- a/test/test_solr_urls +++ b/test/test_solr_urls @@ -5,7 +5,7 @@ http://localhost:9763/search.pz2?session=1&command=search&query=su%3D%22computer http://localhost:9763/search.pz2?session=1&command=bytarget http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate http://localhost:9763/search.pz2?command=init&clear=1 -http://localhost:9763/search.pz2?session=2&command=settings&pz:sru%5Bdonut%3A8983%2Fsolr%2Fselect%5D=solr&pz%3Aname%5Bdonut%3A8983%2Fsolr%2Fselect%5D=SOLR+Test&pz%3Acclmap%3Ati%5Bdonut%3A8983%2Fsolr%2Fselect%5D=1%3Dtitle&pz%3Acclmap%3Asu%5Bdonut%3A8983%2Fsolr%2Fselect%5D=1%3Dsubject&pz%3Acclmap%3Aau%5Bdonut%3A8983%2Fsolr%2Fselect%5D=1%3Dauthor&pz%3Acclmap%3Aisbn%5Bdonut%3A8983%2Fsolr%2Fselect%5D=1%3Disbn&pz%3Acclmap%3Aterm%5Bdonut%3A8983%2Fsolr%2Fselect%5D=1%3Dtitle&pz%3Axslt%5Bdonut%3A8983%2Fsolr%2Fselect%5D=solr-pz2.xsl&pz%3Aqueryencoding%5Bdonut%3A8983%2Fsolr%2Fselect%5D=UTF-8&pz%3Aapdulog%5Bdonut%3A8983%2Fsolr%2Fselect%5D=1&pz:termlist_term_count%5Bdonut%3A8983%2Fsolr%2Fselect%5D=5 +http://localhost:9763/search.pz2?session=2&command=settings&pz:sru%5Bdonut%3A8983%2Fsolr%2Fselect%5D=solr&pz%3Aname%5Bdonut%3A8983%2Fsolr%2Fselect%5D=SOLR+Test&pz%3Acclmap%3Ati%5Bdonut%3A8983%2Fsolr%2Fselect%5D=1%3Dtitle&pz%3Acclmap%3Asu%5Bdonut%3A8983%2Fsolr%2Fselect%5D=1%3Dsubject&pz%3Acclmap%3Aau%5Bdonut%3A8983%2Fsolr%2Fselect%5D=1%3Dauthor&pz%3Acclmap%3Aisbn%5Bdonut%3A8983%2Fsolr%2Fselect%5D=1%3Disbn&pz%3Acclmap%3Aterm%5Bdonut%3A8983%2Fsolr%2Fselect%5D=1%3Dtitle&pz%3Axslt%5Bdonut%3A8983%2Fsolr%2Fselect%5D=solr-pz2.xsl&pz%3Aqueryencoding%5Bdonut%3A8983%2Fsolr%2Fselect%5D=UTF-8&pz%3Aapdulog%5Bdonut%3A8983%2Fsolr%2Fselect%5D=1&pz:termlist_term_count%5Bdonut%3A8983%2Fsolr%2Fselect%5D=5&pz:preferred%5Bdonut%3A8983%2Fsolr%2Fselect%5D=1 http://localhost:9763/search.pz2?session=2&command=search&query=su%3D%22computer%22 http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate -http://localhost:9763/search.pz2?session=2&command=show&block=1 +http://localhost:9763/search.pz2?session=2&command=show&block=preferred