/* 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 <config.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
#include <assert.h>
#include <time.h>
-#include <ctype.h>
#ifndef WIN32
#include <signal.h>
#endif
#include <yaz/comstack.h>
#include <yaz/oid_db.h>
-#define NO_OID 1
#include <yaz/proto.h>
#include <yaz/marcdisp.h>
#include <yaz/diagbib1.h>
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
static char cur_host[200];
static Odr_int last_hit_count = 0;
+static int pretty_xml = 0;
+
typedef enum {
QueryType_Prefix,
QueryType_CCL,
buf = odr_getbuf(out, &len, 0);
if (ber_file)
odr_dumpBER(ber_file, buf, len);
- /* printf ("sending APDU of size %d\n", len); */
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;
}
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)
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;
|| !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))
{
printf("Only CQL and PQF supported in SRW\n");
return 0;
}
- // TODO check.
- sr->u.request->maximumRecords = odr_intdup(out, 20);
+ sr->u.request->maximumRecords = odr_intdup(out, 0);
sr->u.request->facetList = facet_list;
if (record_schema)
sr->u.request->recordSchema = record_schema;
switch (term->which)
{
case Z_Term_general:
- printf(" %.*s", term->u.general->len, term->u.general->buf);
+ printf("%.*s", term->u.general->len, term->u.general->buf);
break;
case Z_Term_characterString:
- printf(" %s", term->u.characterString);
+ printf("%s", term->u.characterString);
break;
case Z_Term_numeric:
- printf(" " ODR_INT_PRINTF, *term->u.numeric);
+ printf(ODR_INT_PRINTF, *term->u.numeric);
break;
case Z_Term_null:
- printf(" null");
+ printf("null");
break;
}
}
for (term_index = 0 ; term_index < facet->num_terms; term_index++)
{
Z_FacetTerm *facetTerm = facet->terms[term_index];
+ printf(" ");
display_term(facetTerm->term);
printf(" (" NMEM_INT_PRINTF ")\n", *facetTerm->count);
}
return 0;
}
-static int is_SRW(void)
-{
- if (!conn)
- {
- printf("Not connected yet\n");
- return 1;
- }
- if (protocol == PROTO_HTTP && yaz_matchstr(sru_method, "solr"))
- {
- printf("Not supported by SRW\n");
- return 1;
- }
- return 0;
-}
-
-
static int cmd_update_common(const char *arg, int version);
static int cmd_update(const char *arg)
static int cmd_facets(const char *arg)
{
- /* TODO Wrong odr. Loosing memory */
- ODR odr = odr_createmem(ODR_ENCODE);
- 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() && !yaz_matchstr(sru_method, "solr")) {
- /* We are not Z39.50 and not SOLR (I think) */
- printf("WARN: Currently supported for Z39.50 and SOLR.\n");
- }
- facet_list = yaz_pqf_parse_facet_list(odr, arg);
-
+ facet_list = yaz_pqf_parse_facet_list(facet_odr, arg);
if (!facet_list)
{
printf("Invalid facet list: %s", arg);
return 1;
}
-
static int cmd_delete(const char *arg)
{
if (only_z3950())
/* 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)
*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 != '+')
{
}
if (*end_ptr == '\0')
return 1;
- while (isspace(*(unsigned char *)end_ptr))
+ while (yaz_isspace(*end_ptr))
end_ptr++;
if (*end_ptr != '+')
{
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
}
if (res->numberOfRecords)
printf("Number of hits: " ODR_INT_PRINTF "\n", *res->numberOfRecords);
+ if (res->facetList)
+ display_facets(res->facetList);
for (i = 0; i<res->num_records; i++)
handle_srw_record(res->records + i);
}
for (; *p; ++p)
{
- if (!isspace(*(unsigned char *) p))
+ if (!yaz_isspace(*p))
lastnonspace = p;
}
if (lastnonspace)
projects / yaz-moved-to-github.git / blobdiff