X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fhttp_command.c;h=f109e16e71e61b449f416d2dec46ee37b43caa85;hb=33f6cb2ff7f0e57bb8001d40b1a7400e3f8ebc61;hp=3ab415ca5e9ababc67c2f60ae6e9a0cef3149ff9;hpb=9547e5055922e3279bcd349fc6094e583e559f44;p=pazpar2-moved-to-github.git diff --git a/src/http_command.c b/src/http_command.c index 3ab415c..f109e16 100644 --- a/src/http_command.c +++ b/src/http_command.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2013 Index Data + Copyright (C) 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 @@ -114,7 +114,8 @@ int http_session_use(int delta) g_http_sessions += delta; sessions = g_http_sessions; yaz_mutex_leave(g_http_session_mutex); - yaz_log(YLOG_DEBUG, "%s sessions=%d", delta == 0 ? "" : (delta > 0 ? "INC" : "DEC"), sessions); + yaz_log(YLOG_DEBUG, "%s http_sessions=%d", delta == 0 ? "" : + (delta > 0 ? "INC" : "DEC"), sessions); return sessions; } @@ -125,7 +126,7 @@ http_sessions_t http_sessions_create(void) hs->session_list = 0; hs->mutex = 0; pazpar2_mutex_create(&hs->mutex, "http_sessions"); - hs->log_level = yaz_log_module_level("HTTP"); + hs->log_level = yaz_log_module_level("http"); return hs; } @@ -262,9 +263,9 @@ static const char *get_msg(enum pazpar2_error_code code) return "No error"; } -static void error(struct http_response *rs, - enum pazpar2_error_code code, - const char *addinfo) +static void error2(struct http_response *rs, + enum pazpar2_error_code code, + const char *addinfo, const char *addinfo2) { struct http_channel *c = rs->channel; WRBUF text = wrbuf_alloc(); @@ -274,10 +275,17 @@ static void error(struct http_response *rs, rs->msg = nmem_strdup(c->nmem, msg); strcpy(rs->code, http_status); - wrbuf_printf(text, HTTP_COMMAND_RESPONSE_PREFIX "", (int) code, - msg); + wrbuf_printf(text, HTTP_COMMAND_RESPONSE_PREFIX + "", (int) code, msg); if (addinfo) + { wrbuf_xmlputs(text, addinfo); + if (addinfo2) + { + wrbuf_xmlputs(text, ": "); + wrbuf_xmlputs(text, addinfo2); + } + } wrbuf_puts(text, ""); yaz_log(YLOG_WARN, "HTTP %s %s%s%s", http_status, @@ -287,6 +295,13 @@ static void error(struct http_response *rs, http_send_response(c); } +static void error(struct http_response *rs, + enum pazpar2_error_code code, + const char *addinfo) +{ + error2(rs, code, addinfo, 0); +} + static void response_open_command(struct http_channel *c, const char *command) { wrbuf_rewind(c->wrbuf); @@ -386,6 +401,7 @@ static int process_settings(struct session *se, struct http_request *rq, struct http_response *rs) { struct http_argument *a; + NMEM nmem = nmem_create(); for (a = rq->arguments; a; a = a->next) if (strchr(a->name, '[')) @@ -396,17 +412,18 @@ static int process_settings(struct session *se, struct http_request *rq, char *setting; // Nmem_strsplit *rules*!!! - nmem_strsplit(se->session_nmem, "[]", a->name, &res, &num); + nmem_strsplit(nmem, "[]", a->name, &res, &num); if (num != 2) { error(rs, PAZPAR2_MALFORMED_SETTING, a->name); + nmem_destroy(nmem); return -1; } setting = res[0]; dbname = res[1]; - session_apply_setting(se, dbname, setting, - nmem_strdup(se->session_nmem, a->value)); + session_apply_setting(se, dbname, setting, a->value); } + nmem_destroy(nmem); return 0; } @@ -481,8 +498,9 @@ static void cmd_init(struct http_channel *c) wrbuf_puts(c->wrbuf, "" "" PAZPAR2_PROTOCOL_VERSION ""); - wrbuf_printf(c->wrbuf, "%d\n", 1000 * ((s->psession->service->session_timeout >= 20) ? - (s->psession->service->session_timeout - 10) : 50)); + wrbuf_printf(c->wrbuf, "%d\n", + 1000 * ((s->psession->service->session_timeout >= 20) ? + (s->psession->service->session_timeout - 10) : 50)); response_close(c, "init"); } @@ -491,9 +509,7 @@ static void apply_local_setting(void *client_data, { struct session *se = (struct session *) client_data; - session_apply_setting(se, nmem_strdup(se->session_nmem, set->target), - nmem_strdup(se->session_nmem, set->name), - nmem_strdup(se->session_nmem, set->value)); + session_apply_setting(se, set->target, set->name, set->value); } static void cmd_settings(struct http_channel *c) @@ -515,7 +531,7 @@ static void cmd_settings(struct http_channel *c) if (!doc) { error(rs, PAZPAR2_MALFORMED_SETTING, 0); - release_session(c,s); + release_session(c, s); return; } root_n = xmlDocGetRootElement(doc); @@ -524,7 +540,7 @@ static void cmd_settings(struct http_channel *c) if (ret) { error(rs, PAZPAR2_MALFORMED_SETTING, 0); - release_session(c,s); + release_session(c, s); return; } } @@ -538,7 +554,8 @@ static void cmd_settings(struct http_channel *c) release_session(c, s); } -static void termlist_response(struct http_channel *c, struct http_session *s, const char *cmd_status) +static void termlist_response(struct http_channel *c, struct http_session *s, + const char *cmd_status) { struct http_request *rq = c->request; const char *name = http_argbyname(rq, "name"); @@ -577,7 +594,7 @@ static void termlist_result_ready(void *data) session_log(s->psession, c->http_sessions->log_level, "termlist watch released"); termlist_response(c, s, status); - release_session(c,s); + release_session(c, s); } } @@ -644,8 +661,10 @@ size_t session_get_memory_status(struct session *session); static void session_status(struct http_channel *c, struct http_session *s) { size_t session_nmem; - wrbuf_printf(c->wrbuf, "%u\n", s->activity_counter); - wrbuf_printf(c->wrbuf, "%zu\n", nmem_total(s->nmem) ); + wrbuf_printf(c->wrbuf, "%u\n", + s->activity_counter); + wrbuf_printf(c->wrbuf, "%zu\n", + nmem_total(s->nmem) ); session_nmem = session_get_memory_status(s->psession); wrbuf_printf(c->wrbuf, "%zu\n", session_nmem); } @@ -653,24 +672,12 @@ static void session_status(struct http_channel *c, struct http_session *s) static void cmd_service(struct http_channel *c) { struct http_session *s = locate_session(c); - xmlNode *xml_node; if (!s) return; response_open_command(c, 0); - xml_node = s->psession->service->xml_node; - if (xml_node) - { - xmlNode *tmp = xmlCopyNode(xml_node, 1); - xmlBufferPtr buf = xmlBufferCreate(); - - xmlNodeDump(buf, tmp->doc, tmp, 0, 0); - - wrbuf_write(c->wrbuf, (const char *) buf->content, buf->use); - xmlBufferFree(buf); - xmlFreeNode(tmp); - } - + if (s->psession->service->xml_node) + wrbuf_puts(c->wrbuf, s->psession->service->xml_node); response_close(c, 0); release_session(c, s); } @@ -687,8 +694,6 @@ static void cmd_session_status(struct http_channel *c) release_session(c, s); } -int sessions_count(void); -int clients_count(void); #ifdef HAVE_RESULTSETS_COUNT int resultsets_count(void); #else @@ -730,17 +735,20 @@ static void cmd_server_status(struct http_channel *c) xmalloc_trav(0); } -static void bytarget_response(struct http_channel *c, struct http_session *s, const char *cmd_status) { +static void bytarget_response(struct http_channel *c, struct http_session *s, + const char *cmd_status) +{ int count, i; - struct hitsbytarget *ht; struct http_request *rq = c->request; const char *settings = http_argbyname(rq, "settings"); int version = get_version(rq); - ht = get_hitsbytarget(s->psession, &count, c->nmem); + struct hitsbytarget *ht = get_hitsbytarget(s->psession, &count, c->nmem); + if (!cmd_status) /* Old protocol, always ok */ response_open_ok(c, "bytarget"); - else { + else + { /* New protocol, OK or WARNING (...)*/ response_open_command(c, "bytarget"); wrbuf_printf(c->wrbuf, "%s", cmd_status); @@ -765,7 +773,8 @@ static void bytarget_response(struct http_channel *c, struct http_session *s, co } wrbuf_printf(c->wrbuf, "" ODR_INT_PRINTF "\n", ht[i].hits); - wrbuf_printf(c->wrbuf, "%d\n", ht[i].diagnostic); + wrbuf_printf(c->wrbuf, "%d\n", + ht[i].diagnostic); if (ht[i].diagnostic) { wrbuf_puts(c->wrbuf, ""); @@ -777,10 +786,13 @@ static void bytarget_response(struct http_channel *c, struct http_session *s, co wrbuf_puts(c->wrbuf, "\n"); } - wrbuf_printf(c->wrbuf, "%d\n", ht[i].records - ht[i].filtered); - if (version >= 2) { - wrbuf_printf(c->wrbuf, "%d\n", ht[i].filtered); - wrbuf_printf(c->wrbuf, "" ODR_INT_PRINTF "\n", ht[i].approximation); + wrbuf_printf(c->wrbuf, "%d\n", + ht[i].records - ht[i].filtered); + wrbuf_printf(c->wrbuf, "%d\n", ht[i].filtered); + if (version >= 2) + { + wrbuf_printf(c->wrbuf, "" ODR_INT_PRINTF + "\n", ht[i].approximation); } wrbuf_puts(c->wrbuf, ""); wrbuf_xmlputs(c->wrbuf, ht[i].state); @@ -791,11 +803,21 @@ static void bytarget_response(struct http_channel *c, struct http_session *s, co wrbuf_puts(c->wrbuf, ht[i].settings_xml); wrbuf_puts(c->wrbuf, "\n"); } - if (ht[i].suggestions_xml && ht[i].suggestions_xml[0]) { + if (ht[i].suggestions_xml && ht[i].suggestions_xml[0]) + { wrbuf_puts(c->wrbuf, ""); wrbuf_puts(c->wrbuf, ht[i].suggestions_xml); wrbuf_puts(c->wrbuf, ""); } + if (ht[i].query_data) + { + wrbuf_puts(c->wrbuf, ""); + wrbuf_xmlputs(c->wrbuf, ht[i].query_type); + wrbuf_puts(c->wrbuf, "\n"); + wrbuf_puts(c->wrbuf, ""); + wrbuf_xmlputs(c->wrbuf, ht[i].query_data); + wrbuf_puts(c->wrbuf, "\n"); + } wrbuf_puts(c->wrbuf, ""); } response_close(c, "bytarget"); @@ -856,10 +878,9 @@ static void cmd_bytarget(struct http_channel *c) } else if (report_status) status_message = "WARNING (Already blocked on bytarget)"; - else { + else session_log(s->psession, YLOG_WARN, "Ignoring bytarget block." " Return current result."); - } } else { @@ -874,7 +895,8 @@ static void cmd_bytarget(struct http_channel *c) } static void write_metadata(WRBUF w, struct conf_service *service, - struct record_metadata **ml, int full, int indent) + struct record_metadata **ml, unsigned flags, + int indent) { int imeta; @@ -882,7 +904,7 @@ static void write_metadata(WRBUF w, struct conf_service *service, { struct conf_metadata *cmd = &service->metadata[imeta]; struct record_metadata *md; - if (!cmd->brief && !full) + if (!cmd->brief && !(flags & 1)) continue; for (md = ml[imeta]; md; md = md->next) { @@ -902,13 +924,19 @@ static void write_metadata(WRBUF w, struct conf_service *service, switch (cmd->type) { case Metadata_type_generic: - wrbuf_xmlputs(w, md->data.text.disp); + if (md->data.text.snippet && (flags & 2)) + wrbuf_puts(w, md->data.text.snippet); + else + wrbuf_xmlputs(w, md->data.text.disp); break; case Metadata_type_year: wrbuf_printf(w, "%d", md->data.number.min); if (md->data.number.min != md->data.number.max) wrbuf_printf(w, "-%d", md->data.number.max); break; + case Metadata_type_float: + wrbuf_printf(w, "%f", md->data.fnumber); + break; default: wrbuf_puts(w, "[can't represent]"); break; @@ -919,7 +947,8 @@ static void write_metadata(WRBUF w, struct conf_service *service, } static void write_subrecord(struct record *r, WRBUF w, - struct conf_service *service, int show_details) + struct conf_service *service, unsigned flags, + int indent) { const char *name = session_setting_oneval( client_get_database(r->client), PZ_NAME); @@ -936,7 +965,7 @@ static void write_subrecord(struct record *r, WRBUF w, wrbuf_printf(w, "%u", r->checksum); wrbuf_puts(w, "\">\n"); - write_metadata(w, service, r->metadata, show_details, 2); + write_metadata(w, service, r->metadata, flags, indent); wrbuf_puts(w, " \n"); } @@ -999,6 +1028,8 @@ static void show_record(struct http_channel *c, struct http_session *s) const char *offsetstr = http_argbyname(rq, "offset"); const char *binarystr = http_argbyname(rq, "binary"); const char *checksumstr = http_argbyname(rq, "checksum"); + const char *snippets = http_argbyname(rq, "snippets"); + unsigned flags = (snippets && *snippets == '1') ? 3 : 1; if (!s) return; @@ -1092,9 +1123,9 @@ static void show_record(struct http_channel *c, struct http_session *s) } wrbuf_printf(c->wrbuf, " %d\n", session_active_clients(s->psession)); - write_metadata(c->wrbuf, service, rec->metadata, 1, 1); + write_metadata(c->wrbuf, service, rec->metadata, flags, 1); for (r = rec->records; r; r = r->next) - write_subrecord(r, c->wrbuf, service, 2); + write_subrecord(r, c->wrbuf, service, flags, 2); response_close(c, "record"); } show_single_stop(s->psession, rec); @@ -1109,21 +1140,23 @@ static void cmd_record_ready(void *data) session_log(s->psession, c->http_sessions->log_level, "record watch released"); show_record(c, s); - release_session(c,s); + release_session(c, s); } } static void cmd_record(struct http_channel *c) { struct http_session *s = locate_session(c); - if (s) { + if (s) + { show_record(c, s); - release_session(c,s); + release_session(c, s); } } -static void show_records(struct http_channel *c, struct http_session *s, int active) +static void show_records(struct http_channel *c, struct http_session *s, + int active) { struct http_request *rq = c->request; struct http_response *rs = c->response; @@ -1133,6 +1166,8 @@ static void show_records(struct http_channel *c, struct http_session *s, int act const char *num = http_argbyname(rq, "num"); const char *sort = http_argbyname(rq, "sort"); int version = get_version(rq); + const char *snippets = http_argbyname(rq, "snippets"); + unsigned flags = (snippets && *snippets == '1') ? 2 : 0; int startn = 0; int numn = 20; @@ -1154,9 +1189,8 @@ static void show_records(struct http_channel *c, struct http_session *s, int act numn = atoi(num); service = s->psession->service; - if (!sort) { + if (!sort) sort = service->default_sort; - } if (!(sp = reclist_parse_sortparms(c->nmem, sort, service))) { error(rs, PAZPAR2_MALFORMED_PARAMETER_VALUE, "sort"); @@ -1173,9 +1207,10 @@ static void show_records(struct http_channel *c, struct http_session *s, int act wrbuf_printf(c->wrbuf, "\n%d\n", active); wrbuf_printf(c->wrbuf, "%d\n", total); wrbuf_printf(c->wrbuf, "" ODR_INT_PRINTF "\n", total_hits); - if (version >= 2) { - wrbuf_printf(c->wrbuf, "" ODR_INT_PRINTF "\n", approx_hits); - } + if (version >= 2) + wrbuf_printf(c->wrbuf, "" ODR_INT_PRINTF + "\n", approx_hits); + wrbuf_printf(c->wrbuf, "%d\n", startn); wrbuf_printf(c->wrbuf, "%d\n", numn); @@ -1187,9 +1222,9 @@ static void show_records(struct http_channel *c, struct http_session *s, int act struct conf_service *service = s->psession->service; wrbuf_puts(c->wrbuf, "\n"); - write_metadata(c->wrbuf, service, rec->metadata, 0, 1); + write_metadata(c->wrbuf, service, rec->metadata, flags, 1); for (ccount = 0, p = rl[i]->records; p; p = p->next, ccount++) - write_subrecord(p, c->wrbuf, service, 0); // subrecs w/o details + write_subrecord(p, c->wrbuf, service, flags, 2); wrbuf_printf(c->wrbuf, " %d\n", ccount); if (strstr(sort, "relevance")) { @@ -1227,7 +1262,7 @@ static void show_records_ready(void *data) else { /* some error message */ } - release_session(c,s); + release_session(c, s); } static void cmd_show(struct http_channel *c) @@ -1241,21 +1276,17 @@ static void cmd_show(struct http_channel *c) const char *mergekey = http_argbyname(rq, "mergekey"); const char *rank = http_argbyname(rq, "rank"); struct conf_service *service = 0; - struct reclist_sortparms *sp; int status; int report_error = 0; - if (block_error && !strcmp("1", block_error)) { + + if (block_error && !strcmp("1", block_error)) report_error = 1; - } if (!s) return; - service = s->psession->service; - if (!sort) { + if (!sort) sort = service->default_sort; - } - if (!(sp = reclist_parse_sortparms(c->nmem, sort, service))) { error(c->response, PAZPAR2_MALFORMED_PARAMETER_VALUE, "sort"); @@ -1266,9 +1297,11 @@ static void cmd_show(struct http_channel *c) status = session_active_clients(s->psession); - if (block) + if (block && reclist_get_num_records(s->psession->reclist) == 0) { - if (!strcmp(block, "preferred") && !session_is_preferred_clients_ready(s->psession) && reclist_get_num_records(s->psession->reclist) == 0) + if (!strcmp(block, "preferred") + && !session_is_preferred_clients_ready(s->psession) + && 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_PREF, @@ -1354,6 +1387,7 @@ static void cmd_search(struct http_channel *c) const char *rank = http_argbyname(rq, "rank"); enum pazpar2_error_code code; const char *addinfo = 0; + const char *addinfo2 = 0; struct reclist_sortparms *sp; struct conf_service *service = 0; @@ -1373,9 +1407,9 @@ static void cmd_search(struct http_channel *c) return; } service = s->psession->service; - if (!sort) { + if (!sort) sort = service->default_sort; - } + if (!(sp = reclist_parse_sortparms(c->nmem, sort, s->psession->service))) { error(c->response, PAZPAR2_MALFORMED_PARAMETER_VALUE, "sort"); @@ -1384,10 +1418,10 @@ static void cmd_search(struct http_channel *c) } code = session_search(s->psession, query, startrecs, maxrecs, filter, limit, - &addinfo, sp, mergekey, rank); + &addinfo, &addinfo2, sp, mergekey, rank); if (code) { - error(rs, code, addinfo); + error2(rs, code, addinfo, addinfo2); release_session(c, s); return; } @@ -1432,6 +1466,17 @@ static void cmd_stat(struct http_channel *c) release_session(c, s); } +static void cmd_stop(struct http_channel *c) +{ + struct http_session *s = locate_session(c); + if (!s) + return; + response_open_ok(c, "stop"); + session_stop(s->psession); + response_close(c, "stop"); + release_session(c, s); +} + static void cmd_info(struct http_channel *c) { char yaz_version_str[20]; @@ -1491,6 +1536,7 @@ struct { { "ping", cmd_ping }, { "record", cmd_record }, { "info", cmd_info }, + { "stop", cmd_stop }, {0,0} };