X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fzoom-c.c;h=dd1698cbb3169c8d427d743b33b7a7a82abd5576;hp=684d1b6725cf89b7975f6ee7403b2d27b907eacd;hb=e137416de024bcc37cc35ecae1ce2079f188ac41;hpb=f4aef846d5972b8a2fafda28ceb99eeedaf21208 diff --git a/src/zoom-c.c b/src/zoom-c.c index 684d1b6..dd1698c 100644 --- a/src/zoom-c.c +++ b/src/zoom-c.c @@ -28,6 +28,12 @@ #include #include +#include + +#if SHPTR +YAZ_SHPTR_TYPE(WRBUF) +#endif + static int log_api = 0; static int log_details = 0; @@ -349,8 +355,6 @@ void ZOOM_connection_remove_task(ZOOM_connection c) } } -static int ZOOM_connection_exec_task(ZOOM_connection c); - void ZOOM_connection_remove_tasks(ZOOM_connection c) { while (c->tasks) @@ -416,6 +420,7 @@ ZOOM_API(ZOOM_connection) c->m_queue_back = 0; c->sru_version = 0; + c->no_redirects = 0; return c; } @@ -791,14 +796,30 @@ static zoom_ret do_write(ZOOM_connection c); ZOOM_API(void) ZOOM_connection_destroy(ZOOM_connection c) { +#if ZOOM_RESULT_LISTS + ZOOM_resultsets list; +#else ZOOM_resultset r; +#endif if (!c) return; yaz_log(log_api, "%p ZOOM_connection_destroy", c); if (c->cs) cs_close(c->cs); + +#if ZOOM_RESULT_LISTS + // Remove the connection's usage of resultsets + list = c->resultsets; + while (list) { + ZOOM_resultsets removed = list; + ZOOM_resultset_destroy(list->resultset); + list = list->next; + xfree(removed); + } +#else for (r = c->resultsets; r; r = r->next) r->connection = 0; +#endif xfree(c->buf_in); xfree(c->addinfo); @@ -832,9 +853,11 @@ void ZOOM_resultset_addref(ZOOM_resultset r) { if (r) { + yaz_mutex_enter(r->mutex); (r->refcount)++; yaz_log(log_details, "%p ZOOM_resultset_addref count=%d", r, r->refcount); + yaz_mutex_leave(r->mutex); } } @@ -858,9 +881,16 @@ ZOOM_resultset ZOOM_resultset_create(void) r->r_sort_spec = 0; r->query = 0; r->connection = 0; - r->next = 0; r->databaseNames = 0; r->num_databaseNames = 0; + r->mutex = 0; + yaz_mutex_create(&r->mutex); +#if SHPTR + { + WRBUF w = wrbuf_alloc(); + YAZ_SHPTR_INIT(r->record_wrbuf, w); + } +#endif return r; } @@ -885,6 +915,9 @@ ZOOM_API(ZOOM_resultset) const char *cp; int start, count; const char *syntax, *elementSetName; +#if ZOOM_RESULT_LISTS + ZOOM_resultsets set; +#endif yaz_log(log_api, "%p ZOOM_connection_search set %p query %p", c, r, q); r->r_sort_spec = q->sort_spec; @@ -913,11 +946,17 @@ ZOOM_API(ZOOM_resultset) r->connection = c; +#if ZOOM_RESULT_LISTS + yaz_log(log_details, "%p ZOOM_connection_search: Adding new resultset (%p) to resultsets (%p) ", c, r, c->resultsets); + set = xmalloc(sizeof(*set)); + ZOOM_resultset_addref(r); + set->resultset = r; + set->next = c->resultsets; + c->resultsets = set; +#else r->next = c->resultsets; c->resultsets = r; - - - +#endif if (c->host_port && c->proto == PROTO_HTTP) { if (!c->cs) @@ -1015,12 +1054,15 @@ static void ZOOM_record_release(ZOOM_record rec) { if (!rec) return; + +#if SHPTR + if (rec->record_wrbuf) + YAZ_SHPTR_DEC(rec->record_wrbuf, wrbuf_destroy); +#else if (rec->wrbuf) wrbuf_destroy(rec->wrbuf); -#if YAZ_HAVE_XML2 - if (rec->xml_mem) - xmlFree(rec->xml_mem); #endif + if (rec->odr) odr_destroy(rec->odr); } @@ -1050,13 +1092,18 @@ static void resultset_destroy(ZOOM_resultset r) { if (!r) return; + yaz_mutex_enter(r->mutex); (r->refcount)--; yaz_log(log_details, "%p ZOOM_resultset_destroy r=%p count=%d", r, r, r->refcount); if (r->refcount == 0) { - ZOOM_resultset_cache_reset(r); + yaz_mutex_leave(r->mutex); + yaz_log(log_details, "%p ZOOM_connection resultset_destroy: Deleting resultset (%p) ", r->connection, r); + ZOOM_resultset_cache_reset(r); +#if ZOOM_RESULT_LISTS +#else if (r->connection) { /* remove ourselves from the resultsets in connection */ @@ -1072,13 +1119,20 @@ static void resultset_destroy(ZOOM_resultset r) rp = &(*rp)->next; } } +#endif ZOOM_query_destroy(r->query); ZOOM_options_destroy(r->options); odr_destroy(r->odr); xfree(r->setname); xfree(r->schema); + yaz_mutex_destroy(&r->mutex); +#if SHPTR + YAZ_SHPTR_DEC(r->record_wrbuf, wrbuf_destroy); +#endif xfree(r); } + else + yaz_mutex_leave(r->mutex); } ZOOM_API(size_t) @@ -1207,15 +1261,25 @@ static void get_cert(ZOOM_connection c) } } +static zoom_ret do_connect_host(ZOOM_connection c, + const char *effective_host, + const char *logical_url); + static zoom_ret do_connect(ZOOM_connection c) { - void *add; const char *effective_host; if (c->proxy) effective_host = c->proxy; else effective_host = c->host_port; + return do_connect_host(c, effective_host, c->host_port); +} + +static zoom_ret do_connect_host(ZOOM_connection c, const char *effective_host, + const char *logical_url) +{ + void *add; yaz_log(log_details, "%p do_connect effective_host=%s", c, effective_host); @@ -1226,14 +1290,17 @@ static zoom_ret do_connect(ZOOM_connection c) if (c->cs && c->cs->protocol == PROTO_HTTP) { #if YAZ_HAVE_XML2 - const char *db = 0; - - c->proto = PROTO_HTTP; - cs_get_host_args(c->host_port, &db); - xfree(c->path); - - c->path = xmalloc(strlen(db) * 3 + 2); - yaz_encode_sru_dbpath_buf(c->path, db); + if (logical_url) + { + const char *db = 0; + + c->proto = PROTO_HTTP; + cs_get_host_args(logical_url, &db); + xfree(c->path); + + c->path = xmalloc(strlen(db) * 3 + 2); + yaz_encode_sru_dbpath_buf(c->path, db); + } #else set_ZOOM_error(c, ZOOM_ERROR_UNSUPPORTED_PROTOCOL, "SRW"); do_close(c); @@ -1274,7 +1341,7 @@ static zoom_ret do_connect(ZOOM_connection c) } } c->state = STATE_IDLE; - set_ZOOM_error(c, ZOOM_ERROR_CONNECT, c->host_port); + set_ZOOM_error(c, ZOOM_ERROR_CONNECT, logical_url); return zoom_complete; } @@ -1724,6 +1791,15 @@ static zoom_ret ZOOM_connection_send_search(ZOOM_connection c) result sets on the server. */ for (ord = 1; ; ord++) { +#if ZOOM_RESULT_LISTS + ZOOM_resultsets rsp; + sprintf(setname, "%d", ord); + for (rsp = c->resultsets; rsp; rsp = rsp->next) + if (rsp->resultset->setname && !strcmp(rsp->resultset->setname, setname)) + break; + if (!rsp) + break; +#else ZOOM_resultset rp; sprintf(setname, "%d", ord); for (rp = c->resultsets; rp; rp = rp->next) @@ -1731,6 +1807,8 @@ static zoom_ret ZOOM_connection_send_search(ZOOM_connection c) break; if (!rp) break; +#endif + } r->setname = xstrdup(setname); yaz_log(log_details, "%p ZOOM_connection_send_search: allocating " @@ -1791,11 +1869,12 @@ ZOOM_API(ZOOM_record) buf = odr_getbuf(odr_enc, &size, 0); nrec = (ZOOM_record) xmalloc(sizeof(*nrec)); + yaz_log(log_details, "ZOOM_record create"); nrec->odr = odr_createmem(ODR_DECODE); +#if SHPTR + nrec->record_wrbuf = 0; +#else nrec->wrbuf = 0; -#if YAZ_HAVE_XML2 - nrec->xml_mem = 0; - nrec->xml_size = 0; #endif odr_setbuf(nrec->odr, buf, size, 0); z_NamePlusRecord(nrec->odr, &nrec->npr, 0, 0); @@ -1845,6 +1924,7 @@ ZOOM_API(void) ZOOM_record_destroy(ZOOM_record rec) { ZOOM_record_release(rec); + yaz_log(log_details, "ZOOM_record destroy"); xfree(rec); } @@ -1880,7 +1960,8 @@ static yaz_iconv_t iconv_create_charset(const char *record_charset) return cd; } -static const char *return_marc_record(ZOOM_record rec, int marc_type, +static const char *return_marc_record(WRBUF wrbuf, + int marc_type, int *len, const char *buf, int sz, const char *record_charset) @@ -1892,14 +1973,11 @@ static const char *return_marc_record(ZOOM_record rec, int marc_type, if (cd) yaz_marc_iconv(mt, cd); yaz_marc_xml(mt, marc_type); - if (!rec->wrbuf) - rec->wrbuf = wrbuf_alloc(); - wrbuf_rewind(rec->wrbuf); - if (yaz_marc_decode_wrbuf(mt, buf, sz, rec->wrbuf) > 0) + if (yaz_marc_decode_wrbuf(mt, buf, sz, wrbuf) > 0) { if (len) - *len = wrbuf_len(rec->wrbuf); - ret_string = wrbuf_cstr(rec->wrbuf); + *len = wrbuf_len(wrbuf); + ret_string = wrbuf_cstr(wrbuf); } yaz_marc_destroy(mt); if (cd) @@ -1907,7 +1985,8 @@ static const char *return_marc_record(ZOOM_record rec, int marc_type, return ret_string; } -static const char *return_opac_record(ZOOM_record rec, int marc_type, +static const char *return_opac_record(WRBUF wrbuf, + int marc_type, int *len, Z_OPACRecord *opac_rec, const char *record_charset) @@ -1919,21 +1998,18 @@ static const char *return_opac_record(ZOOM_record rec, int marc_type, yaz_marc_iconv(mt, cd); yaz_marc_xml(mt, marc_type); - if (!rec->wrbuf) - rec->wrbuf = wrbuf_alloc(); - wrbuf_rewind(rec->wrbuf); - - yaz_opac_decode_wrbuf(mt, opac_rec, rec->wrbuf); + yaz_opac_decode_wrbuf(mt, opac_rec, wrbuf); yaz_marc_destroy(mt); if (cd) yaz_iconv_close(cd); if (len) - *len = wrbuf_len(rec->wrbuf); - return wrbuf_cstr(rec->wrbuf); + *len = wrbuf_len(wrbuf); + return wrbuf_cstr(wrbuf); } -static const char *return_string_record(ZOOM_record rec, int *len, +static const char *return_string_record(WRBUF wrbuf, + int *len, const char *buf, int sz, const char *record_charset) { @@ -1941,16 +2017,11 @@ static const char *return_string_record(ZOOM_record rec, int *len, if (cd) { - if (!rec->wrbuf) - rec->wrbuf = wrbuf_alloc(); - - wrbuf_rewind(rec->wrbuf); + wrbuf_iconv_write(wrbuf, cd, buf, sz); + wrbuf_iconv_reset(wrbuf, cd); - wrbuf_iconv_write(rec->wrbuf, cd, buf, sz); - wrbuf_iconv_reset(rec->wrbuf, cd); - - buf = wrbuf_cstr(rec->wrbuf); - sz = wrbuf_len(rec->wrbuf); + buf = wrbuf_cstr(wrbuf); + sz = wrbuf_len(wrbuf); yaz_iconv_close(cd); } if (len) @@ -1958,21 +2029,22 @@ static const char *return_string_record(ZOOM_record rec, int *len, return buf; } -static const char *return_record(ZOOM_record rec, int *len, - Z_NamePlusRecord *npr, - int marctype, const char *charset) +static const char *return_record_wrbuf(WRBUF wrbuf, int *len, + Z_NamePlusRecord *npr, + int marctype, const char *charset) { Z_External *r = (Z_External *) npr->u.databaseRecord; const Odr_oid *oid = r->direct_reference; - + + wrbuf_rewind(wrbuf); /* render bibliographic record .. */ if (r->which == Z_External_OPAC) { - return return_opac_record(rec, marctype, len, + return return_opac_record(wrbuf, marctype, len, r->u.opac, charset); } if (r->which == Z_External_sutrs) - return return_string_record(rec, len, + return return_string_record(wrbuf, len, (char*) r->u.sutrs->buf, r->u.sutrs->len, charset); @@ -1981,7 +2053,7 @@ static const char *return_record(ZOOM_record rec, int *len, if (yaz_oid_is_iso2709(oid)) { const char *ret_buf = return_marc_record( - rec, marctype, len, + wrbuf, marctype, len, (const char *) r->u.octet_aligned->buf, r->u.octet_aligned->len, charset); @@ -1991,26 +2063,22 @@ static const char *return_record(ZOOM_record rec, int *len, if (marctype != YAZ_MARC_ISO2709) return 0; } - return return_string_record(rec, len, + return return_string_record(wrbuf, len, (const char *) r->u.octet_aligned->buf, r->u.octet_aligned->len, charset); } else if (r->which == Z_External_grs1) { - if (!rec->wrbuf) - rec->wrbuf = wrbuf_alloc(); - wrbuf_rewind(rec->wrbuf); - yaz_display_grs1(rec->wrbuf, r->u.grs1, 0); - return return_string_record(rec, len, - wrbuf_buf(rec->wrbuf), - wrbuf_len(rec->wrbuf), + yaz_display_grs1(wrbuf, r->u.grs1, 0); + return return_string_record(wrbuf, len, + wrbuf_buf(wrbuf), + wrbuf_len(wrbuf), charset); } return 0; } - ZOOM_API(int) ZOOM_record_error(ZOOM_record rec, const char **cp, const char **addinfo, const char **diagset) @@ -2071,12 +2139,12 @@ ZOOM_API(int) return 0; } -static const char *get_record_format(ZOOM_record rec, int *len, +static const char *get_record_format(WRBUF wrbuf, int *len, Z_NamePlusRecord *npr, int marctype, const char *charset, const char *format) { - const char *res = return_record(rec, len, npr, marctype, charset); + const char *res = return_record_wrbuf(wrbuf, len, npr, marctype, charset); #if YAZ_HAVE_XML2 if (*format == '1' && len) { @@ -2086,12 +2154,15 @@ static const char *get_record_format(ZOOM_record rec, int *len, doc = xmlParseMemory(res, *len); if (doc) { - if (rec->xml_mem) - xmlFree(rec->xml_mem); - xmlDocDumpFormatMemory(doc, &rec->xml_mem, &rec->xml_size, 1); + xmlChar *xml_mem; + int xml_size; + xmlDocDumpFormatMemory(doc, &xml_mem, &xml_size, 1); + wrbuf_rewind(wrbuf); + wrbuf_write(wrbuf, (const char *) xml_mem, xml_size); + xmlFree(xml_mem); xmlFreeDoc(doc); - res = (char *) rec->xml_mem; - *len = rec->xml_size; + res = wrbuf_cstr(wrbuf); + *len = wrbuf_len(wrbuf); } } #endif @@ -2099,26 +2170,16 @@ static const char *get_record_format(ZOOM_record rec, int *len, } -ZOOM_API(const char *) - ZOOM_record_get(ZOOM_record rec, const char *type_spec, int *len) +static const char *npr_format(Z_NamePlusRecord *npr, const char *schema, + WRBUF wrbuf, + const char *type_spec, int *len) { + size_t i; char type[40]; char charset[40]; char format[3]; - const char *cp; - size_t i; - Z_NamePlusRecord *npr; - - if (len) - *len = 0; /* default return */ - - if (!rec) - return 0; - npr = rec->npr; - if (!npr) - return 0; + const char *cp = type_spec; - cp = type_spec; for (i = 0; cp[i] && cp[i] != ';' && cp[i] != ' ' && i < sizeof(type)-1; i++) type[i] = cp[i]; @@ -2166,8 +2227,8 @@ ZOOM_API(const char *) else if (!strcmp(type, "schema")) { if (len) - *len = rec->schema ? strlen(rec->schema) : 0; - return rec->schema; + *len = schema ? strlen(schema) : 0; + return schema; } else if (!strcmp(type, "syntax")) { @@ -2189,21 +2250,21 @@ ZOOM_API(const char *) /* from now on - we have a database record .. */ if (!strcmp(type, "render")) { - return get_record_format(rec, len, npr, YAZ_MARC_LINE, charset, format); + return get_record_format(wrbuf, len, npr, YAZ_MARC_LINE, charset, format); } else if (!strcmp(type, "xml")) { - return get_record_format(rec, len, npr, YAZ_MARC_MARCXML, charset, + return get_record_format(wrbuf, len, npr, YAZ_MARC_MARCXML, charset, format); } else if (!strcmp(type, "txml")) { - return get_record_format(rec, len, npr, YAZ_MARC_TMARCXML, charset, + return get_record_format(wrbuf, len, npr, YAZ_MARC_TURBOMARC, charset, format); } else if (!strcmp(type, "raw")) { - return get_record_format(rec, len, npr, YAZ_MARC_ISO2709, charset, + return get_record_format(wrbuf, len, npr, YAZ_MARC_ISO2709, charset, format); } else if (!strcmp(type, "ext")) @@ -2214,12 +2275,38 @@ ZOOM_API(const char *) else if (!strcmp(type, "opac")) { if (npr->u.databaseRecord->which == Z_External_OPAC) - return get_record_format(rec, len, npr, YAZ_MARC_MARCXML, charset, - format); + return get_record_format(wrbuf, len, npr, YAZ_MARC_MARCXML, charset, + format); } return 0; } +ZOOM_API(const char *) + ZOOM_record_get(ZOOM_record rec, const char *type_spec, int *len) +{ + WRBUF wrbuf; + + if (len) + *len = 0; /* default return */ + + if (!rec || !rec->npr) + return 0; + +#if SHPTR + if (!rec->record_wrbuf) + { + WRBUF w = wrbuf_alloc(); + YAZ_SHPTR_INIT(rec->record_wrbuf, w); + } + wrbuf = rec->record_wrbuf->ptr; +#else + if (!rec->wrbuf) + rec->wrbuf = wrbuf_alloc(); + wrbuf = rec->wrbuf; +#endif + return npr_format(rec->npr, rec->schema, wrbuf, type_spec, len); +} + static int strcmp_null(const char *v1, const char *v2) { if (!v1 && !v2) @@ -2259,9 +2346,11 @@ static void record_cache_add(ZOOM_resultset r, Z_NamePlusRecord *npr, { rc = (ZOOM_record_cache) odr_malloc(r->odr, sizeof(*rc)); rc->rec.odr = 0; +#if SHPTR + YAZ_SHPTR_INC(r->record_wrbuf); + rc->rec.record_wrbuf = r->record_wrbuf; +#else rc->rec.wrbuf = 0; -#if YAZ_HAVE_XML2 - rc->rec.xml_mem = 0; #endif rc->elementSetName = odr_strdup_null(r->odr, elementSetName); @@ -2891,7 +2980,7 @@ static zoom_ret ZOOM_connection_send_scan(ZOOM_connection c) } *req->numberOfTermsRequested = - ZOOM_options_get_int(scan->options, "number", 10); + ZOOM_options_get_int(scan->options, "number", 20); req->preferredPositionInResponse = odr_intdup(c->odr_out, @@ -3612,7 +3701,8 @@ ZOOM_API(void) ZOOM_options_setl(p->options, key, val, len); } -static int ZOOM_connection_exec_task(ZOOM_connection c) +ZOOM_API(int) + ZOOM_connection_exec_task(ZOOM_connection c) { ZOOM_task task = c->tasks; zoom_ret ret = zoom_complete; @@ -4114,6 +4204,63 @@ static void handle_srw_scan_response(ZOOM_connection c, #endif #if YAZ_HAVE_XML2 +static Z_GDU *get_HTTP_Request_url(ODR odr, const char *url) +{ + Z_GDU *p = z_get_HTTP_Request(odr); + const char *host = url; + const char *cp0 = strstr(host, "://"); + const char *cp1 = 0; + if (cp0) + cp0 = cp0+3; + else + cp0 = host; + + cp1 = strchr(cp0, '/'); + if (!cp1) + cp1 = cp0 + strlen(cp0); + + if (cp0 && cp1) + { + char *h = (char*) odr_malloc(odr, cp1 - cp0 + 1); + memcpy (h, cp0, cp1 - cp0); + h[cp1-cp0] = '\0'; + z_HTTP_header_add(odr, &p->u.HTTP_Request->headers, "Host", h); + } + p->u.HTTP_Request->path = odr_strdup(odr, *cp1 ? cp1 : "/"); + return p; +} + +static zoom_ret send_SRW_redirect(ZOOM_connection c, const char *uri, + Z_HTTP_Response *cookie_hres) +{ + struct Z_HTTP_Header *h; + Z_GDU *gdu = get_HTTP_Request_url(c->odr_out, uri); + + gdu->u.HTTP_Request->method = odr_strdup(c->odr_out, "GET"); + z_HTTP_header_add(c->odr_out, &gdu->u.HTTP_Request->headers, "Accept", + "text/xml"); + + for (h = cookie_hres->headers; h; h = h->next) + { + if (!strcmp(h->name, "Set-Cookie")) + z_HTTP_header_add(c->odr_out, &gdu->u.HTTP_Request->headers, + "Cookie", h->value); + } + if (c->user && c->password) + { + z_HTTP_header_add_basic_auth(c->odr_out, &gdu->u.HTTP_Request->headers, + c->user, c->password); + } + if (!z_GDU(c->odr_out, &gdu, 0, 0)) + return zoom_complete; + if (c->odr_print) + z_GDU(c->odr_print, &gdu, 0, 0); + c->buf_out = odr_getbuf(c->odr_out, &c->len_out, 0); + + odr_reset(c->odr_out); + return do_write(c); +} + static void handle_http(ZOOM_connection c, Z_HTTP_Response *hres) { zoom_ret cret = zoom_complete; @@ -4121,46 +4268,78 @@ static void handle_http(ZOOM_connection c, Z_HTTP_Response *hres) const char *addinfo = 0; const char *connection_head = z_HTTP_header_lookup(hres->headers, "Connection"); + const char *location; + ZOOM_connection_set_mask(c, 0); yaz_log(log_details, "%p handle_http", c); - if (!yaz_srw_check_content_type(hres)) - addinfo = "content-type"; - else + if ((hres->code == 301 || hres->code == 302) && c->sru_mode == zoom_sru_get + && (location = z_HTTP_header_lookup(hres->headers, "Location"))) { - Z_SOAP *soap_package = 0; - ODR o = c->odr_in; - Z_SOAP_Handler soap_handlers[2] = { - {YAZ_XMLNS_SRU_v1_1, 0, (Z_SOAP_fun) yaz_srw_codec}, - {0, 0, 0} - }; - ret = z_soap_codec(o, &soap_package, - &hres->content_buf, &hres->content_len, - soap_handlers); - if (!ret && soap_package->which == Z_SOAP_generic && - soap_package->u.generic->no == 0) + c->no_redirects++; + if (c->no_redirects > 10) { - Z_SRW_PDU *sr = (Z_SRW_PDU*) soap_package->u.generic->p; - - ZOOM_options_set(c->options, "sru_version", sr->srw_version); - ZOOM_options_setl(c->options, "sru_extra_response_data", - sr->extraResponseData_buf, sr->extraResponseData_len); - if (sr->which == Z_SRW_searchRetrieve_response) - cret = handle_srw_response(c, sr->u.response); - else if (sr->which == Z_SRW_scan_response) - handle_srw_scan_response(c, sr->u.scan_response); - else - ret = -1; + set_HTTP_error(c, hres->code, 0, 0); + c->no_redirects = 0; + do_close(c); } - else if (!ret && (soap_package->which == Z_SOAP_fault - || soap_package->which == Z_SOAP_error)) + else { - set_HTTP_error(c, hres->code, - soap_package->u.fault->fault_code, - soap_package->u.fault->fault_string); + /* since redirect may change host we just reconnect. A smarter + implementation might check whether it's the same server */ + do_connect_host(c, location, 0); + send_SRW_redirect(c, location, hres); + /* we're OK for now. Operation is not really complete */ + ret = 0; + cret = zoom_pending; } + } + else + { /* not redirect (normal response) */ + if (!yaz_srw_check_content_type(hres)) + addinfo = "content-type"; else - ret = -1; + { + Z_SOAP *soap_package = 0; + ODR o = c->odr_in; + Z_SOAP_Handler soap_handlers[2] = { + {YAZ_XMLNS_SRU_v1_1, 0, (Z_SOAP_fun) yaz_srw_codec}, + {0, 0, 0} + }; + ret = z_soap_codec(o, &soap_package, + &hres->content_buf, &hres->content_len, + soap_handlers); + if (!ret && soap_package->which == Z_SOAP_generic && + soap_package->u.generic->no == 0) + { + Z_SRW_PDU *sr = (Z_SRW_PDU*) soap_package->u.generic->p; + + ZOOM_options_set(c->options, "sru_version", sr->srw_version); + ZOOM_options_setl(c->options, "sru_extra_response_data", + sr->extraResponseData_buf, sr->extraResponseData_len); + if (sr->which == Z_SRW_searchRetrieve_response) + cret = handle_srw_response(c, sr->u.response); + else if (sr->which == Z_SRW_scan_response) + handle_srw_scan_response(c, sr->u.scan_response); + else + ret = -1; + } + else if (!ret && (soap_package->which == Z_SOAP_fault + || soap_package->which == Z_SOAP_error)) + { + set_HTTP_error(c, hres->code, + soap_package->u.fault->fault_code, + soap_package->u.fault->fault_string); + } + else + ret = -1; + } + if (ret == 0) + { + if (c->no_redirects) /* end of redirect. change hosts again */ + do_close(c); + } + c->no_redirects = 0; } if (ret) { @@ -4171,18 +4350,34 @@ static void handle_http(ZOOM_connection c, Z_HTTP_Response *hres) do_close(c); } if (cret == zoom_complete) - ZOOM_connection_remove_task(c); - if (!strcmp(hres->version, "1.0")) { - /* HTTP 1.0: only if Keep-Alive we stay alive.. */ - if (!connection_head || strcmp(connection_head, "Keep-Alive")) - do_close(c); + yaz_log(YLOG_LOG, "removing tasks in handle_http"); + ZOOM_connection_remove_task(c); } - else { - /* HTTP 1.1: only if no close we stay alive .. */ - if (connection_head && !strcmp(connection_head, "close")) + int must_close = 0; + if (!strcmp(hres->version, "1.0")) + { + /* HTTP 1.0: only if Keep-Alive we stay alive.. */ + if (!connection_head || strcmp(connection_head, "Keep-Alive")) + must_close = 1; + } + else + { + /* HTTP 1.1: only if no close we stay alive.. */ + if (connection_head && !strcmp(connection_head, "close")) + must_close = 1; + } + if (must_close) + { do_close(c); + if (c->tasks) + { + c->tasks->running = 0; + ZOOM_connection_insert_task(c, ZOOM_TASK_CONNECT); + c->reconnect_ok = 0; + } + } } } #endif