X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fzoom-c.c;h=0ff631debf6eba7db048d25d18c2655ccda1af61;hp=c01ccb83fd3c4f69749ba1c0af7d0a76e37ec620;hb=64f21c5f41690ce42f89bedae8c5ba72bdd12365;hpb=7e318eefe6a4dd4906261feb766cae881352ba07 diff --git a/src/zoom-c.c b/src/zoom-c.c index c01ccb8..0ff631d 100644 --- a/src/zoom-c.c +++ b/src/zoom-c.c @@ -2,7 +2,7 @@ * Copyright (C) 1995-2005, Index Data ApS * See the file LICENSE for details. * - * $Id: zoom-c.c,v 1.72 2006-05-10 07:34:38 adam Exp $ + * $Id: zoom-c.c,v 1.81 2006-07-06 10:17:54 adam Exp $ */ /** * \file zoom-c.c @@ -25,6 +25,7 @@ #include #include #include +#include #if HAVE_SYS_TYPES_H #include @@ -71,6 +72,7 @@ static ZOOM_Event ZOOM_Event_create (int kind) event->kind = kind; event->next = 0; event->prev = 0; + yaz_log(log_details, "ZOOM_event_create(%d)", kind); return event; } @@ -150,7 +152,7 @@ static void set_dset_error (ZOOM_connection c, int error, addinfo2 ? addinfo2 : ""); } -#if HAVE_XML2 +#if YAZ_HAVE_XML2 static void set_HTTP_error (ZOOM_connection c, int error, const char *addinfo, const char *addinfo2) { @@ -563,12 +565,16 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn) { char *rpn; int ret; + ZOOM_connection freeme = 0; yaz_log(log_details, "%p ZOOM_query_cql2rpn str=%s conn=%p", s, str, conn); if (conn == 0) - conn = ZOOM_connection_create(0); + conn = freeme = ZOOM_connection_create(0); - if ((rpn = cql2pqf(conn, str)) == 0) + rpn = cql2pqf(conn, str); + if (freeme != 0) + ZOOM_connection_destroy(freeme); + if (rpn == 0) return -1; ret = ZOOM_query_prefix(s, rpn); @@ -576,6 +582,41 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn) return ret; } +/* + * Analogous in every way to ZOOM_query_cql2rpn(), except that there + * is no analogous ZOOM_query_ccl() that just sends uninterpreted CCL + * to the server, as the YAZ GFS doesn't know how to handle this. + */ +ZOOM_API(int) + ZOOM_query_ccl2rpn(ZOOM_query s, const char *str, const char *config, + int *ccl_error, const char **error_string, + int *error_pos) +{ + int ret; + struct ccl_rpn_node *rpn; + CCL_bibset bibset = ccl_qual_mk(); + + if (config) + ccl_qual_buf(bibset, config); + + rpn = ccl_find_str(bibset, str, ccl_error, error_pos); + if (!rpn) + { + *error_string = ccl_err_msg(*ccl_error); + ret = -1; + } + else + { + WRBUF wr = wrbuf_alloc(); + ccl_pquery(wr, rpn); + ccl_rpn_delete(rpn); + ret = ZOOM_query_prefix(s, wrbuf_buf(wr)); + wrbuf_free(wr, 1); + } + ccl_qual_rm(&bibset); + return ret; +} + ZOOM_API(int) ZOOM_query_sortby(ZOOM_query s, const char *criteria) { @@ -967,7 +1008,7 @@ static zoom_ret do_connect (ZOOM_connection c) if (c->cs && c->cs->protocol == PROTO_HTTP) { -#if HAVE_XML2 +#if YAZ_HAVE_XML2 const char *path = 0; c->proto = PROTO_HTTP; @@ -1155,7 +1196,7 @@ static zoom_ret ZOOM_connection_send_init (ZOOM_connection c) ZOOM_options_get(c->options, "implementationName"), odr_prepend(c->odr_out, "ZOOM-C", ireq->implementationName)); - version = odr_strdup(c->odr_out, "$Revision: 1.72 $"); + version = odr_strdup(c->odr_out, "$Revision: 1.81 $"); if (strlen(version) > 10) /* check for unexpanded CVS strings */ version[strlen(version)-2] = '\0'; ireq->implementationVersion = odr_prepend(c->odr_out, @@ -1233,44 +1274,13 @@ static zoom_ret ZOOM_connection_send_init (ZOOM_connection c) return send_APDU (c, apdu); } -#if HAVE_XML2 +#if YAZ_HAVE_XML2 static zoom_ret send_srw (ZOOM_connection c, Z_SRW_PDU *sr) { - Z_SOAP_Handler h[2] = { - {"http://www.loc.gov/zing/srw/", 0, (Z_SOAP_fun) yaz_srw_codec}, - {0, 0, 0} - }; - ODR o = odr_createmem(ODR_ENCODE); - int ret; - Z_SOAP *p = (Z_SOAP*) odr_malloc(o, sizeof(*p)); Z_GDU *gdu; ZOOM_Event event; - gdu = z_get_HTTP_Request(c->odr_out); - gdu->u.HTTP_Request->path = c->path; - - if (c->host_port) - { - const char *cp0 = strstr(c->host_port, "://"); - const char *cp1 = 0; - if (cp0) - cp0 = cp0+3; - else - cp0 = c->host_port; - - cp1 = strchr(cp0, '/'); - if (!cp1) - cp1 = cp0+strlen(cp0); - - if (cp0 && cp1) - { - char *h = (char*) odr_malloc(c->odr_out, cp1 - cp0 + 1); - memcpy (h, cp0, cp1 - cp0); - h[cp1-cp0] = '\0'; - z_HTTP_header_add(c->odr_out, &gdu->u.HTTP_Request->headers, - "Host", h); - } - } + gdu = z_get_HTTP_Request_host_path(c->odr_out, c->host_port, c->path); if (c->sru_mode == zoom_sru_get) { @@ -1282,29 +1292,11 @@ static zoom_ret send_srw (ZOOM_connection c, Z_SRW_PDU *sr) } else if (c->sru_mode == zoom_sru_soap) { - z_HTTP_header_add_content_type(c->odr_out, - &gdu->u.HTTP_Request->headers, - "text/xml", c->charset); - - z_HTTP_header_add(c->odr_out, &gdu->u.HTTP_Request->headers, - "SOAPAction", "\"\""); - p->which = Z_SOAP_generic; - p->u.generic = (Z_SOAP_Generic *) odr_malloc(o, sizeof(*p->u.generic)); - p->u.generic->no = 0; - p->u.generic->ns = 0; - p->u.generic->p = sr; - p->ns = "http://schemas.xmlsoap.org/soap/envelope/"; - - ret = z_soap_codec_enc(o, &p, - &gdu->u.HTTP_Request->content_buf, - &gdu->u.HTTP_Request->content_len, h, - c->charset); - + yaz_sru_post_encode(gdu->u.HTTP_Request, sr, c->odr_out, c->charset); } if (!z_GDU(c->odr_out, &gdu, 0, 0)) return zoom_complete; c->buf_out = odr_getbuf(c->odr_out, &c->len_out, 0); - odr_destroy(o); event = ZOOM_Event_create (ZOOM_EVENT_SEND_APDU); ZOOM_connection_put_event (c, event); @@ -1313,7 +1305,7 @@ static zoom_ret send_srw (ZOOM_connection c, Z_SRW_PDU *sr) } #endif -#if HAVE_XML2 +#if YAZ_HAVE_XML2 static zoom_ret ZOOM_connection_srw_send_search(ZOOM_connection c) { int i; @@ -1348,8 +1340,16 @@ static zoom_ret ZOOM_connection_srw_send_search(ZOOM_connection c) record_cache_lookup (resultset, i + resultset->start); if (!rec) break; + else + { + ZOOM_Event event = ZOOM_Event_create(ZOOM_EVENT_RECV_RECORD); + ZOOM_connection_put_event(c, event); + } } - if (i == resultset->count) + resultset->start += i; + resultset->count -= i; + + if (resultset->count == 0) return zoom_complete; } assert(resultset->query); @@ -2115,6 +2115,8 @@ static void handle_records (ZOOM_connection c, Z_Records *sr, record_cache_add (resultset, p->records[i], i+ resultset->start); } + resultset->count -= i; + resultset->start += i; /* transfer our response to search_nmem .. we need it later */ nmem_transfer (resultset->odr->mem, nmem); nmem_destroy (nmem); @@ -2335,6 +2337,7 @@ static zoom_ret send_present(ZOOM_connection c) yaz_log(log_details, "%p send_present no tasks", c); return zoom_complete; } + switch (c->tasks->which) { case ZOOM_TASK_SEARCH: @@ -2373,8 +2376,16 @@ static zoom_ret send_present(ZOOM_connection c) record_cache_lookup (resultset, i + resultset->start); if (!rec) break; + else + { + ZOOM_Event event = ZOOM_Event_create(ZOOM_EVENT_RECV_RECORD); + ZOOM_connection_put_event(c, event); + } } - if (i == resultset->count) + resultset->start += i; + resultset->count -= i; + + if (resultset->count == 0) { yaz_log(log_details, "%p send_present skip=%d no more to fetch", c, i); return zoom_complete; @@ -2383,9 +2394,6 @@ static zoom_ret send_present(ZOOM_connection c) apdu = zget_APDU(c->odr_out, Z_APDU_presentRequest); req = apdu->u.presentRequest; - resultset->start += i; - resultset->count -= i; - if (i) yaz_log(log_details, "%p send_present skip=%d", c, i); @@ -2489,12 +2497,11 @@ ZOOM_connection_scan1 (ZOOM_connection c, ZOOM_query q) /* * We need to check the query-type, so we can recognise CQL and - * compile it into a form that we can use here. The ZOOM_query - * structure has no explicit `type' member, but inspection of the - * ZOOM_query_prefix() and ZOOM_query_cql() functions shows how - * the structure is set up in each case. + * CCL and compile them into a form that we can use here. The + * ZOOM_query structure has no explicit `type' member, but + * inspection of the ZOOM_query_prefix() and ZOOM_query_cql() + * functions shows how the structure is set up in each case. */ - if (q->z_query->which == Z_Query_type_1) { yaz_log(log_api, "%p ZOOM_connection_scan1 q=%p PQF '%s'", c, q, q->query_string); @@ -2556,8 +2563,10 @@ static zoom_ret send_package (ZOOM_connection c) event = ZOOM_Event_create (ZOOM_EVENT_SEND_APDU); ZOOM_connection_put_event (c, event); - return do_write_ex (c, c->tasks->u.package->buf_out, - c->tasks->u.package->len_out); + c->buf_out = c->tasks->u.package->buf_out; + c->len_out = c->tasks->u.package->len_out; + + return do_write(c); } static zoom_ret send_scan (ZOOM_connection c) @@ -3397,7 +3406,7 @@ static void recv_apdu (ZOOM_connection c, Z_APDU *apdu) } } -#if HAVE_XML2 +#if YAZ_HAVE_XML2 static void handle_srw_response(ZOOM_connection c, Z_SRW_searchRetrieveResponse *res) { @@ -3476,7 +3485,7 @@ static void handle_srw_response(ZOOM_connection c, } #endif -#if HAVE_XML2 +#if YAZ_HAVE_XML2 static void handle_http(ZOOM_connection c, Z_HTTP_Response *hres) { int ret = -1; @@ -3596,7 +3605,7 @@ static int do_read (ZOOM_connection c) recv_apdu (c, gdu->u.z3950); else if (gdu->which == Z_GDU_HTTP_Response) { -#if HAVE_XML2 +#if YAZ_HAVE_XML2 handle_http (c, gdu->u.HTTP_Response); #else set_ZOOM_error(c, ZOOM_ERROR_DECODE, 0); @@ -3764,6 +3773,10 @@ ZOOM_diag_str (int error) return "CQL parsing error"; case ZOOM_ERROR_CQL_TRANSFORM: return "CQL transformation error"; + case ZOOM_ERROR_CCL_CONFIG: + return "CCL configuration error"; + case ZOOM_ERROR_CCL_PARSE: + return "CCL parsing error"; default: return diagbib1_str (error); } @@ -3888,6 +3901,7 @@ ZOOM_event (int no, ZOOM_connection *cs) int i, r, nfds; int max_fd = 0; + yaz_log(log_details, "ZOOM_event no=%d", no); for (i = 0; i