X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=client%2Fclient.c;h=ed7a0c7b637c02f0ed684feee70c5580f0c31638;hp=d4bd50e75dacc109db79840a6de554557a36dbf0;hb=77eb8faa2fa82a314874df3243cac0ca153adccf;hpb=96e65728eefb6d7efef6e2f74a3b0d64f92b3c23 diff --git a/client/client.c b/client/client.c index d4bd50e..ed7a0c7 100644 --- a/client/client.c +++ b/client/client.c @@ -1,16 +1,18 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2010 Index Data + * Copyright (C) 1995-2011 Index Data * See the file LICENSE for details. */ /** \file client.c * \brief yaz-client program */ +#if HAVE_CONFIG_H +#include +#endif #include #include #include #include -#include #ifndef WIN32 #include #endif @@ -106,6 +108,7 @@ static int largeSetLowerBound = 1; static int mediumSetPresentNumber = 0; static Z_ElementSetNames *elementSetNames = 0; static Z_FacetList *facet_list = 0; +static ODR facet_odr = 0; static Odr_int setno = 1; /* current set offset */ static enum oid_proto protocol = PROTO_Z3950; /* current app protocol */ #define RECORDSYNTAX_MAX 20 @@ -145,6 +148,8 @@ static int scan_size = 20; static char cur_host[200]; static Odr_int last_hit_count = 0; +static int pretty_xml = 0; + typedef enum { QueryType_Prefix, QueryType_CCL, @@ -284,7 +289,7 @@ int send_apdu(Z_APDU *a) do_hex_dump(buf, len); if (cs_put(conn, buf, len) < 0) { - fprintf(stderr, "cs_put: %s", cs_errmsg(cs_errno(conn))); + fprintf(stderr, "cs_put: %s\n", cs_errmsg(cs_errno(conn))); close_session(); return 0; } @@ -759,10 +764,6 @@ static int cmd_open(const char *arg) strncpy(cur_host, arg, sizeof(cur_host)-1); cur_host[sizeof(cur_host)-1] = 0; } - /* TODO Make facet definition survive the open command without crashing */ - /* TODO Fix deallocation */ - facet_list = 0; - set_base(""); r = session_connect(cur_host); if (conn && conn->protocol == PROTO_HTTP) @@ -846,6 +847,31 @@ static void print_record(const char *buf, size_t len) printf("\n"); } +static void print_xml_record(const char *buf, size_t len) +{ + int has_printed = 0; +#if YAZ_HAVE_XML2 + if (pretty_xml) + { + xmlDocPtr doc; + xmlKeepBlanksDefault(0); /* get get xmlDocFormatMemory to work! */ + doc = xmlParseMemory(buf, len); + if (doc) + { + xmlChar *xml_mem; + int xml_size; + xmlDocDumpFormatMemory(doc, &xml_mem, &xml_size, 1); + fwrite(xml_mem, 1, xml_size, stdout); + xmlFree(xml_mem); + xmlFreeDoc(doc); + has_printed = 1; + } + } +#endif + if (!has_printed) + fwrite(buf, 1, len, stdout); +} + static void display_record(Z_External *r) { const Odr_oid *oid = r->direct_reference; @@ -905,7 +931,8 @@ static void display_record(Z_External *r) || !oid_oidcmp(oid, yaz_oid_recsyn_xml) || !oid_oidcmp(oid, yaz_oid_recsyn_html)) { - fwrite(octet_buf, 1, octet_len, stdout); + print_xml_record(octet_buf, octet_len); + } else if (yaz_oid_is_iso2709(oid)) { @@ -1284,7 +1311,7 @@ static int send_srw_host_path(Z_SRW_PDU *sr, const char *host_port, } else if (!yaz_matchstr(sru_method, "solr")) { - yaz_solr_encode(gdu->u.HTTP_Request, sr, out, charset); + yaz_solr_encode_request(gdu->u.HTTP_Request, sr, out, charset); } return send_gdu(gdu); @@ -1455,7 +1482,7 @@ static int send_SRW_searchRequest(const char *arg) return 0; } sr->u.request->maximumRecords = odr_intdup(out, 0); - + sr->u.request->facetList = facet_list; if (record_schema) sr->u.request->recordSchema = record_schema; if (recordsyntax_size == 1 && !yaz_matchstr(recordsyntax_list[0], "xml")) @@ -2887,36 +2914,25 @@ static int cmd_find(const char *arg) static int cmd_facets(const char *arg) { - int size = 0; + if (!facet_odr) + facet_odr = odr_createmem(ODR_ENCODE); + odr_reset(facet_odr); + if (!*arg) { facet_list = 0; printf("Facets cleared.\n"); return 0; } - size = strlen(arg); - if (only_z3950()) + facet_list = yaz_pqf_parse_facet_list(facet_odr, arg); + if (!facet_list) { - printf("Currently only supported for Z39.50.\n"); + printf("Invalid facet list: %s", arg); return 0; } - else - { - /* TODO Wrong odr. Loosing memory */ - ODR odr = odr_createmem(ODR_ENCODE); - facet_list = yaz_pqf_parse_facet_list(odr, arg); - - if (!facet_list) - { - printf("Invalid facet list: %s", arg); - return 0; - } - return 1; - } - return 2; + return 1; } - static int cmd_delete(const char *arg) { if (only_z3950()) @@ -2975,21 +2991,50 @@ static int cmd_setnames(const char *arg) /* PRESENT SERVICE ----------------------------- */ +size_t check_token(const char *haystack, const char *token) +{ + size_t len = strlen(token); + size_t extra; + if (strncmp(haystack, token, len)) + return 0; + for (extra = 0; haystack[extra + len] != '\0'; extra++) + if (!strchr(" \r\n\t", haystack[extra + len])) + { + if (extra) + break; + else + return 0; /* no whitespace after token */ + } + return extra + len; +} + static int parse_show_args(const char *arg_c, char *setstring, Odr_int *start, Odr_int *number) { char *end_ptr; Odr_int start_position; + size_t token_len; if (setnumber >= 0) sprintf(setstring, "%d", setnumber); else *setstring = '\0'; + + token_len = check_token(arg_c, "format"); + if (token_len) + { + pretty_xml = 1; + arg_c += token_len; + } + else + pretty_xml = 0; - if (!strcmp(arg_c, "all")) + token_len = check_token(arg_c, "all"); + if (token_len) { *number = last_hit_count; *start = 1; + return 1; } start_position = odr_strtol(arg_c, &end_ptr, 10); if (end_ptr == arg_c) @@ -2997,7 +3042,7 @@ static int parse_show_args(const char *arg_c, char *setstring, *start = start_position; if (*end_ptr == '\0') return 1; - while (isspace(*(unsigned char *)end_ptr)) + while (yaz_isspace(*end_ptr)) end_ptr++; if (*end_ptr != '+') { @@ -3014,7 +3059,7 @@ static int parse_show_args(const char *arg_c, char *setstring, } if (*end_ptr == '\0') return 1; - while (isspace(*(unsigned char *)end_ptr)) + while (yaz_isspace(*end_ptr)) end_ptr++; if (*end_ptr != '+') { @@ -4272,7 +4317,7 @@ static void handle_srw_record(Z_SRW_record *rec) printf("\n"); if (rec->recordData_buf && rec->recordData_len) { - printf("%.*s", rec->recordData_len, rec->recordData_buf); + print_xml_record(rec->recordData_buf, rec->recordData_len); marc_file_write(rec->recordData_buf, rec->recordData_len); } else @@ -4305,6 +4350,9 @@ static void handle_srw_response(Z_SRW_searchRetrieveResponse *res) } if (res->numberOfRecords) printf("Number of hits: " ODR_INT_PRINTF "\n", *res->numberOfRecords); + if (res->facetList) { + display_facets(res->facetList); + } for (i = 0; inum_records; i++) handle_srw_record(res->records + i); } @@ -5107,7 +5155,7 @@ static void process_cmd_line(char* line) for (; *p; ++p) { - if (!isspace(*(unsigned char *) p)) + if (!yaz_isspace(*p)) lastnonspace = p; } if (lastnonspace)