X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fclient.c;h=1d35d95c0c52d588257f624fe783b5cdc8b0a531;hb=f747f871c170d911519cb85165309fcfcc516970;hp=98a2916f3d3fbbbd78e45652dadb54cb1838f338;hpb=29891cb3f3ed0507d9c0c86414b61adc23ca623f;p=pazpar2-moved-to-github.git diff --git a/src/client.c b/src/client.c index 98a2916..1d35d95 100644 --- a/src/client.c +++ b/src/client.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2008 Index Data + Copyright (C) 2006-2009 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -34,14 +34,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #if HAVE_UNISTD_H #include #endif -#if HAVE_SYS_SOCKET_H -#include -#endif -#if HAVE_NETDB_H -#include -#endif #include -#include #include #include @@ -58,16 +51,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include #include +#include #define USE_TIMING 0 #if USE_TIMING #include #endif -#if HAVE_NETINET_IN_H -#include -#endif - #include "pazpar2.h" #include "client.h" @@ -80,10 +70,9 @@ struct client { struct connection *connection; struct session *session; char *pquery; // Current search + char *cqlquery; // used for SRU targets only int hits; - int records; - int setno; - int requestid; // ID of current outstanding request + int record_offset; int diagnostic; enum client_state state; struct show_raw *show_raw; @@ -104,16 +93,11 @@ struct show_raw { static const char *client_states[] = { "Client_Connecting", - "Client_Connected", "Client_Idle", - "Client_Initializing", - "Client_Searching", - "Client_Presenting", + "Client_Working", "Client_Error", "Client_Failed", - "Client_Disconnected", - "Client_Stopped", - "Client_Continue" + "Client_Disconnected" }; static struct client *client_freelist = 0; @@ -144,7 +128,6 @@ static void client_show_raw_error(struct client *cl, const char *addinfo); // Close connection and set state to error void client_fatal(struct client *cl) { - //client_show_raw_error(cl, "client connection failure"); yaz_log(YLOG_WARN, "Fatal error from %s", client_get_url(cl)); connection_destroy(cl->connection); client_set_state(cl, Client_Error); @@ -170,12 +153,6 @@ const char *client_get_pquery(struct client *cl) return cl->pquery; } -void client_set_requestid(struct client *cl, int id) -{ - cl->requestid = id; -} - - static void client_send_raw_present(struct client *cl); int client_show_raw_begin(struct client *cl, int position, @@ -294,7 +271,7 @@ static void client_send_raw_present(struct client *cl) connection_continue(co); } -static int nativesyntax_to_type(struct session_database *sdb, char *type) +static int nativesyntax_to_type(struct session_database *sdb, char *type, ZOOM_record rec) { const char *s = session_setting_oneval(sdb, PZ_NATIVESYNTAX); @@ -311,10 +288,27 @@ static int nativesyntax_to_type(struct session_database *sdb, char *type) } else return -1; - yaz_log(YLOG_LOG, "Returned type %s", type); return 0; } - return -1; + else /* attempt to deduce structure */ + { + const char *syntax = ZOOM_record_get(rec, "syntax", NULL); + if (syntax) + { + if (!strcmp(syntax, "XML")) + { + strcpy(type, "xml"); + return 0; + } + else if (!strcmp(syntax, "USmarc") || !strcmp(syntax, "MARC21")) + { + strcpy(type, "xml; charset=marc8-s"); + return 0; + } + else return -1; + } + else return -1; + } } static void ingest_raw_record(struct client *cl, ZOOM_record rec) @@ -328,7 +322,7 @@ static void ingest_raw_record(struct client *cl, ZOOM_record rec) else { struct session_database *sdb = client_get_database(cl); - nativesyntax_to_type(sdb, type); + nativesyntax_to_type(sdb, type, rec); } buf = ZOOM_record_get(rec, type, &len); @@ -347,12 +341,13 @@ void client_search_response(struct client *cl) if (ZOOM_connection_error(link, &error, &addinfo)) { cl->hits = 0; - cl->state = Client_Error; + client_set_state(cl, Client_Error); yaz_log(YLOG_WARN, "Search error %s (%s): %s", error, addinfo, client_get_url(cl)); } else { + cl->record_offset = 0; cl->hits = ZOOM_resultset_size(resultset); se->total_hits += cl->hits; } @@ -366,10 +361,9 @@ void client_record_response(struct client *cl) ZOOM_resultset resultset = connection_get_resultset(co); const char *error, *addinfo; - yaz_log(YLOG_LOG, "client_record_response"); if (ZOOM_connection_error(link, &error, &addinfo)) { - cl->state = Client_Error; + client_set_state(cl, Client_Error); yaz_log(YLOG_WARN, "Search error %s (%s): %s", error, addinfo, client_get_url(cl)); } @@ -378,8 +372,6 @@ void client_record_response(struct client *cl) ZOOM_record rec = 0; const char *msg, *addinfo; - yaz_log(YLOG_LOG, "show_raw=%p show_raw->active=%d", - cl->show_raw, cl->show_raw ? cl->show_raw->active : 0); if (cl->show_raw && cl->show_raw->active) { if ((rec = ZOOM_resultset_record(resultset, @@ -388,27 +380,32 @@ void client_record_response(struct client *cl) cl->show_raw->active = 0; ingest_raw_record(cl, rec); } + else + { + yaz_log(YLOG_WARN, "Expected record, but got NULL, offset=%d", + cl->show_raw->position-1); + } } else { - int offset = cl->records; + int offset = cl->record_offset; if ((rec = ZOOM_resultset_record(resultset, offset))) { - yaz_log(YLOG_LOG, "Record with offset %d", offset); - - cl->records++; + cl->record_offset++; if (ZOOM_record_error(rec, &msg, &addinfo, 0)) yaz_log(YLOG_WARN, "Record error %s (%s): %s (rec #%d)", - error, addinfo, client_get_url(cl), cl->records); + error, addinfo, client_get_url(cl), + cl->record_offset); else { struct session_database *sdb = client_get_database(cl); const char *xmlrec; char type[80]; - nativesyntax_to_type(sdb, type); + if (nativesyntax_to_type(sdb, type, rec)) + yaz_log(YLOG_WARN, "Failed to determine record type"); if ((xmlrec = ZOOM_record_get(rec, type, NULL))) { - if (ingest_record(cl, xmlrec, cl->records)) + if (ingest_record(cl, xmlrec, cl->record_offset)) { session_alert_watch(cl->session, SESSION_WATCH_SHOW); session_alert_watch(cl->session, SESSION_WATCH_RECORD); @@ -421,9 +418,12 @@ void client_record_response(struct client *cl) } } + else + { + yaz_log(YLOG_WARN, "Expected record, but got NULL, offset=%d", + offset); + } } - if (!rec) - yaz_log(YLOG_WARN, "Expected record, but got NULL"); } } @@ -439,12 +439,14 @@ void client_start_search(struct client *cl) 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); assert(link); cl->hits = -1; - cl->records = 0; + cl->record_offset = 0; cl->diagnostic = 0; + client_set_state(cl, Client_Working); if (*opt_piggyback) ZOOM_connection_option_set(link, "piggyback", opt_piggyback); @@ -452,7 +454,9 @@ void client_start_search(struct client *cl) ZOOM_connection_option_set(link, "piggyback", "1"); if (*opt_queryenc) ZOOM_connection_option_set(link, "rpnCharset", opt_queryenc); - if (*opt_elements) + if (*opt_sru && *opt_elements) + ZOOM_connection_option_set(link, "schema", opt_elements); + else if (*opt_elements) ZOOM_connection_option_set(link, "elementSetName", opt_elements); if (*opt_requestsyn) ZOOM_connection_option_set(link, "preferredRecordSyntax", opt_requestsyn); @@ -464,13 +468,24 @@ void client_start_search(struct client *cl) sprintf(n, "%d", global_parameters.toget); ZOOM_connection_option_set(link, "count", n); } - if (!databaseName || !*databaseName) - databaseName = "Default"; - ZOOM_connection_option_set(link, "databaseName", databaseName); + if (databaseName) + ZOOM_connection_option_set(link, "databaseName", databaseName); ZOOM_connection_option_set(link, "presentChunk", "20"); - rs = ZOOM_connection_search_pqf(link, cl->pquery); + if (cl->cqlquery) + { + ZOOM_query q = ZOOM_query_create(); + yaz_log(YLOG_LOG, "Search %s CQL: %s", sdb->database->url, cl->cqlquery); + ZOOM_query_cql(q, cl->cqlquery); + rs = ZOOM_connection_search(link, q); + ZOOM_query_destroy(q); + } + else + { + yaz_log(YLOG_LOG, "Search %s PQF: %s", sdb->database->url, cl->pquery); + rs = ZOOM_connection_search_pqf(link, cl->pquery); + } connection_set_resultset(co, rs); connection_continue(co); } @@ -486,13 +501,12 @@ struct client *client_create(void) else r = xmalloc(sizeof(struct client)); r->pquery = 0; + r->cqlquery = 0; r->database = 0; r->connection = 0; r->session = 0; r->hits = 0; - r->records = 0; - r->setno = 0; - r->requestid = -1; + r->record_offset = 0; r->diagnostic = 0; r->state = Client_Disconnected; r->show_raw = 0; @@ -514,6 +528,7 @@ void client_destroy(struct client *c) cc->next = c->next; } xfree(c->pquery); + xfree(c->cqlquery); if (c->connection) connection_release(c->connection); @@ -567,13 +582,39 @@ static CCL_bibset prepare_cclmap(struct client *cl) return res; } +// returns a xmalloced CQL query corresponding to the pquery in client +static char *make_cqlquery(struct client *cl) +{ + cql_transform_t cqlt = cql_transform_create(); + Z_RPNQuery *zquery; + char *r; + WRBUF wrb = wrbuf_alloc(); + int status; + + zquery = p_query_rpn(global_parameters.odr_out, cl->pquery); + if ((status = cql_transform_rpn2cql_wrbuf(cqlt, wrb, zquery))) + { + yaz_log(YLOG_WARN, "failed to generate CQL query, code=%d", status); + return 0; + } + r = xstrdup(wrbuf_cstr(wrb)); + + wrbuf_destroy(wrb); + odr_reset(global_parameters.odr_out); // releases the zquery + cql_transform_close(cqlt); + return r; +} + // Parse the query given the settings specific to this client int client_parse_query(struct client *cl, const char *query) { struct session *se = client_get_session(cl); + struct session_database *sdb = client_get_database(cl); struct ccl_rpn_node *cn; int cerror, cpos; CCL_bibset ccl_map = prepare_cclmap(cl); + const char *sru = session_setting_oneval(sdb, PZ_SRU); + const char *pqf_prefix = session_setting_oneval(sdb, PZ_PQF_PREFIX); if (!ccl_map) return -1; @@ -582,16 +623,30 @@ int client_parse_query(struct client *cl, const char *query) ccl_qual_rm(&ccl_map); if (!cn) { - cl->state = Client_Error; + client_set_state(cl, Client_Error); yaz_log(YLOG_WARN, "Failed to parse query for %s", client_get_database(cl)->database->url); return -1; } wrbuf_rewind(se->wrbuf); + if (*pqf_prefix) + { + wrbuf_puts(se->wrbuf, pqf_prefix); + wrbuf_puts(se->wrbuf, " "); + } ccl_pquery(se->wrbuf, cn); xfree(cl->pquery); cl->pquery = xstrdup(wrbuf_cstr(se->wrbuf)); + xfree(cl->cqlquery); + if (*sru) + { + if (!(cl->cqlquery = make_cqlquery(cl))) + return -1; + } + else + cl->cqlquery = 0; + if (!se->relevance) { // Initialize relevance structure with query terms @@ -616,8 +671,7 @@ void client_set_session(struct client *cl, struct session *se) int client_is_active(struct client *cl) { - if (cl->connection && (cl->state == Client_Continue || - cl->state == Client_Connecting || + if (cl->connection && (cl->state == Client_Connecting || cl->state == Client_Working)) return 1; return 0; @@ -638,7 +692,7 @@ int client_get_hits(struct client *cl) int client_get_num_records(struct client *cl) { - return cl->records; + return cl->record_offset; } int client_get_diagnostic(struct client *cl) @@ -664,7 +718,9 @@ const char *client_get_url(struct client *cl) /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab */ +