From 69277f297f927ad4639025ce4f58460ffd548bdf Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Fri, 30 Sep 2011 14:47:54 +0200 Subject: [PATCH] Refactor Pazpar2 HTTP response writing code Header and footer for successful responses is handled by a command handler. This makes the formatting slightly different. It also fixes the termlist response which did not include the XML header before. --- src/http_command.c | 133 +++++++++++++++++++----------------------- test/test_http_10.res | 5 +- test/test_http_11.res | 5 +- test/test_http_13.res | 5 +- test/test_http_14.res | 5 +- test/test_http_18.res | 5 +- test/test_http_23.res | 2 +- test/test_http_28.res | 5 +- test/test_http_32.res | 5 +- test/test_http_36.res | 5 +- test/test_http_41.res | 5 +- test/test_http_42.res | 5 +- test/test_http_45.res | 5 +- test/test_http_49.res | 5 +- test/test_http_5.res | 5 +- test/test_http_50.res | 5 +- test/test_http_55.res | 5 +- test/test_http_57.res | 5 +- test/test_http_6.res | 2 +- test/test_http_60.res | 5 +- test/test_http_63.res | 5 +- test/test_http_8.res | 5 +- test/test_http_9.res | 5 +- test/test_icu_10.res | 6 +- test/test_icu_4.res | 5 +- test/test_icu_5.res | 5 +- test/test_icu_6.res | 5 +- test/test_icu_7.res | 5 +- test/test_icu_8.res | 6 +- test/test_icu_9.res | 5 +- test/test_post_10.res | 5 +- test/test_post_8.res | 5 +- test/test_post_9.res | 5 +- test/test_solr_4.res | 5 +- test/test_solr_5.res | 6 +- test/test_turbomarcxml_4.res | 5 +- test/test_turbomarcxml_7.res | 5 +- 37 files changed, 133 insertions(+), 177 deletions(-) diff --git a/src/http_command.c b/src/http_command.c index 07e37be..7f7f98a 100644 --- a/src/http_command.c +++ b/src/http_command.c @@ -267,6 +267,28 @@ static void error(struct http_response *rs, http_send_response(c); } +static void response_open_no_status(struct http_channel *c, const char *command) +{ + wrbuf_rewind(c->wrbuf); + wrbuf_printf(c->wrbuf, "%s<%s>", + HTTP_COMMAND_RESPONSE_PREFIX, command); +} + +static void response_open(struct http_channel *c, const char *command) +{ + response_open_no_status(c, command); + wrbuf_puts(c->wrbuf, "OK"); +} + +static void response_close(struct http_channel *c, const char *command) +{ + struct http_response *rs = c->response; + + wrbuf_printf(c->wrbuf, "", command); + rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf)); + http_send_response(c); +} + unsigned int make_sessionid(void) { static int seq = 0; /* thread pr */ @@ -368,18 +390,15 @@ static int process_settings(struct session *se, struct http_request *rq, static void cmd_exit(struct http_channel *c) { - char buf[1024]; - struct http_response *rs = c->response; yaz_log(YLOG_WARN, "exit"); - sprintf(buf, HTTP_COMMAND_RESPONSE_PREFIX "OK"); - rs->payload = nmem_strdup(c->nmem, buf); - http_send_response(c); + + response_open(c, "exit"); + response_close(c, "exit"); http_close_server(c->server); } static void cmd_init(struct http_channel *c) { - char buf[1024]; struct http_request *r = c->request; const char *clear = http_argbyname(r, "clear"); const char *content_type = http_lookup_header(r->headers, "Content-Type"); @@ -429,18 +448,18 @@ static void cmd_init(struct http_channel *c) if (process_settings(s->psession, c->request, c->response) < 0) return; - - sprintf(buf, HTTP_COMMAND_RESPONSE_PREFIX - "OK%d", sesid); + + response_open(c, "init"); + wrbuf_printf(c->wrbuf, "%d", sesid); if (c->server->server_id) { - strcat(buf, "."); - strcat(buf, c->server->server_id); + wrbuf_puts(c->wrbuf, "."); + wrbuf_puts(c->wrbuf, c->server->server_id); } - strcat(buf, "" - "" PAZPAR2_PROTOCOL_VERSION ""); - rs->payload = nmem_strdup(c->nmem, buf); - http_send_response(c); + wrbuf_puts(c->wrbuf, "" + "" PAZPAR2_PROTOCOL_VERSION ""); + + response_close(c, "init"); } static void apply_local_setting(void *client_data, @@ -484,14 +503,13 @@ static void cmd_settings(struct http_channel *c) release_session(c, s); return; } - rs->payload = HTTP_COMMAND_RESPONSE_PREFIX "OK"; - http_send_response(c); + response_open(c, "settings"); + response_close(c, "settings"); release_session(c, s); } static void cmd_termlist(struct http_channel *c) { - struct http_response *rs = c->response; struct http_request *rq = c->request; struct http_session *s = locate_session(c); const char *name = http_argbyname(rq, "name"); @@ -507,16 +525,12 @@ static void cmd_termlist(struct http_channel *c) if (nums) num = atoi(nums); - wrbuf_rewind(c->wrbuf); - - wrbuf_puts(c->wrbuf, "\n"); + response_open_no_status(c, "termlist"); wrbuf_printf(c->wrbuf, "%d\n", status); perform_termlist(c, s->psession, name, num); - wrbuf_puts(c->wrbuf, "\n"); - rs->payload = nmem_strdup(rq->channel->nmem, wrbuf_cstr(c->wrbuf)); - http_send_response(c); + response_close(c, "termlist"); release_session(c, s); } @@ -533,19 +547,14 @@ static void session_status(struct http_channel *c, struct http_session *s) static void cmd_session_status(struct http_channel *c) { - struct http_response *rs = c->response; struct http_session *s = locate_session(c); if (!s) return; - wrbuf_rewind(c->wrbuf); - wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "OK\n"); + response_open(c, "session-status"); session_status(c, s); - wrbuf_puts(c->wrbuf, "\n"); - rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf)); - http_send_response(c); + response_close(c, "session-status"); release_session(c, s); - } int sessions_count(void); @@ -558,13 +567,12 @@ int resultsets_count(void); static void cmd_server_status(struct http_channel *c) { - struct http_response *rs = c->response; int sessions = sessions_count(); int clients = clients_count(); int resultsets = resultsets_count(); - wrbuf_rewind(c->wrbuf); - wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "\n"); - wrbuf_printf(c->wrbuf, " %u\n", sessions); + + response_open(c, "server-status"); + wrbuf_printf(c->wrbuf, "\n %u\n", sessions); wrbuf_printf(c->wrbuf, " %u\n", clients); /* Only works if yaz has been compiled with enabling of this */ wrbuf_printf(c->wrbuf, " %u\n",resultsets); @@ -588,16 +596,13 @@ static void cmd_server_status(struct http_channel *c) } yaz_mutex_leave(http_sessions->mutex); */ - wrbuf_puts(c->wrbuf, "\n"); - rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf)); - http_send_response(c); + response_close(c, "server-status"); xmalloc_trav(0); } static void cmd_bytarget(struct http_channel *c) { - struct http_response *rs = c->response; struct http_request *rq = c->request; struct http_session *s = locate_session(c); struct hitsbytarget *ht; @@ -607,8 +612,7 @@ static void cmd_bytarget(struct http_channel *c) if (!s) return; ht = get_hitsbytarget(s->psession, &count, c->nmem); - wrbuf_rewind(c->wrbuf); - wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "OK"); + response_open(c, "bytarget"); for (i = 0; i < count; i++) { @@ -640,10 +644,7 @@ static void cmd_bytarget(struct http_channel *c) } wrbuf_puts(c->wrbuf, ""); } - - wrbuf_puts(c->wrbuf, ""); - rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf)); - http_send_response(c); + response_close(c, "bytarget"); release_session(c, s); } @@ -829,8 +830,8 @@ static void cmd_record(struct http_channel *c) } else { - wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "\n"); - wrbuf_puts(c->wrbuf, ""); + response_open_no_status(c, "record"); + wrbuf_puts(c->wrbuf, "\n"); wrbuf_xmlputs(c->wrbuf, rec->recid); wrbuf_puts(c->wrbuf, "\n"); if (prev_r) @@ -850,9 +851,7 @@ static void cmd_record(struct http_channel *c) write_metadata(c->wrbuf, service, rec->metadata, 1); for (r = rec->records; r; r = r->next) write_subrecord(r, c->wrbuf, service, 1); - wrbuf_puts(c->wrbuf, "\n"); - rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf)); - http_send_response(c); + response_close(c, "record"); } show_single_stop(s->psession, rec); release_session(c, s); @@ -904,9 +903,8 @@ static void show_records(struct http_channel *c, int active) rl = show_range_start(s->psession, sp, startn, &numn, &total, &total_hits); - wrbuf_rewind(c->wrbuf); - wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "\nOK\n"); - wrbuf_printf(c->wrbuf, "%d\n", active); + response_open(c, "show"); + 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); wrbuf_printf(c->wrbuf, "%d\n", startn); @@ -936,9 +934,7 @@ static void show_records(struct http_channel *c, int active) show_range_stop(s->psession, rl); - wrbuf_puts(c->wrbuf, "\n"); - rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf)); - http_send_response(c); + response_close(c, "show"); release_session(c, s); } @@ -994,12 +990,11 @@ static void cmd_show(struct http_channel *c) static void cmd_ping(struct http_channel *c) { - struct http_response *rs = c->response; struct http_session *s = locate_session(c); if (!s) return; - rs->payload = HTTP_COMMAND_RESPONSE_PREFIX "OK"; - http_send_response(c); + response_open(c, "ping"); + response_close(c, "ping"); release_session(c, s); } @@ -1038,7 +1033,8 @@ static void cmd_search(struct http_channel *c) release_session(c, s); return; } - rs->payload = HTTP_COMMAND_RESPONSE_PREFIX "OK"; + response_open(c, "search"); + response_close(c, "search"); http_send_response(c); release_session(c, s); } @@ -1046,7 +1042,6 @@ static void cmd_search(struct http_channel *c) static void cmd_stat(struct http_channel *c) { - struct http_response *rs = c->response; struct http_session *s = locate_session(c); struct statistics stat; int clients; @@ -1064,8 +1059,7 @@ static void cmd_stat(struct http_channel *c) progress = (stat.num_clients - clients) / (float)stat.num_clients; } - wrbuf_rewind(c->wrbuf); - wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX ""); + response_open_no_status(c, "stat"); wrbuf_printf(c->wrbuf, "%d\n", clients); wrbuf_printf(c->wrbuf, "" ODR_INT_PRINTF "\n", stat.num_hits); wrbuf_printf(c->wrbuf, "%d\n", stat.num_records); @@ -1077,19 +1071,15 @@ static void cmd_stat(struct http_channel *c) wrbuf_printf(c->wrbuf, "%d\n", stat.num_failed); wrbuf_printf(c->wrbuf, "%d\n", stat.num_error); wrbuf_printf(c->wrbuf, "%.2f\n", progress); - wrbuf_puts(c->wrbuf, ""); - rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf)); - http_send_response(c); + response_close(c, "stat"); release_session(c, s); } static void cmd_info(struct http_channel *c) { char yaz_version_str[20]; - struct http_response *rs = c->response; - wrbuf_rewind(c->wrbuf); - wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "\n"); + response_open_no_status(c, "info"); wrbuf_puts(c->wrbuf, " \n"); wrbuf_puts(c->wrbuf, " wrbuf, VERSION); wrbuf_puts(c->wrbuf, ""); - yaz_version(yaz_version_str, 0); wrbuf_puts(c->wrbuf, " wrbuf, YAZ_VERSION); @@ -1111,9 +1100,7 @@ static void cmd_info(struct http_channel *c) info_services(c->server, c->wrbuf); - wrbuf_puts(c->wrbuf, ""); - rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf)); - http_send_response(c); + response_close(c, "info"); } struct { diff --git a/test/test_http_10.res b/test/test_http_10.res index 90fd4e3..50f1703 100644 --- a/test/test_http_10.res +++ b/test/test_http_10.res @@ -1,6 +1,5 @@ - -OK +OK 0 9 10 @@ -142,4 +141,4 @@ 2 title how to program a computer author jack collins medium book - + \ No newline at end of file diff --git a/test/test_http_11.res b/test/test_http_11.res index 703dcfe..863b4ea 100644 --- a/test/test_http_11.res +++ b/test/test_http_11.res @@ -1,6 +1,5 @@ - -OK +OK 0 9 10 @@ -142,4 +141,4 @@ 2 title how to program a computer author jack collins medium book - + \ No newline at end of file diff --git a/test/test_http_13.res b/test/test_http_13.res index d3b889f..5a1147b 100644 --- a/test/test_http_13.res +++ b/test/test_http_13.res @@ -1,9 +1,8 @@ - -OK +OK 0 0 0 0 0 - + \ No newline at end of file diff --git a/test/test_http_14.res b/test/test_http_14.res index d3b889f..5a1147b 100644 --- a/test/test_http_14.res +++ b/test/test_http_14.res @@ -1,9 +1,8 @@ - -OK +OK 0 0 0 0 0 - + \ No newline at end of file diff --git a/test/test_http_18.res b/test/test_http_18.res index 267fde6..adb2f54 100644 --- a/test/test_http_18.res +++ b/test/test_http_18.res @@ -1,6 +1,5 @@ - -OK +OK 0 3 3 @@ -42,4 +41,4 @@ 0 title oil gas drilling author medium book - + \ No newline at end of file diff --git a/test/test_http_23.res b/test/test_http_23.res index a3476cd..6474b47 100644 --- a/test/test_http_23.res +++ b/test/test_http_23.res @@ -23,4 +23,4 @@ XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - + \ No newline at end of file diff --git a/test/test_http_28.res b/test/test_http_28.res index fdb5227..81731ab 100644 --- a/test/test_http_28.res +++ b/test/test_http_28.res @@ -1,6 +1,5 @@ - -OK +OK 0 3 17 @@ -27,4 +26,4 @@ 100000 title utah geological and mineral survey publications author medium book - + \ No newline at end of file diff --git a/test/test_http_32.res b/test/test_http_32.res index 5c85987..20c400e 100644 --- a/test/test_http_32.res +++ b/test/test_http_32.res @@ -1,6 +1,5 @@ - -OK +OK 0 3 3 @@ -33,4 +32,4 @@ 0 title oil gas drilling - + \ No newline at end of file diff --git a/test/test_http_36.res b/test/test_http_36.res index 6905e5a..f2a4386 100644 --- a/test/test_http_36.res +++ b/test/test_http_36.res @@ -1,6 +1,5 @@ - -OK +OK 0 8 10 @@ -132,4 +131,4 @@ 0 title reconstruction tomography in diagnostic radiology and nuclear medicine author medium book - + \ No newline at end of file diff --git a/test/test_http_41.res b/test/test_http_41.res index ac7cb04..b5caef0 100644 --- a/test/test_http_41.res +++ b/test/test_http_41.res @@ -1,6 +1,5 @@ - -OK +OK 0 8 31 @@ -62,4 +61,4 @@ 0 title utah geological and mineral survey publications author medium book - + \ No newline at end of file diff --git a/test/test_http_42.res b/test/test_http_42.res index 9893c49..698b783 100644 --- a/test/test_http_42.res +++ b/test/test_http_42.res @@ -1,6 +1,5 @@ - -OK +OK 0 5 12 @@ -86,4 +85,4 @@ 35714 title computer science technology author medium book - + \ No newline at end of file diff --git a/test/test_http_45.res b/test/test_http_45.res index 2b89580..409826d 100644 --- a/test/test_http_45.res +++ b/test/test_http_45.res @@ -1,6 +1,5 @@ - -OK +OK 0 1 1 @@ -22,4 +21,4 @@ 0 title computer processing of dynamic images from an anger scintillation camera author medium book - + \ No newline at end of file diff --git a/test/test_http_49.res b/test/test_http_49.res index 43fcf8b..adc14ce 100644 --- a/test/test_http_49.res +++ b/test/test_http_49.res @@ -1,6 +1,5 @@ - -OK +OK 0 1 1 @@ -23,4 +22,4 @@ 120000 title the religious teachers of greece author adam james medium book - + \ No newline at end of file diff --git a/test/test_http_5.res b/test/test_http_5.res index a884f56..6cdfcf5 100644 --- a/test/test_http_5.res +++ b/test/test_http_5.res @@ -1,6 +1,5 @@ - -OK +OK 0 9 10 @@ -151,4 +150,4 @@ 0 title reconstruction tomography in diagnostic radiology and nuclear medicine author medium book - + \ No newline at end of file diff --git a/test/test_http_50.res b/test/test_http_50.res index 2b89580..409826d 100644 --- a/test/test_http_50.res +++ b/test/test_http_50.res @@ -1,6 +1,5 @@ - -OK +OK 0 1 1 @@ -22,4 +21,4 @@ 0 title computer processing of dynamic images from an anger scintillation camera author medium book - + \ No newline at end of file diff --git a/test/test_http_55.res b/test/test_http_55.res index d3b889f..5a1147b 100644 --- a/test/test_http_55.res +++ b/test/test_http_55.res @@ -1,9 +1,8 @@ - -OK +OK 0 0 0 0 0 - + \ No newline at end of file diff --git a/test/test_http_57.res b/test/test_http_57.res index d3b889f..5a1147b 100644 --- a/test/test_http_57.res +++ b/test/test_http_57.res @@ -1,9 +1,8 @@ - -OK +OK 0 0 0 0 0 - + \ No newline at end of file diff --git a/test/test_http_6.res b/test/test_http_6.res index f079915..2bfdae4 100644 --- a/test/test_http_6.res +++ b/test/test_http_6.res @@ -23,4 +23,4 @@ XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - + \ No newline at end of file diff --git a/test/test_http_60.res b/test/test_http_60.res index f6ca445..ec2e70b 100644 --- a/test/test_http_60.res +++ b/test/test_http_60.res @@ -1,6 +1,5 @@ - -OK +OK 0 1 1 @@ -23,4 +22,4 @@ 320000 title the religious teachers of greece author adam james medium book - + \ No newline at end of file diff --git a/test/test_http_63.res b/test/test_http_63.res index 43fcf8b..adc14ce 100644 --- a/test/test_http_63.res +++ b/test/test_http_63.res @@ -1,6 +1,5 @@ - -OK +OK 0 1 1 @@ -23,4 +22,4 @@ 120000 title the religious teachers of greece author adam james medium book - + \ No newline at end of file diff --git a/test/test_http_8.res b/test/test_http_8.res index 84feb43..65b37e4 100644 --- a/test/test_http_8.res +++ b/test/test_http_8.res @@ -1,6 +1,5 @@ - -OK +OK 0 9 10 @@ -142,4 +141,4 @@ YYYYYYYYY title the computer bible author medium book - + \ No newline at end of file diff --git a/test/test_http_9.res b/test/test_http_9.res index 407ac56..b3a3f53 100644 --- a/test/test_http_9.res +++ b/test/test_http_9.res @@ -1,6 +1,5 @@ - -OK +OK 0 9 10 @@ -142,4 +141,4 @@ YYYYYYYYY title washington metropolitan area rail computer feasibility study author englund carl r medium book - + \ No newline at end of file diff --git a/test/test_icu_10.res b/test/test_icu_10.res index 00a481a..bf54b7a 100644 --- a/test/test_icu_10.res +++ b/test/test_icu_10.res @@ -1,5 +1,5 @@ - -0 + +0 z3950.indexdata.com/marc @@ -9,4 +9,4 @@ 0 - + \ No newline at end of file diff --git a/test/test_icu_4.res b/test/test_icu_4.res index 84feb43..65b37e4 100644 --- a/test/test_icu_4.res +++ b/test/test_icu_4.res @@ -1,6 +1,5 @@ - -OK +OK 0 9 10 @@ -142,4 +141,4 @@ YYYYYYYYY title the computer bible author medium book - + \ No newline at end of file diff --git a/test/test_icu_5.res b/test/test_icu_5.res index 407ac56..b3a3f53 100644 --- a/test/test_icu_5.res +++ b/test/test_icu_5.res @@ -1,6 +1,5 @@ - -OK +OK 0 9 10 @@ -142,4 +141,4 @@ YYYYYYYYY title washington metropolitan area rail computer feasibility study author englund carl r medium book - + \ No newline at end of file diff --git a/test/test_icu_6.res b/test/test_icu_6.res index 90fd4e3..50f1703 100644 --- a/test/test_icu_6.res +++ b/test/test_icu_6.res @@ -1,6 +1,5 @@ - -OK +OK 0 9 10 @@ -142,4 +141,4 @@ 2 title how to program a computer author jack collins medium book - + \ No newline at end of file diff --git a/test/test_icu_7.res b/test/test_icu_7.res index 703dcfe..863b4ea 100644 --- a/test/test_icu_7.res +++ b/test/test_icu_7.res @@ -1,6 +1,5 @@ - -OK +OK 0 9 10 @@ -142,4 +141,4 @@ 2 title how to program a computer author jack collins medium book - + \ No newline at end of file diff --git a/test/test_icu_8.res b/test/test_icu_8.res index b816997..80dde63 100644 --- a/test/test_icu_8.res +++ b/test/test_icu_8.res @@ -1,5 +1,5 @@ - -0 + +0 Jack Collins2 Englund, Carl R.1 @@ -18,4 +18,4 @@ Tomography1 Universities And Colleges1 - + \ No newline at end of file diff --git a/test/test_icu_9.res b/test/test_icu_9.res index f09bc0a..6578cb1 100644 --- a/test/test_icu_9.res +++ b/test/test_icu_9.res @@ -1,6 +1,5 @@ - -OK +OK 0 9 10 @@ -151,4 +150,4 @@ 0 title reconstruction tomography in diagnostic radiology and nuclear medicine author medium book - + \ No newline at end of file diff --git a/test/test_post_10.res b/test/test_post_10.res index 4ad81c0..25fe7de 100644 --- a/test/test_post_10.res +++ b/test/test_post_10.res @@ -1,6 +1,5 @@ - -OK +OK 0 9 10 @@ -107,4 +106,4 @@ 0 title reconstruction tomography in diagnostic radiology and nuclear medicine author medium book - + \ No newline at end of file diff --git a/test/test_post_8.res b/test/test_post_8.res index 4ad81c0..25fe7de 100644 --- a/test/test_post_8.res +++ b/test/test_post_8.res @@ -1,6 +1,5 @@ - -OK +OK 0 9 10 @@ -107,4 +106,4 @@ 0 title reconstruction tomography in diagnostic radiology and nuclear medicine author medium book - + \ No newline at end of file diff --git a/test/test_post_9.res b/test/test_post_9.res index e28d1a8..70974e0 100644 --- a/test/test_post_9.res +++ b/test/test_post_9.res @@ -1,6 +1,5 @@ - -OK +OK 0 3 3 @@ -27,4 +26,4 @@ 0 title oil gas drilling author medium book - + \ No newline at end of file diff --git a/test/test_solr_4.res b/test/test_solr_4.res index 406581f..f9018d9 100644 --- a/test/test_solr_4.res +++ b/test/test_solr_4.res @@ -1,6 +1,5 @@ - -OK +OK 0 97 1995 @@ -311,4 +310,4 @@ 12121 title mercados e instituciones de aguas en bolivia medium book - + \ No newline at end of file diff --git a/test/test_solr_5.res b/test/test_solr_5.res index dd89fec..9d5251c 100644 --- a/test/test_solr_5.res +++ b/test/test_solr_5.res @@ -1,5 +1,5 @@ - -0 + +0 ocs-test.indexdata.com/solr/select @@ -64,4 +64,4 @@ book99 book (electronic)1 - + \ No newline at end of file diff --git a/test/test_turbomarcxml_4.res b/test/test_turbomarcxml_4.res index 3ed2d80..2baf08e 100644 --- a/test/test_turbomarcxml_4.res +++ b/test/test_turbomarcxml_4.res @@ -1,6 +1,5 @@ - -OK +OK 0 3 3 @@ -58,4 +57,4 @@ operator, driller, location, depth, copies of logs run, permits, samples 0 title oil gas drilling author medium book - + \ No newline at end of file diff --git a/test/test_turbomarcxml_7.res b/test/test_turbomarcxml_7.res index 5c85987..20c400e 100644 --- a/test/test_turbomarcxml_7.res +++ b/test/test_turbomarcxml_7.res @@ -1,6 +1,5 @@ - -OK +OK 0 3 3 @@ -33,4 +32,4 @@ 0 title oil gas drilling - + \ No newline at end of file -- 1.7.10.4