X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fzoom-c.c;h=742b9562b3d3a090d3066646a4b82f8927413520;hp=51cd83e5427e1c0984dbf6deab9c0fdfbdb2b1ba;hb=fcdccb3e9a757d41e1bdf6c18c2b3bdb2314ca3f;hpb=43a9d38d20c1b1bcd1a03b2445a501d27526bd35 diff --git a/src/zoom-c.c b/src/zoom-c.c index 51cd83e..742b956 100644 --- a/src/zoom-c.c +++ b/src/zoom-c.c @@ -40,6 +40,7 @@ static zoom_ret do_write_ex(ZOOM_connection c, char *buf_out, int len_out); static void initlog(void) { static int log_level_initialized = 0; + if (!log_level_initialized) { log_api0 = yaz_log_module_level("zoom"); @@ -264,7 +265,6 @@ ZOOM_API(ZOOM_connection) c->options = ZOOM_options_create_with_parent(options); c->host_port = 0; - c->path = 0; c->proxy = 0; c->charset = c->lang = 0; @@ -350,7 +350,6 @@ ZOOM_API(void) const char *host, int portnum) { const char *val; - ZOOM_task task; initlog(); @@ -509,7 +508,7 @@ ZOOM_API(void) c->async = ZOOM_options_get_bool(c->options, "async", 0); yaz_log(c->log_details, "%p ZOOM_connection_connect async=%d", c, c->async); - task = ZOOM_connection_add_task(c, ZOOM_TASK_CONNECT); + ZOOM_connection_add_task(c, ZOOM_TASK_CONNECT); if (!c->async) { @@ -556,7 +555,7 @@ ZOOM_API(void) cs_close(c->cs); #if ZOOM_RESULT_LISTS - // Remove the connection's usage of resultsets + /* Remove the connection's usage of resultsets */ list = c->resultsets; while (list) { ZOOM_resultsets removed = list; @@ -583,7 +582,6 @@ ZOOM_API(void) ZOOM_connection_remove_tasks(c); ZOOM_connection_remove_events(c); xfree(c->host_port); - xfree(c->path); xfree(c->proxy); xfree(c->charset); xfree(c->lang); @@ -609,6 +607,27 @@ void ZOOM_resultset_addref(ZOOM_resultset r) } } +static int g_resultsets = 0; +static YAZ_MUTEX g_resultset_mutex = 0; + +/* TODO We need to initialize this before running threaded: + * call resultset_use(0) */ + +static int resultset_use(int delta) { + int resultset_count; + if (g_resultset_mutex == 0) + yaz_mutex_create(&g_resultset_mutex); + yaz_mutex_enter(g_resultset_mutex); + g_resultsets += delta; + resultset_count = g_resultsets; + yaz_mutex_leave(g_resultset_mutex); + return resultset_count; +} + +int resultsets_count(void) { + return resultset_use(0); +} + ZOOM_resultset ZOOM_resultset_create(void) { int i; @@ -642,6 +661,7 @@ ZOOM_resultset ZOOM_resultset_create(void) YAZ_SHPTR_INIT(r->record_wrbuf, w); } #endif + resultset_use(1); return r; } @@ -831,6 +851,7 @@ static void resultset_destroy(ZOOM_resultset r) #if SHPTR YAZ_SHPTR_DEC(r->record_wrbuf, wrbuf_destroy); #endif + resultset_use(-1); xfree(r); } else @@ -1003,45 +1024,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) { - 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); + return do_connect_host(c, c->host_port); } -static zoom_ret do_connect_host(ZOOM_connection c, const char *effective_host, - const char *logical_url) +static zoom_ret do_connect_host(ZOOM_connection c, const char *logical_url) { void *add; - yaz_log(c->log_details, "%p do_connect effective_host=%s", c, effective_host); - if (c->cs) cs_close(c->cs); - c->cs = cs_create_host(effective_host, 0, &add); - + c->cs = cs_create_host_proxy(logical_url, 0, &add, c->proxy); + if (c->cs && c->cs->protocol == PROTO_HTTP) { #if YAZ_HAVE_XML2 - 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); - } + c->proto = PROTO_HTTP; #else ZOOM_set_error(c, ZOOM_ERROR_UNSUPPORTED_PROTOCOL, "SRW"); ZOOM_connection_close(c); @@ -1459,39 +1460,14 @@ ZOOM_API(int) } #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_HTTP_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); - char *combined_cookies; + char *combined_cookies = 0; int combined_cookies_len = 0; + Z_GDU *gdu = z_get_HTTP_Request_uri(c->odr_out, uri, 0, c->proxy ? 1 : 0); gdu->u.HTTP_Request->method = odr_strdup(c->odr_out, "GET"); z_HTTP_header_add(c->odr_out, &gdu->u.HTTP_Request->headers, "Accept", @@ -1557,7 +1533,7 @@ static void handle_http(ZOOM_connection c, Z_HTTP_Response *hres) ZOOM_connection_set_mask(c, 0); yaz_log(c->log_details, "%p handle_http", c); - + if ((hres->code == 301 || hres->code == 302) && c->sru_mode == zoom_sru_get && (location = z_HTTP_header_lookup(hres->headers, "Location"))) { @@ -1572,11 +1548,10 @@ static void handle_http(ZOOM_connection c, Z_HTTP_Response *hres) { /* 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); + do_connect_host(c, location); send_HTTP_redirect(c, location, hres); /* we're OK for now. Operation is not really complete */ - ret = 0; - cret = zoom_pending; + return; } } else @@ -1857,6 +1832,12 @@ ZOOM_API(const char *) return "CCL configuration error"; case ZOOM_ERROR_CCL_PARSE: return "CCL parsing error"; + case ZOOM_ERROR_ES_INVALID_ACTION: + return "Extended Service. invalid action"; + case ZOOM_ERROR_ES_INVALID_VERSION: + return "Extended Service. invalid version"; + case ZOOM_ERROR_ES_INVALID_SYNTAX: + return "Extended Service. invalid syntax"; default: return diagbib1_str(error); }