X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=client%2Fclient.c;h=c778d7703c6ee489082595b9432cd1ba1af2f99c;hp=e1b52edfe1b79d06096de21516272a51d60e4424;hb=70167dec477969519b27873537a7d9d7d7e686c1;hpb=5fca2e8ca1775ad5adceb1568508d911d646a01b diff --git a/client/client.c b/client/client.c index e1b52ed..c778d77 100644 --- a/client/client.c +++ b/client/client.c @@ -1,18 +1,18 @@ -/* - * Copyright (C) 1995-2007, Index Data ApS +/* This file is part of the YAZ toolkit. + * Copyright (C) 1995-2012 Index Data * See the file LICENSE for details. - * - * $Id: client.c,v 1.343 2007-06-03 08:06:31 adam Exp $ */ /** \file client.c * \brief yaz-client program */ +#if HAVE_CONFIG_H +#include +#endif #include #include #include #include -#include #ifndef WIN32 #include #endif @@ -35,15 +35,6 @@ #include #endif -#if HAVE_OPENSSL_SSL_H -#include -#include -#include -#include -#include -#include -#endif - #ifdef WIN32 #include #include @@ -57,7 +48,6 @@ #include #include -#define NO_OID 1 #include #include #include @@ -73,6 +63,7 @@ #include #include #include +#include #if HAVE_READLINE_READLINE_H #include @@ -90,7 +81,8 @@ static file_history_t file_history = 0; -static char *sru_method = "soap"; +static char sru_method[10] = "soap"; +static char sru_version[10] = "1.2"; static char *codeset = 0; /* character set for output */ static int hex_dump = 0; static char *dump_file_prefix = 0; @@ -102,7 +94,10 @@ static Z_SRW_PDU *srw_sr = 0; static FILE *apdu_file = 0; static FILE *ber_file = 0; static COMSTACK conn = 0; /* our z-association */ + static Z_IdAuthentication *auth = 0; /* our current auth definition */ +static NMEM nmem_auth = NULL; + char *databaseNames[128]; int num_databaseNames = 0; static Z_External *record_last = 0; @@ -110,8 +105,10 @@ static int setnumber = -1; /* current result set number */ static int smallSetUpperBound = 0; static int largeSetLowerBound = 1; static int mediumSetPresentNumber = 0; -static Z_ElementSetNames *elementSetNames = 0; -static int setno = 1; /* current set offset */ +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 *recordsyntax_list[RECORDSYNTAX_MAX]; @@ -140,16 +137,17 @@ static char* yazLang = 0; static char last_cmd[32] = "?"; static FILE *marc_file = 0; static char *refid = NULL; -static char *last_open_command = NULL; static int auto_reconnect = 0; static int auto_wait = 1; static Odr_bitmask z3950_options; static int z3950_version = 3; static int scan_stepSize = 0; -static int scan_position = 1; +static char scan_position[64]; static int scan_size = 20; static char cur_host[200]; -static int last_hit_count = 0; +static Odr_int last_hit_count = 0; +static int pretty_xml = 0; +static Odr_int sru_maximumRecords = 0; typedef enum { QueryType_Prefix, @@ -171,52 +169,56 @@ static cql_transform_t cqltrans = 0; /* CQL context-set handle */ int rl_attempted_completion_over = 0; #endif -/* set this one to 1, to avoid decode of unknown MARCs */ -#define AVOID_MARC_DECODE 1 - #define maxOtherInfosSupported 10 struct eoi { Odr_oid oid[OID_SIZE]; char* value; } extraOtherInfos[maxOtherInfosSupported]; -void process_cmd_line(char* line); +static void process_cmd_line(char* line); #if HAVE_READLINE_READLINE_H -char **readline_completer(char *text, int start, int end); +static char **readline_completer(char *text, int start, int end); #endif static char *command_generator(const char *text, int state); -int cmd_register_tab(const char* arg); -int cmd_querycharset(const char *arg); +static int cmd_register_tab(const char* arg); +static int cmd_querycharset(const char *arg); + +static void close_session(void); + +static void marc_file_write(const char *buf, size_t sz); -static void close_session (void); +static void wait_and_handle_response(int one_response_only); +static Z_GDU *get_HTTP_Request_url(ODR odr, const char *url); ODR getODROutputStream(void) { return out; } -const char* query_type_as_string(QueryType q) +static const char* query_type_as_string(QueryType q) { - switch (q) { + switch (q) + { case QueryType_Prefix: return "prefix (RPN sent to server)"; case QueryType_CCL: return "CCL (CCL sent to server) "; case QueryType_CCL2RPN: return "CCL -> RPN (RPN sent to server)"; case QueryType_CQL: return "CQL (CQL sent to server)"; case QueryType_CQL2RPN: return "CQL -> RPN (RPN sent to server)"; - default: + default: return "unknown Query type internal yaz-client error"; } } -static void do_hex_dump(const char* buf, int len) +static void do_hex_dump(const char* buf, size_t len) { if (hex_dump) { - int i,x; - for( i=0; i 0) yaz_oi_set_string_oid(oi, out, extraOtherInfos[i].oid, 1, extraOtherInfos[i].value); - } + } } int send_apdu(Z_APDU *a) { char *buf; int len; - + add_otherInfos(a); - + if (apdu_file) { z_APDU(print, &a, 0, 0); @@ -275,11 +284,10 @@ int send_apdu(Z_APDU *a) 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; } @@ -287,41 +295,41 @@ int send_apdu(Z_APDU *a) return 1; } -static void print_stringn(const unsigned char *buf, size_t len) +static void print_stringn(const char *buf, size_t len) { size_t i; - for (i = 0; i= 32) || strchr ("\n\r\t\f", buf[i])) - printf ("%c", buf[i]); + for (i = 0; i < len; i++) + if ((buf[i] <= 126 && buf[i] >= 32) || strchr("\n\r\t\f", buf[i])) + printf("%c", buf[i]); else - printf ("\\X%02X", buf[i]); + printf("\\X%02X", ((const unsigned char *)buf)[i]); } -static void print_refid (Z_ReferenceId *id) +static void print_refid(Z_ReferenceId *id) { if (id) { - printf ("Reference Id: "); - print_stringn (id->buf, id->len); - printf ("\n"); + printf("Reference Id: "); + print_stringn((const char *) id->buf, id->len); + printf("\n"); } } -static Z_ReferenceId *set_refid (ODR out) +static Z_ReferenceId *set_refid(ODR out) { Z_ReferenceId *id; if (!refid) return 0; - id = (Z_ReferenceId *) odr_malloc (out, sizeof(*id)); + id = (Z_ReferenceId *) odr_malloc(out, sizeof(*id)); id->size = id->len = strlen(refid); - id->buf = (unsigned char *) odr_malloc (out, id->len); - memcpy (id->buf, refid, id->len); + id->buf = (unsigned char *) odr_malloc(out, id->len); + memcpy(id->buf, refid, id->len); return id; -} +} /* INIT SERVICE ------------------------------- */ -static void send_initRequest(const char* type_and_host) +static void send_Z3950_initRequest(const char* type_and_host) { Z_APDU *apdu = zget_APDU(out, Z_APDU_initRequest); Z_InitRequest *req = apdu->u.initRequest; @@ -338,62 +346,47 @@ static void send_initRequest(const char* type_and_host) req->idAuthentication = auth; - req->referenceId = set_refid (out); + req->referenceId = set_refid(out); if (yazProxy && type_and_host) { yaz_oi_set_string_oid(&req->otherInfo, out, yaz_oid_userinfo_proxy, 1, type_and_host); } - - if (negotiationCharset || yazLang) { + + if (negotiationCharset || yazLang) + { Z_OtherInformation **p; Z_OtherInformationUnit *p0; - + yaz_oi_APDU(apdu, &p); - + if ((p0=yaz_oi_update(p, out, NULL, 0, 0))) { ODR_MASK_SET(req->options, Z_Options_negotiationModel); - + p0->which = Z_OtherInfo_externallyDefinedInfo; p0->information.externallyDefinedInfo = - yaz_set_proposal_charneg_list(out, ",", - negotiationCharset, + yaz_set_proposal_charneg_list(out, ",", + negotiationCharset, yazLang, negotiationCharsetRecords); } } - else if (ODR_MASK_GET(req->options, Z_Options_negotiationModel)) - { - Z_OtherInformation **p; - Z_OtherInformationUnit *p0; - - yaz_oi_APDU(apdu, &p); - - if ((p0=yaz_oi_update(p, out, NULL, 0, 0))) - { - p0->which = Z_OtherInfo_externallyDefinedInfo; - p0->information.externallyDefinedInfo = - yaz_set_proposal_charneg(out, 0, 0, 0, 0, 0); - } - - } if (send_apdu(apdu)) printf("Sent initrequest.\n"); } -/* These two are used only from process_initResponse() */ static void render_initUserInfo(Z_OtherInformation *ui1); static void render_diag(Z_DiagnosticFormat *diag); static void pr_opt(const char *opt, void *clientData) { - printf (" %s", opt); + printf(" %s", opt); } -static int process_initResponse(Z_InitResponse *res) +static int process_Z3950_initResponse(Z_InitResponse *res) { int ver = 0; /* save session parameters for later use */ @@ -417,21 +410,23 @@ static int process_initResponse(Z_InitResponse *res) if (res->userInformationField) { Z_External *uif = res->userInformationField; - if (uif->which == Z_External_userInfo1) { + if (uif->which == Z_External_userInfo1) render_initUserInfo(uif->u.userInfo1); - } else { + else + { printf("UserInformationfield:\n"); if (!z_External(print, (Z_External**)&uif, 0, 0)) { odr_perror(print, "Printing userinfo\n"); odr_reset(print); } - if (uif->which == Z_External_octet) { + if (uif->which == Z_External_octet) + { printf("Guessing visiblestring:\n"); printf("'%.*s'\n", uif->u.octet_aligned->len, uif->u.octet_aligned->buf); } - else if (uif->which == Z_External_single) + else if (uif->which == Z_External_single) { Odr_any *sat = uif->u.single_ASN1_type; if (!oid_oidcmp(uif->direct_reference, @@ -441,40 +436,40 @@ static int process_initResponse(Z_InitResponse *res) ODR decode = odr_createmem(ODR_DECODE); odr_setbuf(decode, (char *) sat->buf, sat->len, 0); if (!z_OCLC_UserInformation(decode, &oclc_ui, 0, 0)) - printf ("Bad OCLC UserInformation:\n"); + printf("Bad OCLC UserInformation:\n"); else - printf ("OCLC UserInformation:\n"); + printf("OCLC UserInformation:\n"); if (!z_OCLC_UserInformation(print, &oclc_ui, 0, 0)) - printf ("Bad OCLC UserInformation spec\n"); + printf("Bad OCLC UserInformation spec\n"); odr_destroy(decode); } else { /* Peek at any private Init-diagnostic APDUs */ - printf("### NAUGHTY: External is '%.*s'\n", - sat->len, sat->buf); + printf("yaz-client ignoring unrecognised userInformationField: %d-octet External '%.*s'\n", + (int) sat->len, sat->len, sat->buf); } } - odr_reset (print); + odr_reset(print); } } - printf ("Options:"); + printf("Options:"); yaz_init_opt_decode(res->options, pr_opt, 0); - printf ("\n"); + printf("\n"); if (ODR_MASK_GET(res->options, Z_Options_namedResultSets)) setnumber = 0; - - if (ODR_MASK_GET(res->options, Z_Options_negotiationModel)) { - + + if (ODR_MASK_GET(res->options, Z_Options_negotiationModel)) + { Z_CharSetandLanguageNegotiation *p = yaz_get_charneg_record(res->otherInfo); - if (p) + if (p) { char *charset=NULL, *lang=NULL; int selected; - + yaz_get_response_charneg(session_mem, p, &charset, &lang, &selected); @@ -497,33 +492,36 @@ static int process_initResponse(Z_InitResponse *res) } } } - fflush (stdout); + fflush(stdout); return 0; } -static void render_initUserInfo(Z_OtherInformation *ui1) { +static void render_initUserInfo(Z_OtherInformation *ui1) +{ int i; printf("Init response contains %d otherInfo unit%s:\n", ui1->num_elements, ui1->num_elements == 1 ? "" : "s"); - for (i = 0; i < ui1->num_elements; i++) { + for (i = 0; i < ui1->num_elements; i++) + { Z_OtherInformationUnit *unit = ui1->list[i]; printf(" %d: otherInfo unit contains ", i+1); if (unit->which == Z_OtherInfo_externallyDefinedInfo && unit->information.externallyDefinedInfo && unit->information.externallyDefinedInfo->which == - Z_External_diag1) { + Z_External_diag1) + { render_diag(unit->information.externallyDefinedInfo->u.diag1); - } + } else if (unit->which != Z_OtherInfo_externallyDefinedInfo) { printf("unsupported otherInfo unit->which = %d\n", unit->which); } - else + else { printf("unsupported otherInfo unit external %d\n", - unit->information.externallyDefinedInfo ? + unit->information.externallyDefinedInfo ? unit->information.externallyDefinedInfo->which : -2); } } @@ -531,18 +529,21 @@ static void render_initUserInfo(Z_OtherInformation *ui1) { /* ### should this share code with display_diagrecs()? */ -static void render_diag(Z_DiagnosticFormat *diag) { +static void render_diag(Z_DiagnosticFormat *diag) +{ int i; printf("%d diagnostic%s:\n", diag->num, diag->num == 1 ? "" : "s"); - for (i = 0; i < diag->num; i++) { + for (i = 0; i < diag->num; i++) + { Z_DiagnosticFormat_s *ds = diag->elements[i]; printf(" %d: ", i+1); - switch (ds->which) { + switch (ds->which) + { case Z_DiagnosticFormat_s_defaultDiagRec: { Z_DefaultDiagFormat *dd = ds->u.defaultDiagRec; /* ### should check `dd->diagnosticSetId' */ - printf("code=%d (%s)", *dd->condition, + printf("code=" ODR_INT_PRINTF " (%s)", *dd->condition, diagbib1_str(*dd->condition)); /* Both types of addinfo are the same, so use type-pun */ if (dd->u.v2Addinfo != 0) @@ -570,7 +571,7 @@ static int set_base(const char *arg) const char *cp; for (i = 0; iprotocol == PROTO_HTTP) - queryType = QueryType_CQL; #else if (conn->protocol == PROTO_HTTP) { - printf ("SRW/HTTP not enabled in this YAZ\n"); + printf("SRW/HTTP not enabled in this YAZ\n"); cs_close(conn); conn = 0; return 0; } #endif protocol = conn->protocol; - if (conn->protocol == PROTO_HTTP) - set_base(""); - else - set_base("Default"); printf("Connecting..."); fflush(stdout); if (cs_connect(conn, add) < 0) { - printf ("error = %s\n", cs_strerror(conn)); + printf("error = %s\n", cs_strerror(conn)); cs_close(conn); conn = 0; return 0; } printf("OK.\n"); -#if HAVE_OPENSSL_SSL_H - if ((ssl = (SSL *) cs_get_ssl(conn))) - { - X509 *server_cert = SSL_get_peer_certificate (ssl); - - if (server_cert) - { - char *pem_buf; - int pem_len; - BIO *bio = BIO_new(BIO_s_mem()); - - /* get PEM buffer in memory */ - PEM_write_bio_X509(bio, server_cert); - pem_len = BIO_get_mem_data(bio, &pem_buf); - fwrite(pem_buf, pem_len, 1, stdout); - - /* print all info on screen .. */ - X509_print_fp(stdout, server_cert); - BIO_free(bio); - - X509_free (server_cert); - } - } -#endif - if (basep && *basep) - set_base (basep); + cs_print_session_info(conn); if (protocol == PROTO_Z3950) { - send_initRequest(type_and_host); + send_Z3950_initRequest(type_and_host); return 2; } return 0; } -int cmd_open(const char *arg) +static int session_connect(const char *arg) +{ + int r; + const char *basep = 0; + + r = session_connect_base(arg, &basep); + if (basep && *basep) + set_base(basep); + else if (protocol == PROTO_Z3950) + set_base("Default"); + return r; +} + +static int cmd_open(const char *arg) { + int r; if (arg) { - strncpy (cur_host, arg, sizeof(cur_host)-1); + strncpy(cur_host, arg, sizeof(cur_host)-1); cur_host[sizeof(cur_host)-1] = 0; } - return session_connect(cur_host); -} - -void try_reconnect(void) -{ - char* open_command; - - if(!( auto_reconnect && last_open_command) ) return ; + set_base(""); + r = session_connect(cur_host); + if (conn && conn->protocol == PROTO_HTTP) + queryType = QueryType_CQL; - open_command = (char *) xmalloc (strlen(last_open_command)+6); - strcpy (open_command, "open "); - - strcat (open_command, last_open_command); - process_cmd_line(open_command); - - xfree(open_command); + return r; } -int cmd_authentication(const char *arg) +static int cmd_authentication(const char *arg) { - static Z_IdAuthentication au; - static char user[40], group[40], pass[40]; - static Z_IdPass idPass; + char **args; int r; - if (!*arg) - { - printf("Auth field set to null\n"); - auth = 0; - return 1; - } - r = sscanf (arg, "%39s %39s %39s", user, group, pass); + nmem_reset(nmem_auth); + nmem_strsplit_blank(nmem_auth, arg, &args, &r); + if (r == 0) { printf("Authentication set to null\n"); auth = 0; } - if (r == 1) + else if (r == 1) { - auth = &au; - if (!strcmp(user, "-")) { - au.which = Z_IdAuthentication_anonymous; + auth = (Z_IdAuthentication *) nmem_malloc(nmem_auth, sizeof(*auth)); + if (!strcmp(args[0], "-")) + { + auth->which = Z_IdAuthentication_anonymous; + auth->u.anonymous = odr_nullval(); printf("Authentication set to Anonymous\n"); - } else { - au.which = Z_IdAuthentication_open; - au.u.open = user; - printf("Authentication set to Open (%s)\n", user); + } + else + { + auth->which = Z_IdAuthentication_open; + auth->u.open = args[0]; + printf("Authentication set to Open (%s)\n", args[0]); } } - if (r == 2) - { - auth = &au; - au.which = Z_IdAuthentication_idPass; - au.u.idPass = &idPass; - idPass.groupId = NULL; - idPass.userId = user; - idPass.password = group; - printf("Authentication set to User (%s), Pass (%s)\n", user, group); + else if (r == 2) + { + auth = (Z_IdAuthentication *) nmem_malloc(nmem_auth, sizeof(*auth)); + auth->which = Z_IdAuthentication_idPass; + auth->u.idPass = (Z_IdPass *) + nmem_malloc(nmem_auth, sizeof(*auth->u.idPass)); + auth->u.idPass->groupId = NULL; + auth->u.idPass->userId = !strcmp(args[0], "-") ? 0 : args[0]; + auth->u.idPass->password = !strcmp(args[1], "-") ? 0 : args[1]; + printf("Authentication set to User (%s), Pass (%s)\n", + args[0], args[1]); + } + else if (r == 3) + { + auth = (Z_IdAuthentication*) nmem_malloc(nmem_auth, sizeof(*auth)); + auth->which = Z_IdAuthentication_idPass; + auth->u.idPass = (Z_IdPass *) + nmem_malloc(nmem_auth, sizeof(*auth->u.idPass)); + auth->u.idPass->groupId = args[1]; + auth->u.idPass->userId = args[0]; + auth->u.idPass->password = args[2]; + printf("Authentication set to User (%s), Group (%s), Pass (%s)\n", + args[0], args[1], args[2]); } - if (r == 3) + else { - auth = &au; - au.which = Z_IdAuthentication_idPass; - au.u.idPass = &idPass; - idPass.groupId = group; - idPass.userId = user; - idPass.password = pass; - printf("Authentication set to User (%s), Group (%s), Pass (%s)\n", - user, group, pass); + printf("Bad number of args to auth\n"); + auth = 0; } + return 1; } /* SEARCH SERVICE ------------------------------ */ static void display_record(Z_External *r); -static void print_record(const unsigned char *buf, size_t len) +static void print_record(const char *buf, size_t len) { size_t i = len; - print_stringn (buf, len); + print_stringn(buf, len); /* add newline if not already added ... */ if (i <= 0 || buf[i-1] != '\n') - printf ("\n"); + 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; - + record_last = r; /* * Tell the user what we got. @@ -915,7 +909,7 @@ static void display_record(Z_External *r) odr_dumpBER(stdout, (char*)r->u.octet_aligned->buf, r->u.octet_aligned->len); fprintf(stdout, "---------\n"); - + /* note just ignores the error ant print the bytes form the octet_aligned later */ } else { /* @@ -927,91 +921,75 @@ static void display_record(Z_External *r) } } } - if (oid && !oid_oidcmp(oid, yaz_oid_recsyn_soif)) - { - print_record((const unsigned char *) r->u.octet_aligned->buf, - r->u.octet_aligned->len); - if (marc_file) - fwrite (r->u.octet_aligned->buf, 1, r->u.octet_aligned->len, marc_file); - } - else if (oid && r->which == Z_External_octet) + if (oid && r->which == Z_External_octet) { - const char *octet_buf = (char*)r->u.octet_aligned->buf; - if (oid && (!oid_oidcmp(oid, yaz_oid_recsyn_xml) - || !oid_oidcmp(oid, yaz_oid_recsyn_xml) - || !oid_oidcmp(oid, yaz_oid_recsyn_html))) - { - print_record((const unsigned char *) octet_buf, - r->u.octet_aligned->len); - } - else if (oid && !oid_oidcmp(oid, yaz_oid_recsyn_postscript)) + const char *octet_buf = (const char*)r->u.octet_aligned->buf; + size_t octet_len = r->u.octet_aligned->len; + if (!oid_oidcmp(oid, yaz_oid_recsyn_xml) + || !oid_oidcmp(oid, yaz_oid_recsyn_xml) + || !oid_oidcmp(oid, yaz_oid_recsyn_html)) { - int size = r->u.octet_aligned->len; - if (size > 100) - size = 100; - print_record((const unsigned char *) octet_buf, size); + print_xml_record(octet_buf, octet_len); + } - else + else if (yaz_oid_is_iso2709(oid)) { - if (oid && yaz_oid_is_iso2709(oid)) - { - const char *result; - size_t rlen; - yaz_iconv_t cd = 0; - yaz_marc_t mt = yaz_marc_create(); - const char *from = 0; + const char *result; + size_t rlen; + yaz_iconv_t cd = 0; + yaz_marc_t mt = yaz_marc_create(); + const char *from = 0; - if (marcCharset && !strcmp(marcCharset, "auto")) + if (marcCharset && !strcmp(marcCharset, "auto")) + { + if (!oid_oidcmp(oid, yaz_oid_recsyn_usmarc)) { - if (!oid_oidcmp(oid, yaz_oid_recsyn_usmarc)) - { - if (octet_buf[9] == 'a') - from = "UTF-8"; - else - from = "MARC-8"; - } - else - from = "ISO-8859-1"; - } - else if (marcCharset) - from = marcCharset; - if (outputCharset && from) - { - cd = yaz_iconv_open(outputCharset, from); - printf ("convert from %s to %s", from, - outputCharset); - if (!cd) - printf (" unsupported\n"); + if (octet_buf[9] == 'a') + from = "UTF-8"; else - { - yaz_marc_iconv(mt, cd); - printf ("\n"); - } + from = "MARC-8"; } - - if (yaz_marc_decode_buf(mt, octet_buf, r->u.octet_aligned->len, - &result, &rlen)> 0) + else + from = "ISO-8859-1"; + } + else if (marcCharset) + from = marcCharset; + if (outputCharset && from) + { + cd = yaz_iconv_open(outputCharset, from); + printf("convert from %s to %s", from, + outputCharset); + if (!cd) + printf(" unsupported\n"); + else { - fwrite (result, rlen, 1, stdout); + yaz_marc_iconv(mt, cd); + printf("\n"); } - else + } + + if (yaz_marc_decode_buf(mt, octet_buf, octet_len, + &result, &rlen)> 0) + { + if (fwrite(result, rlen, 1, stdout) != 1) { - printf ("bad MARC. Dumping as it is:\n"); - print_record((const unsigned char*) octet_buf, - r->u.octet_aligned->len); - } - yaz_marc_destroy(mt); - if (cd) - yaz_iconv_close(cd); + printf("write to stdout failed\n"); + } } else { - print_record((const unsigned char*) octet_buf, - r->u.octet_aligned->len); + printf("bad MARC. Dumping as it is:\n"); + print_record(octet_buf, octet_len); } + yaz_marc_destroy(mt); + if (cd) + yaz_iconv_close(cd); } - if (marc_file) - fwrite (octet_buf, 1, r->u.octet_aligned->len, marc_file); + else + { + print_record(octet_buf, octet_len); + } + marc_file_write(octet_buf, r->u.octet_aligned->len); } else if (oid && !oid_oidcmp(oid, yaz_oid_recsyn_sutrs)) { @@ -1020,9 +998,8 @@ static void display_record(Z_External *r) printf("Expecting single SUTRS type for SUTRS.\n"); return; } - print_record(r->u.sutrs->buf, r->u.sutrs->len); - if (marc_file) - fwrite (r->u.sutrs->buf, 1, r->u.sutrs->len, marc_file); + print_record((const char *) r->u.sutrs->buf, r->u.sutrs->len); + marc_file_write((const char *) r->u.sutrs->buf, r->u.sutrs->len); } else if (oid && !oid_oidcmp(oid, yaz_oid_recsyn_grs_1)) { @@ -1034,7 +1011,7 @@ static void display_record(Z_External *r) } w = wrbuf_alloc(); yaz_display_grs1(w, r->u.grs1, 0); - puts (wrbuf_cstr(w)); + puts(wrbuf_cstr(w)); wrbuf_destroy(w); } else if (oid && !oid_oidcmp(oid, yaz_oid_recsyn_opac)) @@ -1047,7 +1024,7 @@ static void display_record(Z_External *r) Z_HoldingsRecord *h = r->u.opac->holdingsData[i]; if (h->which == Z_HoldingsRecord_marcHoldingsRecord) { - printf ("MARC holdings %d\n", i); + printf("MARC holdings %d\n", i); display_record(h->u.marcHoldingsRecord); } else if (h->which == Z_HoldingsRecord_holdingsAndCirc) @@ -1056,90 +1033,90 @@ static void display_record(Z_External *r) Z_HoldingsAndCircData *data = h->u.holdingsAndCirc; - printf ("Data holdings %d\n", i); + printf("Data holdings %d\n", i); if (data->typeOfRecord) - printf ("typeOfRecord: %s\n", data->typeOfRecord); + printf("typeOfRecord: %s\n", data->typeOfRecord); if (data->encodingLevel) - printf ("encodingLevel: %s\n", data->encodingLevel); + printf("encodingLevel: %s\n", data->encodingLevel); if (data->receiptAcqStatus) - printf ("receiptAcqStatus: %s\n", data->receiptAcqStatus); + printf("receiptAcqStatus: %s\n", data->receiptAcqStatus); if (data->generalRetention) - printf ("generalRetention: %s\n", data->generalRetention); + printf("generalRetention: %s\n", data->generalRetention); if (data->completeness) - printf ("completeness: %s\n", data->completeness); + printf("completeness: %s\n", data->completeness); if (data->dateOfReport) - printf ("dateOfReport: %s\n", data->dateOfReport); + printf("dateOfReport: %s\n", data->dateOfReport); if (data->nucCode) - printf ("nucCode: %s\n", data->nucCode); + printf("nucCode: %s\n", data->nucCode); if (data->localLocation) - printf ("localLocation: %s\n", data->localLocation); + printf("localLocation: %s\n", data->localLocation); if (data->shelvingLocation) - printf ("shelvingLocation: %s\n", data->shelvingLocation); + printf("shelvingLocation: %s\n", data->shelvingLocation); if (data->callNumber) - printf ("callNumber: %s\n", data->callNumber); + printf("callNumber: %s\n", data->callNumber); if (data->shelvingData) - printf ("shelvingData: %s\n", data->shelvingData); + printf("shelvingData: %s\n", data->shelvingData); if (data->copyNumber) - printf ("copyNumber: %s\n", data->copyNumber); + printf("copyNumber: %s\n", data->copyNumber); if (data->publicNote) - printf ("publicNote: %s\n", data->publicNote); + printf("publicNote: %s\n", data->publicNote); if (data->reproductionNote) - printf ("reproductionNote: %s\n", data->reproductionNote); + printf("reproductionNote: %s\n", data->reproductionNote); if (data->termsUseRepro) - printf ("termsUseRepro: %s\n", data->termsUseRepro); + printf("termsUseRepro: %s\n", data->termsUseRepro); if (data->enumAndChron) - printf ("enumAndChron: %s\n", data->enumAndChron); + printf("enumAndChron: %s\n", data->enumAndChron); for (j = 0; jnum_volumes; j++) { - printf ("volume %d\n", j); + printf("volume %d\n", j); if (data->volumes[j]->enumeration) - printf (" enumeration: %s\n", + printf(" enumeration: %s\n", data->volumes[j]->enumeration); if (data->volumes[j]->chronology) - printf (" chronology: %s\n", + printf(" chronology: %s\n", data->volumes[j]->chronology); if (data->volumes[j]->enumAndChron) - printf (" enumAndChron: %s\n", + printf(" enumAndChron: %s\n", data->volumes[j]->enumAndChron); } for (j = 0; jnum_circulationData; j++) { - printf ("circulation %d\n", j); + printf("circulation %d\n", j); if (data->circulationData[j]->availableNow) - printf (" availableNow: %d\n", + printf(" availableNow: %d\n", *data->circulationData[j]->availableNow); if (data->circulationData[j]->availablityDate) - printf (" availabiltyDate: %s\n", + printf(" availabiltyDate: %s\n", data->circulationData[j]->availablityDate); if (data->circulationData[j]->availableThru) - printf (" availableThru: %s\n", + printf(" availableThru: %s\n", data->circulationData[j]->availableThru); if (data->circulationData[j]->restrictions) - printf (" restrictions: %s\n", + printf(" restrictions: %s\n", data->circulationData[j]->restrictions); if (data->circulationData[j]->itemId) - printf (" itemId: %s\n", + printf(" itemId: %s\n", data->circulationData[j]->itemId); if (data->circulationData[j]->renewable) - printf (" renewable: %d\n", + printf(" renewable: %d\n", *data->circulationData[j]->renewable); if (data->circulationData[j]->onHold) - printf (" onHold: %d\n", + printf(" onHold: %d\n", *data->circulationData[j]->onHold); if (data->circulationData[j]->enumAndChron) - printf (" enumAndChron: %s\n", + printf(" enumAndChron: %s\n", data->circulationData[j]->enumAndChron); if (data->circulationData[j]->midspine) - printf (" midspine: %s\n", + printf(" midspine: %s\n", data->circulationData[j]->midspine); if (data->circulationData[j]->temporaryLocation) - printf (" temporaryLocation: %s\n", + printf(" temporaryLocation: %s\n", data->circulationData[j]->temporaryLocation); } } } } - else + else { printf("Unknown record representation.\n"); if (!z_External(print, &r, 0, 0)) @@ -1179,14 +1156,15 @@ static void display_diagrecs(Z_DiagRec **pp, int num) if (oid_oidcmp(r->diagnosticSetId, yaz_oid_diagset_bib_1)) printf("Unknown diagset: %s\n", diag_name); } - printf(" [%d] %s", *r->condition, diagbib1_str(*r->condition)); + printf(" [" ODR_INT_PRINTF "] %s", + *r->condition, diagbib1_str(*r->condition)); switch (r->which) { case Z_DefaultDiagFormat_v2Addinfo: - printf (" -- v2 addinfo '%s'\n", r->u.v2Addinfo); + printf(" -- v2 addinfo '%s'\n", r->u.v2Addinfo); break; case Z_DefaultDiagFormat_v3Addinfo: - printf (" -- v3 addinfo '%s'\n", r->u.v3Addinfo); + printf(" -- v3 addinfo '%s'\n", r->u.v3Addinfo); break; } } @@ -1212,12 +1190,12 @@ static void display_records(Z_Records *p) Z_DiagRec dr, *dr_p = &dr; dr.which = Z_DiagRec_defaultFormat; dr.u.defaultFormat = p->u.nonSurrogateDiagnostic; - display_diagrecs (&dr_p, 1); + display_diagrecs(&dr_p, 1); } else if (p->which == Z_Records_multipleNSD) - display_diagrecs (p->u.multipleNonSurDiagnostics->diagRecs, + display_diagrecs(p->u.multipleNonSurDiagnostics->diagRecs, p->u.multipleNonSurDiagnostics->num_diagRecs); - else + else { printf("Records: %d\n", p->u.databaseOrSurDiagnostics->num_records); for (i = 0; i < p->u.databaseOrSurDiagnostics->num_records; i++) @@ -1225,7 +1203,7 @@ static void display_records(Z_Records *p) } } -static int send_deleteResultSetRequest(const char *arg) +static int send_Z3950_deleteResultSetRequest(const char *arg) { char names[8][32]; int i; @@ -1233,20 +1211,19 @@ static int send_deleteResultSetRequest(const char *arg) Z_APDU *apdu = zget_APDU(out, Z_APDU_deleteResultSetRequest); Z_DeleteResultSetRequest *req = apdu->u.deleteResultSetRequest; - req->referenceId = set_refid (out); + req->referenceId = set_refid(out); req->num_resultSetList = - sscanf (arg, "%30s %30s %30s %30s %30s %30s %30s %30s", - names[0], names[1], names[2], names[3], - names[4], names[5], names[6], names[7]); + sscanf(arg, "%30s %30s %30s %30s %30s %30s %30s %30s", + names[0], names[1], names[2], names[3], + names[4], names[5], names[6], names[7]); - req->deleteFunction = (int *) - odr_malloc (out, sizeof(*req->deleteFunction)); + req->deleteFunction = odr_intdup(out, 0); if (req->num_resultSetList > 0) { *req->deleteFunction = Z_DeleteResultSetRequest_list; req->resultSetList = (char **) - odr_malloc (out, sizeof(*req->resultSetList)* + odr_malloc(out, sizeof(*req->resultSetList)* req->num_resultSetList); for (i = 0; inum_resultSetList; i++) req->resultSetList[i] = names[i]; @@ -1256,39 +1233,15 @@ static int send_deleteResultSetRequest(const char *arg) *req->deleteFunction = Z_DeleteResultSetRequest_all; req->resultSetList = 0; } - + send_apdu(apdu); printf("Sent deleteResultSetRequest.\n"); return 2; } #if YAZ_HAVE_XML2 -static int send_srw(Z_SRW_PDU *sr) +static int send_gdu(Z_GDU *gdu) { - const char *charset = negotiationCharset; - const char *host_port = cur_host; - Z_GDU *gdu; - char *path = 0; - - path = (char *) odr_malloc(out, 2+strlen(databaseNames[0])); - *path = '/'; - strcpy(path+1, databaseNames[0]); - - gdu = z_get_HTTP_Request_host_path(out, host_port, path); - - if (!strcmp(sru_method, "get")) - { - yaz_sru_get_encode(gdu->u.HTTP_Request, sr, out, charset); - } - else if (!strcmp(sru_method, "post")) - { - yaz_sru_post_encode(gdu->u.HTTP_Request, sr, out, charset); - } - else if (!strcmp(sru_method, "soap")) - { - yaz_sru_soap_encode(gdu->u.HTTP_Request, sr, out, charset); - } - if (z_GDU(out, &gdu, 0, 0)) { /* encode OK */ @@ -1298,11 +1251,11 @@ static int send_srw(Z_SRW_PDU *sr) if (apdu_file) { if (!z_GDU(print, &gdu, 0, 0)) - printf ("Failed to print outgoing SRU package\n"); + printf("Failed to print outgoing SRU package\n"); odr_reset(print); } buf_out = odr_getbuf(out, &len_out, 0); - + /* we don't odr_reset(out), since we may need the buffer again */ do_hex_dump(buf_out, len_out); @@ -1314,56 +1267,174 @@ static int send_srw(Z_SRW_PDU *sr) } return 0; } -#endif -#if YAZ_HAVE_XML2 -static char *encode_SRW_term(ODR o, const char *q) +static int send_srw_host_path(Z_SRW_PDU *sr, const char *host_port, + char *path) { - const char *in_charset = "ISO-8859-1"; - WRBUF w = wrbuf_alloc(); - yaz_iconv_t cd; - char *res; - if (outputCharset) - in_charset = outputCharset; - cd = yaz_iconv_open("UTF-8", in_charset); - if (!cd) - { - wrbuf_destroy(w); - return odr_strdup(o, q); - } - wrbuf_iconv_write(w, cd, q, strlen(q)); - if (wrbuf_len(w)) - res = odr_strdup(o, wrbuf_cstr(w)); - else - res = odr_strdup(o, q); - yaz_iconv_close(cd); - wrbuf_destroy(w); - return res; -} + const char *charset = negotiationCharset; + Z_GDU *gdu; + gdu = z_get_HTTP_Request_host_path(out, host_port, path); -static int send_SRW_scanRequest(const char *arg, int pos, int num) -{ - Z_SRW_PDU *sr = 0; - - /* regular requestse .. */ - sr = yaz_srw_get(out, Z_SRW_scan_request); + if (auth) + { + if (auth->which == Z_IdAuthentication_open) + { + char **darray; + int num; + nmem_strsplit(out->mem, "/", auth->u.open, &darray, &num); + if (num >= 1) + sr->username = darray[0]; + if (num >= 2) + sr->password = darray[1]; + } + else if (auth->which == Z_IdAuthentication_idPass) + { + sr->username = auth->u.idPass->userId; + sr->password = auth->u.idPass->password; + } + } - switch(queryType) + if (!yaz_matchstr(sru_method, "get")) { - case QueryType_CQL: - sr->u.scan_request->query_type = Z_SRW_query_type_cql; - sr->u.scan_request->scanClause.cql = encode_SRW_term(out, arg); - break; - case QueryType_Prefix: - sr->u.scan_request->query_type = Z_SRW_query_type_pqf; - sr->u.scan_request->scanClause.pqf = encode_SRW_term(out, arg); + yaz_sru_get_encode(gdu->u.HTTP_Request, sr, out, charset); + } + else if (!yaz_matchstr(sru_method, "post")) + { + yaz_sru_post_encode(gdu->u.HTTP_Request, sr, out, charset); + } + else if (!yaz_matchstr(sru_method, "soap")) + { + yaz_sru_soap_encode(gdu->u.HTTP_Request, sr, out, charset); + } + else if (!yaz_matchstr(sru_method, "solr")) + { + yaz_solr_encode_request(gdu->u.HTTP_Request, sr, out, charset); + } + + return send_gdu(gdu); +} + +static int send_srw(Z_SRW_PDU *sr) +{ + char *path = yaz_encode_sru_dbpath_odr(out, databaseNames[0]); + return send_srw_host_path(sr, cur_host, path); +} + +static int send_SRW_redirect(const char *uri, Z_HTTP_Response *cookie_hres) +{ + const char *username = 0; + const char *password = 0; + struct Z_HTTP_Header *h; + char *combined_cookies = 0; + int combined_cookies_len = 0; + Z_GDU *gdu = get_HTTP_Request_url(out, uri); + + gdu->u.HTTP_Request->method = odr_strdup(out, "GET"); + z_HTTP_header_add(out, &gdu->u.HTTP_Request->headers, "Accept", + "text/xml"); + + for (h = cookie_hres->headers; h; h = h->next) + { + if (!strcmp(h->name, "Set-Cookie")) + { + char *cp; + + if (!(cp = strchr(h->value, ';'))) + cp = h->value + strlen(h->value); + if (cp - h->value >= 1) + { + combined_cookies = xrealloc(combined_cookies, combined_cookies_len + cp - h->value + 3); + memcpy(combined_cookies+combined_cookies_len, h->value, cp - h->value); + combined_cookies[combined_cookies_len + cp - h->value] = '\0'; + strcat(combined_cookies,"; "); + combined_cookies_len = strlen(combined_cookies); + } + } + } + if (combined_cookies_len) + { + z_HTTP_header_add(out, &gdu->u.HTTP_Request->headers, "Cookie", combined_cookies); + xfree(combined_cookies); + } + + if (auth) + { + if (auth->which == Z_IdAuthentication_open) + { + char **darray; + int num; + nmem_strsplit(out->mem, "/", auth->u.open, &darray, &num); + if (num >= 1) + username = darray[0]; + if (num >= 2) + password = darray[1]; + } + else if (auth->which == Z_IdAuthentication_idPass) + { + username = auth->u.idPass->userId; + password = auth->u.idPass->password; + } + } + + if (username && password) + { + z_HTTP_header_add_basic_auth(out, &gdu->u.HTTP_Request->headers, + username, password); + } + + return send_gdu(gdu); +} +#endif + +#if YAZ_HAVE_XML2 +static char *encode_SRW_term(ODR o, const char *q) +{ + const char *in_charset = "ISO-8859-1"; + WRBUF w = wrbuf_alloc(); + yaz_iconv_t cd; + char *res; + if (outputCharset) + in_charset = outputCharset; + cd = yaz_iconv_open("UTF-8", in_charset); + if (!cd) + { + wrbuf_destroy(w); + return odr_strdup(o, q); + } + wrbuf_iconv_write(w, cd, q, strlen(q)); + if (wrbuf_len(w)) + res = odr_strdup(o, wrbuf_cstr(w)); + else + res = odr_strdup(o, q); + yaz_iconv_close(cd); + wrbuf_destroy(w); + return res; +} + + +static int send_SRW_scanRequest(const char *arg, Odr_int *pos, int num) +{ + Z_SRW_PDU *sr = 0; + + /* regular requestse .. */ + sr = yaz_srw_get_pdu(out, Z_SRW_scan_request, sru_version); + + switch (queryType) + { + case QueryType_CQL: + sr->u.scan_request->query_type = Z_SRW_query_type_cql; + sr->u.scan_request->scanClause.cql = encode_SRW_term(out, arg); + break; + case QueryType_Prefix: + sr->u.scan_request->query_type = Z_SRW_query_type_pqf; + sr->u.scan_request->scanClause.pqf = encode_SRW_term(out, arg); break; default: - printf ("Only CQL and PQF supported in SRW\n"); + printf("Only CQL and PQF supported in SRW\n"); return 0; } - sr->u.scan_request->responsePosition = odr_intdup(out, pos); + sr->u.scan_request->responsePosition = pos; sr->u.scan_request->maximumTerms = odr_intdup(out, num); return send_srw(sr); } @@ -1371,7 +1442,7 @@ static int send_SRW_scanRequest(const char *arg, int pos, int num) static int send_SRW_searchRequest(const char *arg) { Z_SRW_PDU *sr = 0; - + if (!srw_sr) { assert(srw_sr_odr_out == 0); @@ -1382,12 +1453,13 @@ static int send_SRW_searchRequest(const char *arg) setno = 1; /* save this for later .. when fetching individual records */ - srw_sr = yaz_srw_get(srw_sr_odr_out, Z_SRW_searchRetrieve_request); - + srw_sr = yaz_srw_get_pdu(srw_sr_odr_out, Z_SRW_searchRetrieve_request, + sru_version); + /* regular request .. */ - sr = yaz_srw_get(out, Z_SRW_searchRetrieve_request); + sr = yaz_srw_get_pdu(out, Z_SRW_searchRetrieve_request, sru_version); - switch(queryType) + switch (queryType) { case QueryType_CQL: srw_sr->u.request->query_type = Z_SRW_query_type_cql; @@ -1404,11 +1476,12 @@ static int send_SRW_searchRequest(const char *arg) sr->u.request->query.pqf = encode_SRW_term(srw_sr_odr_out, arg); break; default: - printf ("Only CQL and PQF supported in SRW\n"); + printf("Only CQL and PQF supported in SRW\n"); return 0; } + sru_maximumRecords = 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")) @@ -1433,7 +1506,7 @@ static void query_charset_convert(Z_RPNQuery *q) } } -static int send_searchRequest(const char *arg) +static int send_Z3950_searchRequest(const char *arg) { Z_APDU *apdu = zget_APDU(out, Z_APDU_searchRequest); Z_SearchRequest *req = apdu->u.searchRequest; @@ -1456,25 +1529,30 @@ static int send_searchRequest(const char *arg) printf("CCL ERROR: %s\n", ccl_err_msg(error)); return 0; } - } else if (myQueryType == QueryType_CQL2RPN) { + } + else if (myQueryType == QueryType_CQL2RPN) + { /* ### All this code should be wrapped in a utility function */ CQL_parser parser; struct cql_node *node; const char *addinfo; - if (cqltrans == 0) { + if (cqltrans == 0) + { printf("Can't use CQL: no translation file. Try set_cqlfile\n"); return 0; } parser = cql_parser_create(); - if ((error = cql_parser_string(parser, arg)) != 0) { + if ((error = cql_parser_string(parser, arg)) != 0) + { printf("Can't parse CQL: must be a syntax error\n"); return 0; } node = cql_parser_result(parser); if ((error = cql_transform_buf(cqltrans, node, pqfbuf, - sizeof pqfbuf)) != 0) { + sizeof pqfbuf)) != 0) + { error = cql_transform_error(cqltrans, &addinfo); - printf ("Can't convert CQL to PQF: %s (addinfo=%s)\n", + printf("Can't convert CQL to PQF: %s (addinfo=%s)\n", cql_strerror(error), addinfo); return 0; } @@ -1482,7 +1560,7 @@ static int send_searchRequest(const char *arg) myQueryType = QueryType_Prefix; } - req->referenceId = set_refid (out); + req->referenceId = set_refid(out); if (!strcmp(arg, "@big")) /* strictly for troublemaking */ { static unsigned char big[2100]; @@ -1494,7 +1572,7 @@ static int send_searchRequest(const char *arg) bigo.buf = big; req->referenceId = &bigo; } - + if (setnumber >= 0) { sprintf(setstring, "%d", ++setnumber); @@ -1508,7 +1586,7 @@ static int send_searchRequest(const char *arg) { if (recordsyntax_size) req->preferredRecordSyntax = - yaz_string_to_oid_odr(yaz_oid_std(), + yaz_string_to_oid_odr(yaz_oid_std(), CLASS_RECSYN, recordsyntax_list[0], out); req->smallSetElementSetNames = @@ -1523,21 +1601,21 @@ static int send_searchRequest(const char *arg) { case QueryType_Prefix: query.which = Z_Query_type_1; - pqf_parser = yaz_pqf_create (); - RPNquery = yaz_pqf_parse (pqf_parser, out, arg); + pqf_parser = yaz_pqf_create(); + RPNquery = yaz_pqf_parse(pqf_parser, out, arg); if (!RPNquery) { const char *pqf_msg; size_t off; - int code = yaz_pqf_error (pqf_parser, &pqf_msg, &off); + int code = yaz_pqf_error(pqf_parser, &pqf_msg, &off); int ioff = off; printf("%*s^\n", ioff+4, ""); printf("Prefix query error: %s (code %d)\n", pqf_msg, code); - - yaz_pqf_destroy (pqf_parser); + + yaz_pqf_destroy(pqf_parser); return 0; } - yaz_pqf_destroy (pqf_parser); + yaz_pqf_destroy(pqf_parser); query_charset_convert(RPNquery); query.u.type_1 = RPNquery; break; @@ -1552,12 +1630,12 @@ static int send_searchRequest(const char *arg) RPNquery = ccl_rpn_query(out, rpn); if (!RPNquery) { - printf ("Couldn't convert from CCL to RPN\n"); + printf("Couldn't convert from CCL to RPN\n"); return 0; } query_charset_convert(RPNquery); query.u.type_1 = RPNquery; - ccl_rpn_delete (rpn); + ccl_rpn_delete(rpn); break; case QueryType_CQL: query.which = Z_Query_type_104; @@ -1570,7 +1648,7 @@ static int send_searchRequest(const char *arg) query.u.type_104 = ext; break; default: - printf ("Unsupported query type\n"); + printf("Unsupported query type\n"); return 0; } if (send_apdu(apdu)) @@ -1579,8 +1657,27 @@ static int send_searchRequest(const char *arg) return 2; } +static void display_term(Z_Term *term) +{ + switch (term->which) + { + case Z_Term_general: + printf("%.*s", term->u.general->len, term->u.general->buf); + break; + case Z_Term_characterString: + printf("%s", term->u.characterString); + break; + case Z_Term_numeric: + printf(ODR_INT_PRINTF, *term->u.numeric); + break; + case Z_Term_null: + printf("null"); + break; + } +} + /* display Query Expression as part of searchResult-1 */ -static void display_queryExpression (const char *lead, Z_QueryExpression *qe) +static void display_queryExpression(const char *lead, Z_QueryExpression *qe) { if (!qe) return; @@ -1590,27 +1687,80 @@ static void display_queryExpression (const char *lead, Z_QueryExpression *qe) if (qe->u.term->queryTerm) { Z_Term *term = qe->u.term->queryTerm; - switch (term->which) + display_term(term); + } + } +} + +static void display_facet(Z_FacetField *facet) +{ + if (facet->attributes) + { + Z_AttributeList *al = facet->attributes; + struct yaz_facet_attr attr_values; + attr_values.errcode = 0; + attr_values.limit = -1; + attr_values.useattr = "NONE"; + attr_values.relation = "default"; + + yaz_facet_attr_get_z_attributes(al, &attr_values); + if (!attr_values.errcode) + { + int term_index; + printf(" %s (%d): \n", attr_values.useattr, facet->num_terms); + for (term_index = 0 ; term_index < facet->num_terms; term_index++) { - case Z_Term_general: - printf ("%.*s", term->u.general->len, term->u.general->buf); - break; - case Z_Term_characterString: - printf ("%s", term->u.characterString); - break; - case Z_Term_numeric: - printf ("%d", *term->u.numeric); - break; - case Z_Term_null: - printf ("null"); - break; + Z_FacetTerm *facetTerm = facet->terms[term_index]; + printf(" "); + display_term(facetTerm->term); + printf(" (" NMEM_INT_PRINTF ")\n", *facetTerm->count); } } + + } +} + +static void* display_facets(Z_FacetList *fl) +{ + int index; + printf("Facets(%d): \n", fl->num); + + for (index = 0; index < fl->num ; index++) + { + display_facet(fl->elements[index]); + } + return 0; +} + +void display_searchResult1(Z_SearchInfoReport *sr) +{ + int j; + printf("SearchResult-1:"); + for (j = 0; j < sr->num; j++) + { + if (j) + printf(","); + if (!sr->elements[j]->subqueryExpression) + printf("%d", j); + display_queryExpression("term", + sr->elements[j]->subqueryExpression); + display_queryExpression("interpretation", + sr->elements[j]->subqueryInterpretation); + display_queryExpression("recommendation", + sr->elements[j]->subqueryRecommendation); + if (sr->elements[j]->subqueryCount) + printf(" cnt=" ODR_INT_PRINTF, + *sr->elements[j]->subqueryCount); + if (sr->elements[j]->subqueryId) + printf(" id=%s ", sr->elements[j]->subqueryId); } + printf("\n"); } + + /* see if we can find USR:SearchResult-1 */ -static void display_searchResult (Z_OtherInformation *o) +static void display_searchResult(Z_OtherInformation *o) { int i; if (!o) @@ -1620,52 +1770,32 @@ static void display_searchResult (Z_OtherInformation *o) if (o->list[i]->which == Z_OtherInfo_externallyDefinedInfo) { Z_External *ext = o->list[i]->information.externallyDefinedInfo; - + if (ext->which == Z_External_searchResult1) - { - int j; - Z_SearchInfoReport *sr = ext->u.searchResult1; - printf ("SearchResult-1:"); - for (j = 0; j < sr->num; j++) - { - if (j) - printf(","); - if (!sr->elements[j]->subqueryExpression) - printf("%d", j); - display_queryExpression("term", - sr->elements[j]->subqueryExpression); - display_queryExpression("interpretation", - sr->elements[j]->subqueryInterpretation); - display_queryExpression("recommendation", - sr->elements[j]->subqueryRecommendation); - if (sr->elements[j]->subqueryCount) - printf(" cnt=%d", *sr->elements[j]->subqueryCount); - if (sr->elements[j]->subqueryId) - printf(" id=%s ", sr->elements[j]->subqueryId); - } - printf ("\n"); - } + display_searchResult1(ext->u.searchResult1); + else if (ext->which == Z_External_userFacets) + display_facets(ext->u.facetList); } } } -static int process_searchResponse(Z_SearchResponse *res) +static int process_Z3950_searchResponse(Z_SearchResponse *res) { - printf ("Received SearchResponse.\n"); - print_refid (res->referenceId); + printf("Received SearchResponse.\n"); + print_refid(res->referenceId); if (*res->searchStatus) printf("Search was a success.\n"); else printf("Search was a bloomin' failure.\n"); - printf("Number of hits: %d", *res->resultCount); + printf("Number of hits: " ODR_INT_PRINTF, *res->resultCount); last_hit_count = *res->resultCount; if (setnumber >= 0) - printf (", setno %d", setnumber); + printf(", setno %d", setnumber); putchar('\n'); if (res->resultSetStatus) { printf("Result Set Status: "); - switch(*res->resultSetStatus) + switch (*res->resultSetStatus) { case Z_SearchResponse_subset: printf("subset"); break; @@ -1676,12 +1806,12 @@ static int process_searchResponse(Z_SearchResponse *res) case Z_SearchResponse_estimate: printf("estimate"); break; default: - printf("%d", *res->resultSetStatus); - } + printf(ODR_INT_PRINTF, *res->resultSetStatus); + } putchar('\n'); } - display_searchResult (res->additionalSearchInfo); - printf("records returned: %d\n", + display_searchResult(res->additionalSearchInfo); + printf("records returned: " ODR_INT_PRINTF "\n", *res->numberOfRecordsReturned); setno += *res->numberOfRecordsReturned; if (res->records) @@ -1696,7 +1826,16 @@ static void print_level(int iLevel) printf(" "); } -static void print_int(int iLevel, const char *pTag, int *pInt) +static void print_int(int iLevel, const char *pTag, Odr_int *pInt) +{ + if (pInt != NULL) + { + print_level(iLevel); + printf("%s: " ODR_INT_PRINTF "\n", pTag, *pInt); + } +} + +static void print_bool(int iLevel, const char *pTag, Odr_bool *pInt) { if (pInt != NULL) { @@ -1751,11 +1890,11 @@ static void print_string_or_numeric(int iLevel, const char *pTag, Z_StringOrNume case Z_StringOrNumeric_string: print_string(iLevel, pTag, pStringNumeric->u.string); break; - + case Z_StringOrNumeric_numeric: print_int(iLevel, pTag, pStringNumeric->u.numeric); break; - + default: print_level(iLevel); printf("%s: valid type for Z_StringOrNumeric\n", pTag); @@ -1807,12 +1946,12 @@ static void print_universe_report(int iLevel, Z_UniverseReport *pUniverseReport) print_universe_report_hits(iLevel, pUniverseReport->u.databaseHits); break; - + case Z_UniverseReport_duplicate: print_universe_report_duplicate(iLevel, pUniverseReport->u.duplicate); break; - + default: print_level(iLevel); printf("Type: %d\n", pUniverseReport->which); @@ -1836,7 +1975,7 @@ static void print_external(int iLevel, Z_External *pExternal) case Z_External_universeReport: print_universe_report(iLevel, pExternal->u.universeReport); break; - + default: print_level(iLevel); printf("Type: %d\n", pExternal->which); @@ -1845,53 +1984,54 @@ static void print_external(int iLevel, Z_External *pExternal) } } -static int process_resourceControlRequest (Z_ResourceControlRequest *req) +static int process_Z3950_resourceControlRequest(Z_ResourceControlRequest *req) { - printf ("Received ResourceControlRequest.\n"); + printf("Received ResourceControlRequest.\n"); print_referenceId(1, req->referenceId); - print_int(1, "Suspended Flag", req->suspendedFlag); + print_bool(1, "Suspended Flag", req->suspendedFlag); print_int(1, "Partial Results Available", req->partialResultsAvailable); - print_int(1, "Response Required", req->responseRequired); - print_int(1, "Triggered Request Flag", req->triggeredRequestFlag); + print_bool(1, "Response Required", req->responseRequired); + print_bool(1, "Triggered Request Flag", req->triggeredRequestFlag); print_external(1, req->resourceReport); return 0; } -void process_ESResponse(Z_ExtendedServicesResponse *res) +static void process_Z3950_ESResponse(Z_ExtendedServicesResponse *res) { printf("Status: "); switch (*res->operationStatus) { case Z_ExtendedServicesResponse_done: - printf ("done\n"); + printf("done\n"); break; case Z_ExtendedServicesResponse_accepted: - printf ("accepted\n"); + printf("accepted\n"); break; case Z_ExtendedServicesResponse_failure: - printf ("failure\n"); + printf("failure\n"); display_diagrecs(res->diagnostics, res->num_diagnostics); break; default: - printf ("unknown\n"); + printf("unknown\n"); } if ( (*res->operationStatus != Z_ExtendedServicesResponse_failure) && - (res->num_diagnostics != 0) ) { + (res->num_diagnostics != 0) ) + { display_diagrecs(res->diagnostics, res->num_diagnostics); } print_refid (res->referenceId); - if (res->taskPackage && + if (res->taskPackage && res->taskPackage->which == Z_External_extendedService) { Z_TaskPackage *taskPackage = res->taskPackage->u.extendedService; Odr_oct *id = taskPackage->targetReference; Z_External *ext = taskPackage->taskSpecificParameters; - + if (id) { - printf ("Target Reference: "); - print_stringn (id->buf, id->len); - printf ("\n"); + printf("Target Reference: "); + print_stringn((const char *) id->buf, id->len); + printf("\n"); } if (ext->which == Z_External_update) { @@ -1906,14 +2046,42 @@ void process_ESResponse(Z_ExtendedServicesResponse *res) Z_IUTaskPackageRecordStructure *tpr = targetPart->taskPackageRecords[i]; - printf ("task package record %d\n", i+1); + printf("task package record %d\n", i+1); if (tpr->which == Z_IUTaskPackageRecordStructure_record) { display_record (tpr->u.record); } else { - printf ("other type\n"); + printf("other type\n"); + } + } + } + } + if (ext->which == Z_External_itemOrder) + { + Z_IOTaskPackage *otp = ext->u.itemOrder->u.taskPackage; + + if (otp && otp->targetPart) + { + if (otp->targetPart->itemRequest) + { + Z_External *ext = otp->targetPart->itemRequest; + if (ext->which == Z_External_octet) + { + Odr_oct *doc = ext->u.octet_aligned; + printf("Got itemRequest doc %.*s\n", + doc->len, doc->buf); + } + } + else if (otp->targetPart->statusOrErrorReport) + { + Z_External *ext = otp->targetPart->statusOrErrorReport; + if (ext->which == Z_External_octet) + { + Odr_oct *doc = ext->u.octet_aligned; + printf("Got Status or Error Report doc %.*s\n", + doc->len, doc->buf); } } } @@ -1926,7 +2094,7 @@ void process_ESResponse(Z_ExtendedServicesResponse *res) } } -const char *get_ill_element (void *clientData, const char *element) +static const char *get_ill_element(void *clientData, const char *element) { return 0; } @@ -1942,12 +2110,12 @@ static Z_External *create_external_itemRequest(void) ctl.odr = out; ctl.clientData = 0; ctl.f = get_ill_element; - + req = ill_get_ItemRequest(&ctl, "ill", 0); if (!req) - printf ("ill_get_ItemRequest failed\n"); - - if (!ill_ItemRequest (out, &req, 0, 0)) + printf("ill_get_ItemRequest failed\n"); + + if (!ill_ItemRequest(out, &req, 0, 0)) { if (apdu_file) { @@ -1957,39 +2125,40 @@ static Z_External *create_external_itemRequest(void) item_request_buf = odr_getbuf (out, &item_request_size, 0); if (item_request_buf) odr_setbuf (out, item_request_buf, item_request_size, 1); - printf ("Couldn't encode ItemRequest, size %d\n", item_request_size); + printf("Couldn't encode ItemRequest, size %d\n", item_request_size); return 0; } else { - r = (Z_External *) odr_malloc (out, sizeof(*r)); + item_request_buf = odr_getbuf (out, &item_request_size, 0); + r = (Z_External *) odr_malloc(out, sizeof(*r)); r->direct_reference = odr_oiddup(out, yaz_oid_general_isoill_1); r->indirect_reference = 0; r->descriptor = 0; r->which = Z_External_single; - + r->u.single_ASN1_type = (Odr_oct *) - odr_malloc (out, sizeof(*r->u.single_ASN1_type)); + odr_malloc(out, sizeof(*r->u.single_ASN1_type)); r->u.single_ASN1_type->buf = (unsigned char *) - odr_malloc (out, item_request_size); + odr_malloc(out, item_request_size); r->u.single_ASN1_type->len = item_request_size; r->u.single_ASN1_type->size = item_request_size; - memcpy (r->u.single_ASN1_type->buf, item_request_buf, + memcpy(r->u.single_ASN1_type->buf, item_request_buf, item_request_size); - + do_hex_dump(item_request_buf,item_request_size); } return r; } -static Z_External *create_external_ILL_APDU(int which) +static Z_External *create_external_ILL_APDU(void) { struct ill_get_ctl ctl; ILL_APDU *ill_apdu; Z_External *r = 0; int ill_request_size = 0; char *ill_request_buf = 0; - + ctl.odr = out; ctl.clientData = 0; ctl.f = get_ill_element; @@ -2000,35 +2169,35 @@ static Z_External *create_external_ILL_APDU(int which) { if (apdu_file) { - printf ("-------------------\n"); + printf("-------------------\n"); ill_APDU(print, &ill_apdu, 0, 0); odr_reset(print); - printf ("-------------------\n"); + printf("-------------------\n"); } ill_request_buf = odr_getbuf (out, &ill_request_size, 0); if (ill_request_buf) odr_setbuf (out, ill_request_buf, ill_request_size, 1); - printf ("Couldn't encode ILL-Request, size %d\n", ill_request_size); + printf("Couldn't encode ILL-Request, size %d\n", ill_request_size); return 0; } else { ill_request_buf = odr_getbuf (out, &ill_request_size, 0); - - r = (Z_External *) odr_malloc (out, sizeof(*r)); + + r = (Z_External *) odr_malloc(out, sizeof(*r)); r->direct_reference = odr_oiddup(out, yaz_oid_general_isoill_1); r->indirect_reference = 0; r->descriptor = 0; r->which = Z_External_single; - + r->u.single_ASN1_type = (Odr_oct *) - odr_malloc (out, sizeof(*r->u.single_ASN1_type)); + odr_malloc(out, sizeof(*r->u.single_ASN1_type)); r->u.single_ASN1_type->buf = (unsigned char *) - odr_malloc (out, ill_request_size); + odr_malloc(out, ill_request_size); r->u.single_ASN1_type->len = ill_request_size; r->u.single_ASN1_type->size = ill_request_size; - memcpy (r->u.single_ASN1_type->buf, ill_request_buf, ill_request_size); -/* printf ("len = %d\n", ill_request_size); */ + memcpy(r->u.single_ASN1_type->buf, ill_request_buf, ill_request_size); +/* printf("len = %d\n", ill_request_size); */ /* do_hex_dump(ill_request_buf,ill_request_size); */ /* printf("--- end of extenal\n"); */ @@ -2037,7 +2206,9 @@ static Z_External *create_external_ILL_APDU(int which) } -static Z_External *create_ItemOrderExternal(const char *type, int itemno) +static Z_External *create_ItemOrderExternal(const char *type, int itemno, + const char *xml_buf, + int xml_len) { Z_External *r = (Z_External *) odr_malloc(out, sizeof(Z_External)); r->direct_reference = odr_oiddup(out, yaz_oid_extserv_item_order); @@ -2050,7 +2221,7 @@ static Z_External *create_ItemOrderExternal(const char *type, int itemno) memset(r->u.itemOrder, 0, sizeof(Z_ItemOrder)); r->u.itemOrder->which=Z_IOItemOrder_esRequest; - r->u.itemOrder->u.esRequest = (Z_IORequest *) + r->u.itemOrder->u.esRequest = (Z_IORequest *) odr_malloc(out,sizeof(Z_IORequest)); memset(r->u.itemOrder->u.esRequest, 0, sizeof(Z_IORequest)); @@ -2071,31 +2242,33 @@ static Z_External *create_ItemOrderExternal(const char *type, int itemno) r->u.itemOrder->u.esRequest->notToKeep->resultSetItem->resultSetId = "1"; r->u.itemOrder->u.esRequest->notToKeep->resultSetItem->item = - (int *) odr_malloc(out, sizeof(int)); - *r->u.itemOrder->u.esRequest->notToKeep->resultSetItem->item = itemno; - + odr_intdup(out, itemno); if (!strcmp (type, "item") || !strcmp(type, "2")) { - printf ("using item-request\n"); - r->u.itemOrder->u.esRequest->notToKeep->itemRequest = + printf("using item-request\n"); + r->u.itemOrder->u.esRequest->notToKeep->itemRequest = create_external_itemRequest(); } else if (!strcmp(type, "ill") || !strcmp(type, "1")) { - printf ("using ILL-request\n"); - r->u.itemOrder->u.esRequest->notToKeep->itemRequest = - create_external_ILL_APDU(ILL_APDU_ILL_Request); + printf("using ILL-request\n"); + r->u.itemOrder->u.esRequest->notToKeep->itemRequest = + create_external_ILL_APDU(); } else if (!strcmp(type, "xml") || !strcmp(type, "3")) { - const char *xml_buf = - "\n" - " request\n" - " 000200\n" - " 1212 \n" - ""; - r->u.itemOrder->u.esRequest->notToKeep->itemRequest = - z_ext_record_oid(out, yaz_oid_recsyn_xml, xml_buf, strlen(xml_buf)); + printf("using XML ILL-request\n"); + + if (!xml_buf) + { + printf("no docoument added\n"); + r->u.itemOrder->u.esRequest->notToKeep->itemRequest = 0; + } + else + { + r->u.itemOrder->u.esRequest->notToKeep->itemRequest = + z_ext_record_oid(out, yaz_oid_recsyn_xml, xml_buf, xml_len); + } } else r->u.itemOrder->u.esRequest->notToKeep->itemRequest = 0; @@ -2103,7 +2276,8 @@ static Z_External *create_ItemOrderExternal(const char *type, int itemno) return r; } -static int send_itemorder(const char *type, int itemno) +static int send_Z3950_itemorder(const char *type, int itemno, + const char *xml_buf, int xml_len) { Z_APDU *apdu = zget_APDU(out, Z_APDU_extendedServicesRequest); Z_ExtendedServicesRequest *req = apdu->u.extendedServicesRequest; @@ -2113,8 +2287,8 @@ static int send_itemorder(const char *type, int itemno) req->packageType = odr_oiddup(out, yaz_oid_extserv_item_order); req->packageName = esPackageName; - req->taskSpecificParameters = create_ItemOrderExternal(type, itemno); - + req->taskSpecificParameters = create_ItemOrderExternal(type, itemno, + xml_buf, xml_len); send_apdu(apdu); return 0; } @@ -2123,12 +2297,12 @@ static int only_z3950(void) { if (!conn) { - printf ("Not connected yet\n"); + printf("Not connected yet\n"); return 1; } if (protocol == PROTO_HTTP) { - printf ("Not supported by SRW\n"); + printf("Not supported by SRW\n"); return 1; } return 0; @@ -2146,25 +2320,27 @@ static int cmd_update0(const char *arg) return cmd_update_common(arg, 0); } -static int cmd_update_Z3950(int version, int action_no, const char *recid, +static int send_Z3950_update(int version, int action_no, const char *recid, char *rec_buf, int rec_len); -static int cmd_update_SRW(int action_no, const char *recid, +#if YAZ_HAVE_XML2 +static int send_SRW_update(int action_no, const char *recid, char *rec_buf, int rec_len); +#endif static int cmd_update_common(const char *arg, int version) { - char action[20], recid_buf[20]; + char *action_buf; + int action_len; + char *recid_buf; + int recid_len; const char *recid = 0; char *rec_buf; int rec_len; int action_no; int noread = 0; - *action = 0; - *recid_buf = 0; - sscanf (arg, "%19s %19s%n", action, recid_buf, &noread); - if (noread == 0) + if (parse_cmd_doc(&arg, out, &action_buf, &action_len) == 0) { printf("Use: update action recid [fname]\n"); printf(" where action is one of insert,replace,delete.update\n"); @@ -2173,18 +2349,24 @@ static int cmd_update_common(const char *arg, int version) return 0; } - if (!strcmp (action, "insert")) + if (parse_cmd_doc(&arg, out, &recid_buf, &recid_len) == 0) + { + printf("Missing recid\n"); + return 0; + } + + if (!strcmp(action_buf, "insert")) action_no = Z_IUOriginPartToKeep_recordInsert; - else if (!strcmp (action, "replace")) + else if (!strcmp(action_buf, "replace")) action_no = Z_IUOriginPartToKeep_recordReplace; - else if (!strcmp (action, "delete")) + else if (!strcmp(action_buf, "delete")) action_no = Z_IUOriginPartToKeep_recordDelete; - else if (!strcmp (action, "update")) + else if (!strcmp(action_buf, "update")) action_no = Z_IUOriginPartToKeep_specialUpdate; - else + else { - printf ("Bad action: %s\n", action); - printf ("Possible values: insert, replace, delete, update\n"); + printf("Bad action: %s\n", action_buf); + printf("Possible values: insert, replace, delete, update\n"); return 0; } @@ -2192,22 +2374,22 @@ static int cmd_update_common(const char *arg, int version) recid = recid_buf; arg += noread; - if (parse_cmd_doc(&arg, out, &rec_buf, &rec_len, 1) == 0) + if (parse_cmd_doc(&arg, out, &rec_buf, &rec_len) == 0) return 0; #if YAZ_HAVE_XML2 if (protocol == PROTO_HTTP) - return cmd_update_SRW(action_no, recid, rec_buf, rec_len); + return send_SRW_update(action_no, recid, rec_buf, rec_len); #endif - return cmd_update_Z3950(version, action_no, recid, rec_buf, rec_len); + return send_Z3950_update(version, action_no, recid, rec_buf, rec_len); } #if YAZ_HAVE_XML2 -static int cmd_update_SRW(int action_no, const char *recid, - char *rec_buf, int rec_len) +static int send_SRW_update(int action_no, const char *recid, + char *rec_buf, int rec_len) { if (!conn) - cmd_open(0); + session_connect(cur_host); if (!conn) return 0; else @@ -2215,7 +2397,7 @@ static int cmd_update_SRW(int action_no, const char *recid, Z_SRW_PDU *srw = yaz_srw_get(out, Z_SRW_update_request); Z_SRW_updateRequest *sr = srw->u.update_request; - switch(action_no) + switch (action_no) { case Z_IUOriginPartToKeep_recordInsert: sr->operation = "info:srw/action/1/create"; @@ -2240,8 +2422,8 @@ static int cmd_update_SRW(int action_no, const char *recid, } } #endif - -static int cmd_update_Z3950(int version, int action_no, const char *recid, + +static int send_Z3950_update(int version, int action_no, const char *recid, char *rec_buf, int rec_len) { Z_APDU *apdu = zget_APDU(out, Z_APDU_extendedServicesRequest ); @@ -2255,22 +2437,22 @@ static int cmd_update_Z3950(int version, int action_no, const char *recid, { if (!record_last) { - printf ("No last record (update ignored)\n"); + printf("No last record (update ignored)\n"); return 0; } record_this = record_last; } - req->packageType = odr_oiddup(out, (version == 0 ? + req->packageType = odr_oiddup(out, (version == 0 ? yaz_oid_extserv_database_update_first_version : yaz_oid_extserv_database_update)); req->packageName = esPackageName; - + req->referenceId = set_refid (out); r = req->taskSpecificParameters = (Z_External *) - odr_malloc (out, sizeof(*r)); + odr_malloc(out, sizeof(*r)); r->direct_reference = req->packageType; r->indirect_reference = 0; r->descriptor = 0; @@ -2286,14 +2468,19 @@ static int cmd_update_Z3950(int version, int action_no, const char *recid, odr_malloc(out, sizeof(*r->u.update0->u.esRequest)); toKeep = r->u.update0->u.esRequest->toKeep = (Z_IU0OriginPartToKeep *) odr_malloc(out, sizeof(*r->u.update0->u.esRequest->toKeep)); - + toKeep->databaseName = databaseNames[0]; toKeep->schema = 0; + if (record_schema) + { + toKeep->schema = yaz_string_to_oid_odr(yaz_oid_std(), + CLASS_SCHEMA, + record_schema, out); + } toKeep->elementSetName = 0; - toKeep->action = (int *) odr_malloc(out, sizeof(*toKeep->action)); - *toKeep->action = action_no; - + toKeep->action = odr_intdup(out, action_no); + notToKeep = r->u.update0->u.esRequest->notToKeep = (Z_IU0SuppliedRecords *) odr_malloc(out, sizeof(*r->u.update0->u.esRequest->notToKeep)); notToKeep->num = 1; @@ -2305,7 +2492,7 @@ static int cmd_update_Z3950(int version, int action_no, const char *recid, if (recid) { notToKeep->elements[0]->u.opaque = (Odr_oct *) - odr_malloc (out, sizeof(Odr_oct)); + odr_malloc(out, sizeof(Odr_oct)); notToKeep->elements[0]->u.opaque->buf = (unsigned char *) recid; notToKeep->elements[0]->u.opaque->size = strlen(recid); notToKeep->elements[0]->u.opaque->len = strlen(recid); @@ -2328,13 +2515,18 @@ static int cmd_update_Z3950(int version, int action_no, const char *recid, odr_malloc(out, sizeof(*r->u.update->u.esRequest)); toKeep = r->u.update->u.esRequest->toKeep = (Z_IUOriginPartToKeep *) odr_malloc(out, sizeof(*r->u.update->u.esRequest->toKeep)); - + toKeep->databaseName = databaseNames[0]; toKeep->schema = 0; + if (record_schema) + { + toKeep->schema = yaz_string_to_oid_odr(yaz_oid_std(), + CLASS_SCHEMA, + record_schema, out); + } toKeep->elementSetName = 0; toKeep->actionQualifier = 0; - toKeep->action = (int *) odr_malloc(out, sizeof(*toKeep->action)); - *toKeep->action = action_no; + toKeep->action = odr_intdup(out, action_no); notToKeep = r->u.update->u.esRequest->notToKeep = (Z_IUSuppliedRecords *) odr_malloc(out, sizeof(*r->u.update->u.esRequest->notToKeep)); @@ -2347,7 +2539,7 @@ static int cmd_update_Z3950(int version, int action_no, const char *recid, if (recid) { notToKeep->elements[0]->u.opaque = (Odr_oct *) - odr_malloc (out, sizeof(Odr_oct)); + odr_malloc(out, sizeof(Odr_oct)); notToKeep->elements[0]->u.opaque->buf = (unsigned char *) recid; notToKeep->elements[0]->u.opaque->size = strlen(recid); notToKeep->elements[0]->u.opaque->len = strlen(recid); @@ -2358,7 +2550,7 @@ static int cmd_update_Z3950(int version, int action_no, const char *recid, notToKeep->elements[0]->correlationInfo = 0; notToKeep->elements[0]->record = record_this; } - + send_apdu(apdu); return 2; @@ -2376,16 +2568,16 @@ static int cmd_xmles(const char *arg) char oid_str[51]; Z_APDU *apdu = zget_APDU(out, Z_APDU_extendedServicesRequest); Z_ExtendedServicesRequest *req = apdu->u.extendedServicesRequest; - + Z_External *ext = (Z_External *) odr_malloc(out, sizeof(*ext)); - + req->referenceId = set_refid (out); req->taskSpecificParameters = ext; ext->indirect_reference = 0; ext->descriptor = 0; ext->which = Z_External_octet; - ext->u.single_ASN1_type = (Odr_oct *) odr_malloc (out, sizeof(Odr_oct)); + ext->u.single_ASN1_type = (Odr_oct *) odr_malloc(out, sizeof(Odr_oct)); sscanf(arg, "%50s%n", oid_str, &noread); if (noread == 0) { @@ -2394,7 +2586,7 @@ static int cmd_xmles(const char *arg) } arg += noread; if (parse_cmd_doc(&arg, out, &asn_buf, - &ext->u.single_ASN1_type->len, 0) == 0) + &ext->u.single_ASN1_type->len) == 0) return 0; ext->u.single_ASN1_type->buf = (unsigned char *) asn_buf; @@ -2408,11 +2600,11 @@ static int cmd_xmles(const char *arg) } req->packageType = oid; - + ext->direct_reference = oid; send_apdu(apdu); - + return 2; } } @@ -2421,21 +2613,25 @@ static int cmd_itemorder(const char *arg) { char type[12]; int itemno; - + char *xml_buf = 0; + int xml_len = 0; + int no_read = 0; + if (only_z3950()) return 1; - if (sscanf (arg, "%10s %d", type, &itemno) != 2) + if (sscanf(arg, "%10s %d%n", type, &itemno, &no_read) < 2) return 0; + arg += no_read; + parse_cmd_doc(&arg, out, &xml_buf, &xml_len); - printf("Item order request\n"); fflush(stdout); - send_itemorder(type, itemno); + send_Z3950_itemorder(type, itemno, xml_buf, xml_len); return 2; } static void show_opt(const char *arg, void *clientData) { - printf ("%s ", arg); + printf("%s ", arg); } static int cmd_zversion(const char *arg) @@ -2443,7 +2639,7 @@ static int cmd_zversion(const char *arg) if (*arg && arg) z3950_version = atoi(arg); else - printf ("version is %d\n", z3950_version); + printf("version is %d\n", z3950_version); return 0; } @@ -2460,7 +2656,7 @@ static int cmd_options(const char *arg) else { yaz_init_opt_decode(&z3950_options, show_opt, 0); - printf ("\n"); + printf("\n"); } return 0; } @@ -2471,16 +2667,16 @@ static int cmd_explain(const char *arg) return 0; #if YAZ_HAVE_XML2 if (!conn) - cmd_open(0); + session_connect(cur_host); if (conn) { Z_SRW_PDU *sr = 0; - + setno = 1; - + /* save this for later .. when fetching individual records */ sr = yaz_srw_get(out, Z_SRW_explain_request); - if (recordsyntax_size == 1 + if (recordsyntax_size == 1 && !yaz_matchstr(recordsyntax_list[0], "xml")) sr->u.explain_request->recordPacking = "xml"; send_srw(sr); @@ -2494,80 +2690,255 @@ static int cmd_init(const char *arg) { if (*arg) { - strncpy (cur_host, arg, sizeof(cur_host)-1); + strncpy(cur_host, arg, sizeof(cur_host)-1); cur_host[sizeof(cur_host)-1] = 0; } if (only_z3950()) return 1; - send_initRequest(cur_host); + send_Z3950_initRequest(cur_host); return 2; } -static int cmd_sru(const char *arg) +static Z_GDU *get_HTTP_Request_url(ODR odr, const char *url) { - if (!*arg) - { - printf("SRU method is: %s\n", sru_method); - } + 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) { - if (!yaz_matchstr(arg, "post")) - sru_method = "post"; - else if (!yaz_matchstr(arg, "get")) - sru_method = "get"; - else if (!yaz_matchstr(arg, "soap")) - sru_method = "soap"; - else - { - printf("Unknown SRU method: %s\n", arg); - printf("Specify one of POST, GET, SOAP\n"); - } + 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); } - return 0; + p->u.HTTP_Request->path = odr_strdup(odr, *cp1 ? cp1 : "/"); + return p; } -static int cmd_find(const char *arg) +static WRBUF get_url(const char *uri, WRBUF username, WRBUF password, + int *code, int show_headers) { - if (!*arg) + WRBUF result = 0; + ODR out = odr_createmem(ODR_ENCODE); + ODR in = odr_createmem(ODR_DECODE); + Z_GDU *gdu = get_HTTP_Request_url(out, uri); + + gdu->u.HTTP_Request->method = odr_strdup(out, "GET"); + if (username && password) { - printf("Find what?\n"); - return 0; + z_HTTP_header_add_basic_auth(out, &gdu->u.HTTP_Request->headers, + wrbuf_cstr(username), + wrbuf_cstr(password)); } - if (protocol == PROTO_HTTP) + z_HTTP_header_add(out, &gdu->u.HTTP_Request->headers, "Accept", + "text/xml"); + if (!z_GDU(out, &gdu, 0, 0)) { -#if YAZ_HAVE_XML2 - if (!conn) - cmd_open(0); - if (!conn) - return 0; - if (!send_SRW_searchRequest(arg)) - return 0; -#else + yaz_log(YLOG_WARN, "Can not encode HTTP request URL:%s", uri); + } + else + { + void *add; + COMSTACK conn = cs_create_host(uri, 1, &add); + if (cs_connect(conn, add) < 0) + yaz_log(YLOG_WARN, "Can not connect to URL:%s", uri); + else + { + int len; + char *buf = odr_getbuf(out, &len, 0); + + if (cs_put(conn, buf, len) < 0) + yaz_log(YLOG_WARN, "cs_put failed URL:%s", uri); + else + { + char *netbuffer = 0; + int netlen = 0; + int res = cs_get(conn, &netbuffer, &netlen); + if (res <= 0) + { + yaz_log(YLOG_WARN, "cs_get failed URL:%s", uri); + } + else + { + Z_GDU *gdu; + odr_setbuf(in, netbuffer, res, 0); + if (!z_GDU(in, &gdu, 0, 0) + || gdu->which != Z_GDU_HTTP_Response) + { + yaz_log(YLOG_WARN, "decode failed URL: %s", uri); + } + else + { + Z_HTTP_Response *res = gdu->u.HTTP_Response; + struct Z_HTTP_Header *h; + result = wrbuf_alloc(); + if (show_headers) + { + + wrbuf_printf(result, "HTTP %d\n", res->code); + for (h = res->headers; h; h = h->next) + wrbuf_printf(result, "%s: %s\n", + h->name, h->value); + } + *code = res->code; + wrbuf_write(result, res->content_buf, res->content_len); + } + } + xfree(netbuffer); + } + cs_close(conn); + } + } + odr_destroy(out); + odr_destroy(in); + return result; +} + + +static int cmd_url(const char *arg) +{ + int code = 0; + WRBUF res = get_url(arg, 0, 0, &code, 1); + if (res) + { + if (wrbuf_len(res) > 1200) + { + fwrite(wrbuf_buf(res), 1, 1200, stdout); + printf(".. out of %lld\n", (long long) wrbuf_len(res)); + } + else + puts(wrbuf_cstr(res)); + wrbuf_destroy(res); + } + return 0; +} + +static int cmd_sru(const char *arg) +{ + if (!*arg) + { + printf("SRU method is: %s\n", sru_method); + printf("SRU version is: %s\n", sru_version); + } + else + { + int r = sscanf(arg, "%9s %9s", sru_method, sru_version); + if (r >= 1) + { + if (!yaz_matchstr(sru_method, "post")) + ; + else if (!yaz_matchstr(sru_method, "get")) + ; + else if (!yaz_matchstr(sru_method, "soap")) + ; + else if (!yaz_matchstr(sru_method, "solr")) + ; + else + { + strcpy(sru_method, "soap"); + printf("Unknown SRU method: %s\n", arg); + printf("Specify one of POST, GET, SOAP, SOLR\n"); + } + } + } + return 0; +} + +static int cmd_find(const char *arg) +{ + if (!*arg) + { + printf("Find what?\n"); + return 0; + } + if (protocol == PROTO_HTTP) + { +#if YAZ_HAVE_XML2 + if (!conn) + session_connect(cur_host); + if (!conn) + return 0; + if (!send_SRW_searchRequest(arg)) + return 0; +#else return 0; #endif } else { - if (!conn) + if (*cur_host && auto_reconnect) { - try_reconnect(); - - if (!conn) { - printf("Not connected yet\n"); - return 0; + int i = 0; + for (;;) + { + if (conn) + { + if (!send_Z3950_searchRequest(arg)) + return 0; + wait_and_handle_response(0); + if (conn) + break; + } + if (++i == 2) + { + printf("Unable to reconnect\n"); + break; + } + session_connect(cur_host); + wait_and_handle_response(0); } + return 0; } - if (!send_searchRequest(arg)) + else if (conn) + { + if (!send_Z3950_searchRequest(arg)) + return 0; + } + else + { + printf("Not connected yet\n"); return 0; + } } return 2; } +static int cmd_facets(const char *arg) +{ + if (!facet_odr) + facet_odr = odr_createmem(ODR_ENCODE); + odr_reset(facet_odr); + + if (!*arg) + { + facet_list = 0; + printf("Facets cleared.\n"); + return 0; + } + facet_list = yaz_pqf_parse_facet_list(facet_odr, arg); + if (!facet_list) + { + printf("Invalid facet list: %s", arg); + return 0; + } + return 1; +} + static int cmd_delete(const char *arg) { if (only_z3950()) return 0; - if (!send_deleteResultSetRequest(arg)) + if (!send_Z3950_deleteResultSetRequest(arg)) return 0; return 2; } @@ -2611,7 +2982,7 @@ static int cmd_setnames(const char *arg) setnumber = 0; else setnumber = -1; - + if (setnumber >= 0) printf("Set numbering enabled.\n"); else @@ -2621,49 +2992,97 @@ static int cmd_setnames(const char *arg) /* PRESENT SERVICE ----------------------------- */ -static void parse_show_args(const char *arg_c, char *setstring, - int *start, int *number) +size_t check_token(const char *haystack, const char *token) { - char arg[40]; - char *p; + 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; +} - strncpy(arg, arg_c, sizeof(arg)-1); - arg[sizeof(arg)-1] = '\0'; +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 ((p = strchr(arg, '+'))) + if (setnumber >= 0) + sprintf(setstring, "%d", setnumber); + else + *setstring = '\0'; + + token_len = check_token(arg_c, "format"); + if (token_len) { - *number = atoi(p + 1); - *p = '\0'; + pretty_xml = 1; + arg_c += token_len; } - if (*arg) + else + pretty_xml = 0; + + token_len = check_token(arg_c, "all"); + if (token_len) { - if (!strcmp(arg, "all")) - { - *number = last_hit_count; - *start = 1; - } - else - *start = atoi(arg); + *number = last_hit_count; + *start = 1; + return 1; } - if (p && (p=strchr(p+1, '+'))) - strcpy (setstring, p+1); - else if (setnumber >= 0) - sprintf(setstring, "%d", setnumber); - else - *setstring = '\0'; + start_position = odr_strtol(arg_c, &end_ptr, 10); + if (end_ptr == arg_c) + return 1; + *start = start_position; + if (*end_ptr == '\0') + return 1; + while (yaz_isspace(*end_ptr)) + end_ptr++; + if (*end_ptr != '+') + { + printf("Bad show arg: expected +. Got %s\n", end_ptr); + return 0; + } + end_ptr++; + arg_c = end_ptr; + *number = odr_strtol(arg_c, &end_ptr, 10); + if (end_ptr == arg_c) + { + printf("Bad show arg: expected number after +\n"); + return 0; + } + if (*end_ptr == '\0') + return 1; + while (yaz_isspace(*end_ptr)) + end_ptr++; + if (*end_ptr != '+') + { + printf("Bad show arg: + expected. Got %s\n", end_ptr); + return 0; + } + strcpy(setstring, end_ptr+1); + return 1; } -static int send_presentRequest(const char *arg) +static int send_Z3950_presentRequest(const char *arg) { Z_APDU *apdu = zget_APDU(out, Z_APDU_presentRequest); Z_PresentRequest *req = apdu->u.presentRequest; Z_RecordComposition compo; - int nos = 1; + Odr_int nos = 1; char setstring[100]; - req->referenceId = set_refid (out); + req->referenceId = set_refid(out); - parse_show_args(arg, setstring, &setno, &nos); + if (!parse_show_args(arg, setstring, &setno, &nos)) + return 0; if (*setstring) req->resultSetId = setstring; @@ -2681,22 +3100,22 @@ static int send_presentRequest(const char *arg) compo.which = Z_RecordComp_complex; compo.u.complex = (Z_CompSpec *) odr_malloc(out, sizeof(*compo.u.complex)); - compo.u.complex->selectAlternativeSyntax = (bool_t *) + compo.u.complex->selectAlternativeSyntax = (bool_t *) odr_malloc(out, sizeof(bool_t)); *compo.u.complex->selectAlternativeSyntax = 0; compo.u.complex->generic = (Z_Specification *) odr_malloc(out, sizeof(*compo.u.complex->generic)); - + compo.u.complex->generic->which = Z_Schema_oid; if (!record_schema) compo.u.complex->generic->schema.oid = 0; - else + else { compo.u.complex->generic->schema.oid = yaz_string_to_oid_odr(yaz_oid_std(), CLASS_SCHEMA, record_schema, out); - + if (!compo.u.complex->generic->schema.oid) { /* OID wasn't a schema! Try record syntax instead. */ @@ -2728,8 +3147,8 @@ static int send_presentRequest(const char *arg) compo.u.complex->recordSyntax = (Odr_oid **) odr_malloc(out, recordsyntax_size * sizeof(Odr_oid*)); for (i = 0; i < recordsyntax_size; i++) - compo.u.complex->recordSyntax[i] = - yaz_string_to_oid_odr(yaz_oid_std(), + compo.u.complex->recordSyntax[i] = + yaz_string_to_oid_odr(yaz_oid_std(), CLASS_RECSYN, recordsyntax_list[i], out); } } @@ -2740,7 +3159,8 @@ static int send_presentRequest(const char *arg) compo.u.simple = elementSetNames; } send_apdu(apdu); - printf("Sent presentRequest (%d+%d).\n", setno, nos); + printf("Sent presentRequest (" ODR_INT_PRINTF "+" ODR_INT_PRINTF ").\n", + setno, nos); return 2; } @@ -2748,13 +3168,15 @@ static int send_presentRequest(const char *arg) static int send_SRW_presentRequest(const char *arg) { char setstring[100]; - int nos = 1; + Odr_int nos = 1; Z_SRW_PDU *sr = srw_sr; if (!sr) return 0; - parse_show_args(arg, setstring, &setno, &nos); + if (!parse_show_args(arg, setstring, &setno, &nos)) + return 0; sr->u.request->startRecord = odr_intdup(out, setno); + sru_maximumRecords = nos; sr->u.request->maximumRecords = odr_intdup(out, nos); if (record_schema) sr->u.request->recordSchema = record_schema; @@ -2764,10 +3186,10 @@ static int send_SRW_presentRequest(const char *arg) } #endif -static void close_session (void) +static void close_session(void) { if (conn) - cs_close (conn); + cs_close(conn); conn = 0; sent_close = 0; odr_reset(out); @@ -2776,7 +3198,7 @@ static void close_session (void) last_hit_count = 0; } -void process_close(Z_Close *req) +static void process_Z3950_close(Z_Close *req) { Z_APDU *apdu = zget_APDU(out, Z_APDU_close); Z_Close *res = apdu->u.close; @@ -2798,7 +3220,7 @@ void process_close(Z_Close *req) printf("Reason: %s, message: %s\n", reasons[*req->closeReason], req->diagnosticInformation ? req->diagnosticInformation : "NULL"); if (sent_close) - close_session (); + close_session(); else { *res->closeReason = Z_Close_finished; @@ -2814,7 +3236,7 @@ static int cmd_show(const char *arg) { #if YAZ_HAVE_XML2 if (!conn) - cmd_open(0); + session_connect(cur_host); if (!conn) return 0; if (!send_SRW_presentRequest(arg)) @@ -2830,82 +3252,92 @@ static int cmd_show(const char *arg) printf("Not connected yet\n"); return 0; } - if (!send_presentRequest(arg)) + if (!send_Z3950_presentRequest(arg)) return 0; } return 2; } -void exit_client(int code) +static void exit_client(int code) { file_history_save(file_history); file_history_destroy(&file_history); + nmem_destroy(nmem_auth); exit(code); } -int cmd_quit(const char *arg) +static int cmd_quit(const char *arg) { printf("See you later, alligator.\n"); - xmalloc_trav (""); + xmalloc_trav(""); exit_client(0); return 0; } -int cmd_cancel(const char *arg) +static int cmd_cancel(const char *arg) { - Z_APDU *apdu = zget_APDU(out, Z_APDU_triggerResourceControlRequest); - Z_TriggerResourceControlRequest *req = - apdu->u.triggerResourceControlRequest; - bool_t rfalse = 0; - char command[16]; - - *command = '\0'; - sscanf(arg, "%15s", command); - if (only_z3950()) return 0; - if (session_initResponse && - !ODR_MASK_GET(session_initResponse->options, - Z_Options_triggerResourceCtrl)) + else { - printf("Target doesn't support cancel (trigger resource ctrl)\n"); - return 0; + Z_APDU *apdu = zget_APDU(out, Z_APDU_triggerResourceControlRequest); + Z_TriggerResourceControlRequest *req = + apdu->u.triggerResourceControlRequest; + bool_t rfalse = 0; + char command[16]; + + *command = '\0'; + sscanf(arg, "%15s", command); + + if (only_z3950()) + return 0; + if (session_initResponse && + !ODR_MASK_GET(session_initResponse->options, + Z_Options_triggerResourceCtrl)) + { + printf("Target doesn't support cancel (trigger resource ctrl)\n"); + return 0; + } + *req->requestedAction = Z_TriggerResourceControlRequest_cancel; + req->resultSetWanted = &rfalse; + req->referenceId = set_refid(out); + + send_apdu(apdu); + printf("Sent cancel request\n"); + if (!strcmp(command, "wait")) + return 2; + return 1; } - *req->requestedAction = Z_TriggerResourceControlRequest_cancel; - req->resultSetWanted = &rfalse; - req->referenceId = set_refid (out); - - send_apdu(apdu); - printf("Sent cancel request\n"); - if (!strcmp(command, "wait")) - return 2; - return 1; } - -int cmd_cancel_find(const char *arg) { +static int cmd_cancel_find(const char *arg) +{ int fres; - fres=cmd_find(arg); - if( fres > 0 ) { + if (only_z3950()) + return 0; + fres = cmd_find(arg); + if (fres > 0) + { return cmd_cancel(""); }; return fres; } -int send_scanrequest(const char *set, const char *query, - int pp, int num, const char *term) +static int send_Z3950_scanrequest(const char *set, const char *query, + Odr_int *pos, Odr_int num, const char *term) { Z_APDU *apdu = zget_APDU(out, Z_APDU_scanRequest); Z_ScanRequest *req = apdu->u.scanRequest; - + if (only_z3950()) return 0; + printf("query: %s\n", query); if (queryType == QueryType_CCL2RPN) { int error, pos; struct ccl_rpn_node *rpn; - rpn = ccl_find_str (bibset, query, &error, &pos); + rpn = ccl_find_str(bibset, query, &error, &pos); if (error) { printf("CCL ERROR: %s\n", ccl_err_msg(error)); @@ -2914,30 +3346,31 @@ int send_scanrequest(const char *set, const char *query, req->attributeSet = yaz_string_to_oid_odr(yaz_oid_std(), CLASS_ATTSET, "Bib-1", out); - if (!(req->termListAndStartPoint = ccl_scan_query (out, rpn))) + if (!(req->termListAndStartPoint = ccl_scan_query(out, rpn))) { printf("Couldn't convert CCL to Scan term\n"); return -1; } - ccl_rpn_delete (rpn); + ccl_rpn_delete(rpn); } else { - YAZ_PQF_Parser pqf_parser = yaz_pqf_create (); + YAZ_PQF_Parser pqf_parser = yaz_pqf_create(); + if (!(req->termListAndStartPoint = yaz_pqf_scan(pqf_parser, out, &req->attributeSet, query))) { const char *pqf_msg; size_t off; - int code = yaz_pqf_error (pqf_parser, &pqf_msg, &off); + int code = yaz_pqf_error(pqf_parser, &pqf_msg, &off); int ioff = off; printf("%*s^\n", ioff+7, ""); printf("Prefix query error: %s (code %d)\n", pqf_msg, code); - yaz_pqf_destroy (pqf_parser); + yaz_pqf_destroy(pqf_parser); return -1; } - yaz_pqf_destroy (pqf_parser); + yaz_pqf_destroy(pqf_parser); } if (queryCharset && outputCharset) { @@ -2964,11 +3397,11 @@ int send_scanrequest(const char *set, const char *query, strlen(term); } } - req->referenceId = set_refid (out); + req->referenceId = set_refid(out); req->num_databaseNames = num_databaseNames; req->databaseNames = databaseNames; req->numberOfTermsRequested = # - req->preferredPositionInResponse = &pp; + req->preferredPositionInResponse = pos; req->stepSize = odr_intdup(out, scan_stepSize); if (set) @@ -2979,75 +3412,75 @@ int send_scanrequest(const char *set, const char *query, return 2; } -int send_sortrequest(const char *arg, int newset) +static int send_sortrequest(const char *arg, int newset) { Z_APDU *apdu = zget_APDU(out, Z_APDU_sortRequest); Z_SortRequest *req = apdu->u.sortRequest; Z_SortKeySpecList *sksl = (Z_SortKeySpecList *) - odr_malloc (out, sizeof(*sksl)); + odr_malloc(out, sizeof(*sksl)); char setstring[32]; if (only_z3950()) return 0; if (setnumber >= 0) - sprintf (setstring, "%d", setnumber); + sprintf(setstring, "%d", setnumber); else - sprintf (setstring, "default"); + sprintf(setstring, "default"); - req->referenceId = set_refid (out); + req->referenceId = set_refid(out); req->num_inputResultSetNames = 1; req->inputResultSetNames = (Z_InternationalString **) - odr_malloc (out, sizeof(*req->inputResultSetNames)); - req->inputResultSetNames[0] = odr_strdup (out, setstring); + odr_malloc(out, sizeof(*req->inputResultSetNames)); + req->inputResultSetNames[0] = odr_strdup(out, setstring); if (newset && setnumber >= 0) - sprintf (setstring, "%d", ++setnumber); + sprintf(setstring, "%d", ++setnumber); - req->sortedResultSetName = odr_strdup (out, setstring); + req->sortedResultSetName = odr_strdup(out, setstring); - req->sortSequence = yaz_sort_spec (out, arg); + req->sortSequence = yaz_sort_spec(out, arg); if (!req->sortSequence) { - printf ("Missing sort specifications\n"); + printf("Missing sort specifications\n"); return -1; } send_apdu(apdu); return 2; } -void display_term(Z_TermInfo *t) +static void display_term_info(Z_TermInfo *t) { if (t->displayTerm) printf("%s", t->displayTerm); else if (t->term->which == Z_Term_general) - { printf("%.*s", t->term->u.general->len, t->term->u.general->buf); - sprintf(last_scan_line, "%.*s", t->term->u.general->len, - t->term->u.general->buf); - } else printf("Term (not general)"); + if (t->term->which == Z_Term_general) + sprintf(last_scan_line, "%.*s", t->term->u.general->len, + t->term->u.general->buf); + if (t->globalOccurrences) - printf (" (%d)\n", *t->globalOccurrences); + printf(" (" ODR_INT_PRINTF ")\n", *t->globalOccurrences); else - printf ("\n"); + printf("\n"); } -void process_scanResponse(Z_ScanResponse *res) +static void process_Z3950_scanResponse(Z_ScanResponse *res) { int i; Z_Entry **entries = NULL; int num_entries = 0; - - printf("Received ScanResponse\n"); - print_refid (res->referenceId); - printf("%d entries", *res->numberOfEntriesReturned); + + printf("Received ScanResponse\n"); + print_refid(res->referenceId); + printf(ODR_INT_PRINTF " entries", *res->numberOfEntriesReturned); if (res->positionOfTerm) - printf (", position=%d", *res->positionOfTerm); - printf ("\n"); + printf(", position=" ODR_INT_PRINTF, *res->positionOfTerm); + printf("\n"); if (*res->scanStatus != Z_Scan_success) - printf("Scan returned code %d\n", *res->scanStatus); + printf("Scan returned code " ODR_INT_PRINTF "\n", *res->scanStatus); if (!res->entries) return; if ((entries = res->entries->entries)) @@ -3058,57 +3491,59 @@ void process_scanResponse(Z_ScanResponse *res) if (entries[i]->which == Z_Entry_termInfo) { printf("%c ", i + 1 == pos_term ? '*' : ' '); - display_term(entries[i]->u.termInfo); + display_term_info(entries[i]->u.termInfo); } else display_diagrecs(&entries[i]->u.surrogateDiagnostic, 1); } if (res->entries->nonsurrogateDiagnostics) - display_diagrecs (res->entries->nonsurrogateDiagnostics, + display_diagrecs(res->entries->nonsurrogateDiagnostics, res->entries->num_nonsurrogateDiagnostics); } -void process_sortResponse(Z_SortResponse *res) +static void process_Z3950_sortResponse(Z_SortResponse *res) { printf("Received SortResponse: status="); switch (*res->sortStatus) { case Z_SortResponse_success: - printf ("success"); break; + printf("success"); break; case Z_SortResponse_partial_1: - printf ("partial"); break; + printf("partial"); break; case Z_SortResponse_failure: - printf ("failure"); break; + printf("failure"); break; default: - printf ("unknown (%d)", *res->sortStatus); + printf("unknown (" ODR_INT_PRINTF ")", *res->sortStatus); } - printf ("\n"); + printf("\n"); print_refid (res->referenceId); if (res->diagnostics) display_diagrecs(res->diagnostics, res->num_diagnostics); } -void process_deleteResultSetResponse (Z_DeleteResultSetResponse *res) +static void process_Z3950_deleteResultSetResponse( + Z_DeleteResultSetResponse *res) { - printf("Got deleteResultSetResponse status=%d\n", + printf("Got deleteResultSetResponse status=" ODR_INT_PRINTF "\n", *res->deleteOperationStatus); if (res->deleteListStatuses) { int i; for (i = 0; i < res->deleteListStatuses->num; i++) { - printf ("%s status=%d\n", res->deleteListStatuses->elements[i]->id, - *res->deleteListStatuses->elements[i]->status); + printf("%s status=" ODR_INT_PRINTF "\n", + res->deleteListStatuses->elements[i]->id, + *res->deleteListStatuses->elements[i]->status); } } } -int cmd_sort_generic(const char *arg, int newset) +static int cmd_sort_generic(const char *arg, int newset) { if (only_z3950()) return 0; - if (session_initResponse && + if (session_initResponse && !ODR_MASK_GET(session_initResponse->options, Z_Options_sort)) { printf("Target doesn't support sort\n"); @@ -3123,31 +3558,39 @@ int cmd_sort_generic(const char *arg, int newset) return 0; } -int cmd_sort(const char *arg) +static int cmd_sort(const char *arg) { - return cmd_sort_generic (arg, 0); + return cmd_sort_generic(arg, 0); } -int cmd_sort_newset (const char *arg) +static int cmd_sort_newset(const char *arg) { - return cmd_sort_generic (arg, 1); + return cmd_sort_generic(arg, 1); } -int cmd_scanstep(const char *arg) +static int cmd_scanstep(const char *arg) { scan_stepSize = atoi(arg); return 0; } -int cmd_scanpos(const char *arg) +static int cmd_scanpos(const char *arg) { - int r = sscanf(arg, "%d", &scan_position); - if (r == 0) - scan_position = 1; + if (!strcmp(arg, "none")) + strcpy(scan_position, "none"); + else + { + int dummy; + int r = sscanf(arg, "%d", &dummy); + if (r == 1 && strlen(arg) < sizeof(scan_position)-1) + strcpy(scan_position, arg); + else + printf("specify number of none for scanpos\n"); + } return 0; } -int cmd_scansize(const char *arg) +static int cmd_scansize(const char *arg) { int r = sscanf(arg, "%d", &scan_size); if (r == 0) @@ -3157,23 +3600,37 @@ int cmd_scansize(const char *arg) static int cmd_scan_common(const char *set, const char *arg) { + Odr_int pos, *pos_p = 0; + const char *scan_term = 0; + const char *scan_query = 0; + + if (!*arg) + { + pos = 1; + pos_p = &pos; + scan_query = last_scan_query; + scan_term = last_scan_line; + } + else + { + strcpy(last_scan_query, arg); + scan_query = arg; + if (strcmp(scan_position, "none")) + { + pos = odr_atoi(scan_position); + pos_p = &pos; + } + } + if (protocol == PROTO_HTTP) { #if YAZ_HAVE_XML2 if (!conn) - cmd_open(0); + session_connect(cur_host); if (!conn) return 0; - if (*arg) - { - if (send_SRW_scanRequest(arg, scan_position, scan_size) < 0) - return 0; - } - else - { - if (send_SRW_scanRequest(last_scan_line, 1, scan_size) < 0) - return 0; - } + if (send_SRW_scanRequest(scan_query, pos_p, scan_size) < 0) + return 0; return 2; #else return 0; @@ -3181,44 +3638,32 @@ static int cmd_scan_common(const char *set, const char *arg) } else { - if (!conn) + if (*cur_host && !conn && auto_reconnect) { - try_reconnect(); - - if (!conn) { - printf("Session not initialized yet\n"); - return 0; - } + session_connect(cur_host); + wait_and_handle_response(0); } - if (session_initResponse && + if (!conn) + return 0; + if (session_initResponse && !ODR_MASK_GET(session_initResponse->options, Z_Options_scan)) { printf("Target doesn't support scan\n"); return 0; } - if (*arg) - { - strcpy (last_scan_query, arg); - if (send_scanrequest(set, arg, - scan_position, scan_size, 0) < 0) - return 0; - } - else - { - if (send_scanrequest(set, last_scan_query, - 1, scan_size, last_scan_line) < 0) - return 0; - } + if (send_Z3950_scanrequest(set, scan_query, pos_p, + scan_size, scan_term) < 0) + return 0; return 2; } } -int cmd_scan(const char *arg) +static int cmd_scan(const char *arg) { return cmd_scan_common(0, arg); } -int cmd_setscan(const char *arg) +static int cmd_setscan(const char *arg) { char setstring[100]; int nor; @@ -3230,7 +3675,7 @@ int cmd_setscan(const char *arg) return cmd_scan_common(setstring, arg + nor); } -int cmd_schema(const char *arg) +static int cmd_schema(const char *arg) { xfree(record_schema); record_schema = 0; @@ -3239,7 +3684,7 @@ int cmd_schema(const char *arg) return 1; } -int cmd_format(const char *arg) +static int cmd_format(const char *arg) { const char *cp = arg; int nor; @@ -3251,13 +3696,25 @@ int cmd_format(const char *arg) printf("Usage: format \n"); return 0; } + while (sscanf(cp, "%40s%n", form_str, &nor) >= 1 && nor > 0 + && idx < RECORDSYNTAX_MAX) + { + if (strcmp(form_str, "none") && + !yaz_string_to_oid_odr(yaz_oid_std(), CLASS_RECSYN, form_str, out)) + { + printf("Bad format: %s\n", form_str); + return 0; + } + cp += nor; + } for (i = 0; i < recordsyntax_size; i++) { xfree(recordsyntax_list[i]); recordsyntax_list[i] = 0; } - while (sscanf(cp, "%40s%n", form_str, &nor) >= 1 && nor > 0 + cp = arg; + while (sscanf(cp, "%40s%n", form_str, &nor) >= 1 && nor > 0 && idx < RECORDSYNTAX_MAX) { if (!strcmp(form_str, "none")) @@ -3270,7 +3727,7 @@ int cmd_format(const char *arg) return 1; } -int cmd_elements(const char *arg) +static int cmd_elements(const char *arg) { static Z_ElementSetNames esn; static char what[100]; @@ -3287,41 +3744,41 @@ int cmd_elements(const char *arg) return 1; } -int cmd_querytype (const char *arg) +static int cmd_querytype(const char *arg) { - if (!strcmp (arg, "ccl")) + if (!strcmp(arg, "ccl")) queryType = QueryType_CCL; - else if (!strcmp (arg, "prefix") || !strcmp(arg, "rpn")) + else if (!strcmp(arg, "prefix") || !strcmp(arg, "rpn")) queryType = QueryType_Prefix; - else if (!strcmp (arg, "ccl2rpn") || !strcmp (arg, "cclrpn")) + else if (!strcmp(arg, "ccl2rpn") || !strcmp(arg, "cclrpn")) queryType = QueryType_CCL2RPN; else if (!strcmp(arg, "cql")) - queryType = QueryType_CQL; - else if (!strcmp (arg, "cql2rpn") || !strcmp (arg, "cqlrpn")) + queryType = QueryType_CQL; + else if (!strcmp(arg, "cql2rpn") || !strcmp(arg, "cqlrpn")) queryType = QueryType_CQL2RPN; else { - printf ("Querytype must be one of:\n"); - printf (" prefix - Prefix query\n"); - printf (" ccl - CCL query\n"); - printf (" ccl2rpn - CCL query converted to RPN\n"); - printf (" cql - CQL\n"); - printf (" cql2rpn - CQL query converted to RPN\n"); + printf("Querytype must be one of:\n"); + printf(" prefix - Prefix query\n"); + printf(" ccl - CCL query\n"); + printf(" ccl2rpn - CCL query converted to RPN\n"); + printf(" cql - CQL\n"); + printf(" cql2rpn - CQL query converted to RPN\n"); return 0; } return 1; } -int cmd_refid (const char *arg) +static int cmd_refid(const char *arg) { - xfree (refid); + xfree(refid); refid = NULL; if (*arg) - refid = xstrdup (arg); + refid = xstrdup(arg); return 1; } -int cmd_close(const char *arg) +static int cmd_close(const char *arg) { Z_APDU *apdu; Z_Close *req; @@ -3338,89 +3795,89 @@ int cmd_close(const char *arg) int cmd_packagename(const char* arg) { - xfree (esPackageName); + xfree(esPackageName); esPackageName = NULL; if (*arg) esPackageName = xstrdup(arg); return 1; } -int cmd_proxy(const char* arg) +static int cmd_proxy(const char* arg) { xfree(yazProxy); yazProxy = 0; if (*arg) - yazProxy = xstrdup (arg); + yazProxy = xstrdup(arg); return 1; } -int cmd_marccharset(const char *arg) +static int cmd_marccharset(const char *arg) { char l1[30]; *l1 = 0; if (sscanf(arg, "%29s", l1) < 1) { - printf("MARC character set is `%s'\n", + printf("MARC character set is `%s'\n", marcCharset ? marcCharset: "none"); return 1; } - xfree (marcCharset); + xfree(marcCharset); marcCharset = 0; if (strcmp(l1, "-") && strcmp(l1, "none")) marcCharset = xstrdup(l1); return 1; } -int cmd_querycharset(const char *arg) +static int cmd_querycharset(const char *arg) { char l1[30]; *l1 = 0; if (sscanf(arg, "%29s", l1) < 1) { - printf("Query character set is `%s'\n", + printf("Query character set is `%s'\n", queryCharset ? queryCharset: "none"); return 1; } - xfree (queryCharset); + xfree(queryCharset); queryCharset = 0; if (strcmp(l1, "-") && strcmp(l1, "none")) queryCharset = xstrdup(l1); return 1; } -int cmd_displaycharset(const char *arg) +static int cmd_displaycharset(const char *arg) { char l1[30]; *l1 = 0; if (sscanf(arg, "%29s", l1) < 1) { - printf("Display character set is `%s'\n", + printf("Display character set is `%s'\n", outputCharset ? outputCharset: "none"); } else { - xfree (outputCharset); + xfree(outputCharset); outputCharset = 0; if (!strcmp(l1, "auto") && codeset) { if (codeset) { - printf ("Display character set: %s\n", codeset); + printf("Display character set: %s\n", codeset); outputCharset = xstrdup(codeset); } else - printf ("No codeset found on this system\n"); + printf("No codeset found on this system\n"); } else if (strcmp(l1, "-") && strcmp(l1, "none")) outputCharset = xstrdup(l1); - } + } return 1; } -int cmd_negcharset(const char *arg) +static int cmd_negcharset(const char *arg) { char l1[30]; @@ -3428,29 +3885,29 @@ int cmd_negcharset(const char *arg) if (sscanf(arg, "%29s %d %d", l1, &negotiationCharsetRecords, &negotiationCharsetVersion) < 1) { - printf("Negotiation character set `%s'\n", - negotiationCharset ? negotiationCharset: "none"); + printf("Negotiation character set `%s'\n", + negotiationCharset ? negotiationCharset: "none"); if (negotiationCharset) { - printf("Records in charset %s\n", negotiationCharsetRecords ? + printf("Records in charset %s\n", negotiationCharsetRecords ? "yes" : "no"); printf("Charneg version %d\n", negotiationCharsetVersion); } } else { - xfree (negotiationCharset); + xfree(negotiationCharset); negotiationCharset = NULL; if (*l1 && strcmp(l1, "-") && strcmp(l1, "none")) { negotiationCharset = xstrdup(l1); - printf ("Character set negotiation : %s\n", negotiationCharset); + printf("Character set negotiation : %s\n", negotiationCharset); } } return 1; } -int cmd_charset(const char* arg) +static int cmd_charset(const char* arg) { char l1[30], l2[30], l3[30], l4[30]; @@ -3475,85 +3932,81 @@ int cmd_charset(const char* arg) return 1; } -int cmd_lang(const char* arg) +static int cmd_lang(const char* arg) { - if (*arg == '\0') { + if (*arg == '\0') + { printf("Current language is `%s'\n", yazLang ? yazLang : "none"); return 1; } - xfree (yazLang); + xfree(yazLang); yazLang = NULL; if (*arg) yazLang = xstrdup(arg); return 1; } -int cmd_source(const char* arg, int echo ) +static int cmd_source(const char* arg, int echo ) { /* first should open the file and read one line at a time.. */ FILE* includeFile; char line[102400], *cp; - if(strlen(arg)<1) { - fprintf(stderr,"Error in source command use a filename\n"); + if (strlen(arg) < 1) + { + fprintf(stderr, "Error in source command use a filename\n"); return -1; } - - includeFile = fopen (arg, "r"); - - if(!includeFile) { - fprintf(stderr,"Unable to open file %s for reading\n",arg); + + includeFile = fopen(arg, "r"); + + if (!includeFile) + { + fprintf(stderr, "Unable to open file %s for reading\n",arg); return -1; } - - while(!feof(includeFile)) { - memset(line,0,sizeof(line)); - fgets(line,sizeof(line),includeFile); - - if(strlen(line) < 2) continue; - if(line[0] == '#') continue; - - if ((cp = strrchr (line, '\n'))) + + while (fgets(line, sizeof(line), includeFile)) + { + if (strlen(line) < 2) + continue; + if (line[0] == '#') + continue; + + if ((cp = strrchr(line, '\n'))) *cp = '\0'; - - if( echo ) { - printf( "processing line: %s\n",line ); - }; + + if (echo) + printf("processing line: %s\n", line); process_cmd_line(line); } - - if(fclose(includeFile)<0) { + + if (fclose(includeFile)) + { perror("unable to close include file"); exit(1); } return 1; } -int cmd_source_echo(const char* arg) -{ - cmd_source(arg, 1); - return 1; -} - -int cmd_source_noecho(const char* arg) +static int cmd_source_echo(const char* arg) { - cmd_source(arg, 0); + cmd_source(arg, 1); return 1; } - -int cmd_subshell(const char* args) +static int cmd_subshell(const char* args) { - if(strlen(args)) - system(args); - else - system(getenv("SHELL")); - + int ret = system(strlen(args) ? args : getenv("SHELL")); printf("\n"); + if (ret) + { + printf("Exit %d\n", ret); + } return 1; } -int cmd_set_berfile(const char *arg) +static int cmd_set_berfile(const char *arg) { if (ber_file && ber_file != stdout && ber_file != stderr) fclose(ber_file); @@ -3566,9 +4019,9 @@ int cmd_set_berfile(const char *arg) return 1; } -int cmd_set_apdufile(const char *arg) +static int cmd_set_apdufile(const char *arg) { - if(apdu_file && apdu_file != stderr && apdu_file != stderr) + if (apdu_file && apdu_file != stderr && apdu_file != stderr) fclose(apdu_file); if (!strcmp(arg, "")) apdu_file = 0; @@ -3585,28 +4038,29 @@ int cmd_set_apdufile(const char *arg) return 1; } -int cmd_set_cclfile(const char* arg) -{ +static int cmd_set_cclfile(const char* arg) +{ FILE *inf; - bibset = ccl_qual_mk (); - inf = fopen (arg, "r"); + bibset = ccl_qual_mk(); + inf = fopen(arg, "r"); if (!inf) perror("unable to open CCL file"); else { - ccl_qual_file (bibset, inf); - fclose (inf); + ccl_qual_file(bibset, inf); + fclose(inf); } strcpy(ccl_fields,arg); return 0; } -int cmd_set_cqlfile(const char* arg) +static int cmd_set_cqlfile(const char* arg) { cql_transform_t newcqltrans; - if ((newcqltrans = cql_transform_open_fname(arg)) == 0) { + if ((newcqltrans = cql_transform_open_fname(arg)) == 0) + { perror("unable to open CQL file"); return 0; } @@ -3618,15 +4072,16 @@ int cmd_set_cqlfile(const char* arg) return 0; } -int cmd_set_auto_reconnect(const char* arg) -{ - if(strlen(arg)==0) { +static int cmd_set_auto_reconnect(const char* arg) +{ + if (strlen(arg)==0) auto_reconnect = ! auto_reconnect; - } else if(strcmp(arg,"on")==0) { + else if (strcmp(arg,"on")==0) auto_reconnect = 1; - } else if(strcmp(arg,"off")==0) { - auto_reconnect = 0; - } else { + else if (strcmp(arg,"off")==0) + auto_reconnect = 0; + else + { printf("Error use on or off\n"); return 1; } @@ -3635,35 +4090,36 @@ int cmd_set_auto_reconnect(const char* arg) printf("Set auto reconnect enabled.\n"); else printf("Set auto reconnect disabled.\n"); - + return 0; } - -int cmd_set_auto_wait(const char* arg) -{ - if(strlen(arg)==0) { +static int cmd_set_auto_wait(const char* arg) +{ + if (strlen(arg)==0) auto_wait = ! auto_wait; - } else if(strcmp(arg,"on")==0) { + else if (strcmp(arg,"on")==0) auto_wait = 1; - } else if(strcmp(arg,"off")==0) { - auto_wait = 0; - } else { + else if (strcmp(arg,"off")==0) + auto_wait = 0; + else + { printf("Error use on or off\n"); return 1; } - + if (auto_wait) printf("Set auto wait enabled.\n"); else printf("Set auto wait disabled.\n"); - + return 0; } -int cmd_set_marcdump(const char* arg) +static int cmd_set_marcdump(const char* arg) { - if(marc_file && marc_file != stderr) { /* don't close stdout*/ + if (marc_file && marc_file != stderr) + { /* don't close stdout*/ fclose(marc_file); } @@ -3680,10 +4136,21 @@ int cmd_set_marcdump(const char* arg) return 1; } -/* - this command takes 3 arge {name class oid} +static void marc_file_write(const char *buf, size_t sz) +{ + if (marc_file) + { + if (fwrite(buf, 1, sz, marc_file) != sz) + { + perror("marcfile write"); + } + } +} +/* + this command takes 3 arge {name class oid} */ -int cmd_register_oid(const char* args) { +static int cmd_register_oid(const char* args) +{ static struct { char* className; oid_class oclass; @@ -3705,30 +4172,33 @@ int cmd_register_oid(const char* args) { {"general",CLASS_GENERAL}, {0,(enum oid_class) 0} }; - char oname_str[101], oclass_str[101], oid_str[101]; + char oname_str[101], oclass_str[101], oid_str[101]; int i; oid_class oidclass = CLASS_GENERAL; Odr_oid oid[OID_SIZE]; - if (sscanf (args, "%100[^ ] %100[^ ] %100s", - oname_str,oclass_str, oid_str) < 1) { + if (sscanf(args, "%100[^ ] %100[^ ] %100s", + oname_str,oclass_str, oid_str) < 1) + { printf("Error in register command \n"); return 0; } - - for (i = 0; oid_classes[i].className; i++) { + + for (i = 0; oid_classes[i].className; i++) + { if (!strcmp(oid_classes[i].className, oclass_str)) { oidclass=oid_classes[i].oclass; break; } } - - if(!(oid_classes[i].className)) { + + if (!(oid_classes[i].className)) + { printf("Unknown oid class %s\n",oclass_str); return 0; } - + oid_dotstring_to_oid(oid_str, oid); if (yaz_oid_add(yaz_oid_std(), oidclass, oname_str, oid)) @@ -3736,45 +4206,59 @@ int cmd_register_oid(const char* args) { printf("oid %s already exists, registration failed\n", oname_str); } - return 1; + return 1; } -int cmd_push_command(const char* arg) +static int cmd_push_command(const char* arg) { #if HAVE_READLINE_HISTORY_H - if(strlen(arg)>1) + if (strlen(arg) > 1) add_history(arg); -#else +#else fprintf(stderr,"Not compiled with the readline/history module\n"); #endif return 1; } -void source_rcfile(void) +void source_rc_file(const char *rc_file) { - /* Look for .yazclientrc and read it if it exists. + /* If rc_file != NULL, source that. Else + Look for .yazclientrc and read it if it exists. If it does not exist, read $HOME/.yazclientrc instead */ struct stat statbuf; - char fname[1000]; - strcpy(fname, ".yazclientrc"); - if (stat(fname, &statbuf)==0) + if (rc_file) { - cmd_source(fname, 0); + if (stat(rc_file, &statbuf) == 0) + cmd_source(rc_file, 0); + else + { + fprintf(stderr, "yaz_client: cannot source '%s'\n", rc_file); + exit(1); + } } else { - const char* homedir = getenv("HOME"); - if (homedir) + char fname[1000]; + strcpy(fname, ".yazclientrc"); + if (stat(fname, &statbuf)==0) + { + cmd_source(fname, 0); + } + else { - sprintf(fname, "%.800s/%s", homedir, ".yazclientrc"); - if (stat(fname, &statbuf)==0) - cmd_source(fname, 0); + const char* homedir = getenv("HOME"); + if (homedir) + { + sprintf(fname, "%.800s/%s", homedir, ".yazclientrc"); + if (stat(fname, &statbuf)==0) + cmd_source(fname, 0); + } } } } -void add_to_readline_history(void *client_data, const char *line) +static void add_to_readline_history(void *client_data, const char *line) { #if HAVE_READLINE_HISTORY_H if (strlen(line)) @@ -3782,11 +4266,11 @@ void add_to_readline_history(void *client_data, const char *line) #endif } -static void initialize(void) +static void initialize(const char *rc_file) { FILE *inf; int i; - + if (!(out = odr_createmem(ODR_ENCODE)) || !(in = odr_createmem(ODR_DECODE)) || !(print = odr_createmem(ODR_PRINT))) @@ -3795,35 +4279,39 @@ static void initialize(void) exit(1); } + strcpy(scan_position, "1"); + setvbuf(stdout, 0, _IONBF, 0); if (apdu_file) odr_setprint(print, apdu_file); - bibset = ccl_qual_mk (); - inf = fopen (ccl_fields, "r"); + bibset = ccl_qual_mk(); + inf = fopen(ccl_fields, "r"); if (inf) { - ccl_qual_file (bibset, inf); - fclose (inf); + ccl_qual_file(bibset, inf); + fclose(inf); } cqltrans = cql_transform_open_fname(cql_fields); /* If this fails, no problem: we detect cqltrans == 0 later */ #if HAVE_READLINE_READLINE_H - rl_attempted_completion_function = + rl_attempted_completion_function = (char **(*)(const char *, int, int)) readline_completer; #endif - for(i = 0; i < maxOtherInfosSupported; ++i) { + for (i = 0; i < maxOtherInfosSupported; ++i) + { extraOtherInfos[i].oid[0] = -1; extraOtherInfos[i].value = 0; } cmd_format("usmarc"); - - source_rcfile(); file_history = file_history_new(); + + source_rc_file(rc_file); + file_history_load(file_history); file_history_trav(file_history, 0, add_to_readline_history); } @@ -3838,20 +4326,19 @@ static void handle_srw_record(Z_SRW_record *rec) { if (rec->recordPosition) { - printf ("pos=%d", *rec->recordPosition); + printf("pos=" ODR_INT_PRINTF, *rec->recordPosition); setno = *rec->recordPosition + 1; } if (rec->recordSchema) - printf (" schema=%s", rec->recordSchema); - printf ("\n"); + printf(" schema=%s", rec->recordSchema); + printf("\n"); if (rec->recordData_buf && rec->recordData_len) { - fwrite(rec->recordData_buf, 1, rec->recordData_len, stdout); - if (marc_file) - fwrite (rec->recordData_buf, 1, rec->recordData_len, marc_file); + print_xml_record(rec->recordData_buf, rec->recordData_len); + marc_file_write(rec->recordData_buf, rec->recordData_len); } else - printf ("No data!"); + printf("No data!"); printf("\n"); } @@ -3864,24 +4351,37 @@ static void handle_srw_response(Z_SRW_searchRetrieveResponse *res) { int i; - printf ("Received SRW SearchRetrieve Response\n"); - + printf("Received SRW SearchRetrieve Response\n"); + for (i = 0; inum_diagnostics; i++) { if (res->diagnostics[i].uri) - printf ("SRW diagnostic %s\n", + printf("SRW diagnostic %s\n", res->diagnostics[i].uri); else - printf ("SRW diagnostic missing or could not be decoded\n"); + printf("SRW diagnostic missing or could not be decoded\n"); if (res->diagnostics[i].message) - printf ("Message: %s\n", res->diagnostics[i].message); + printf("Message: %s\n", res->diagnostics[i].message); if (res->diagnostics[i].details) - printf ("Details: %s\n", res->diagnostics[i].details); + printf("Details: %s\n", res->diagnostics[i].details); } if (res->numberOfRecords) - printf ("Number of hits: %d\n", *res->numberOfRecords); - for (i = 0; inum_records; i++) + printf("Number of hits: " ODR_INT_PRINTF "\n", *res->numberOfRecords); + if (res->facetList) + display_facets(res->facetList); + if (res->suggestions) + printf("Suggestions:\n%s\n", res->suggestions); + for (i = 0; i < res->num_records; i++) + { + if (i >= sru_maximumRecords) + { + printf("SRU server returns extra records. Skipping " + ODR_INT_PRINTF " records.\n", + res->num_records - sru_maximumRecords); + break; + } handle_srw_record(res->records + i); + } } static void handle_srw_scan_term(Z_SRW_scanTerm *term) @@ -3893,7 +4393,7 @@ static void handle_srw_scan_term(Z_SRW_scanTerm *term) else printf("No value:"); if (term->numberOfRecords) - printf(" %d", *term->numberOfRecords); + printf(" " ODR_INT_PRINTF, *term->numberOfRecords); if (term->whereInList) printf(" %s", term->whereInList); if (term->value && term->displayTerm) @@ -3907,19 +4407,19 @@ static void handle_srw_scan_response(Z_SRW_scanResponse *res) { int i; - printf ("Received SRW Scan Response\n"); - + printf("Received SRW Scan Response\n"); + for (i = 0; inum_diagnostics; i++) { if (res->diagnostics[i].uri) - printf ("SRW diagnostic %s\n", + printf("SRW diagnostic %s\n", res->diagnostics[i].uri); else - printf ("SRW diagnostic missing or could not be decoded\n"); + printf("SRW diagnostic missing or could not be decoded\n"); if (res->diagnostics[i].message) - printf ("Message: %s\n", res->diagnostics[i].message); + printf("Message: %s\n", res->diagnostics[i].message); if (res->diagnostics[i].details) - printf ("Details: %s\n", res->diagnostics[i].details); + printf("Details: %s\n", res->diagnostics[i].details); } if (res->terms) for (i = 0; inum_terms; i++) @@ -3931,66 +4431,82 @@ static void http_response(Z_HTTP_Response *hres) int ret = -1; const char *connection_head = z_HTTP_header_lookup(hres->headers, "Connection"); + if (hres->code != 200) + { + printf("HTTP Error Status=%d\n", hres->code); + } + if (!yaz_srw_check_content_type(hres)) - printf("Content type does not appear to be XML"); + printf("Content type does not appear to be XML\n"); else { - Z_SOAP *soap_package = 0; - ODR o = odr_createmem(ODR_DECODE); - Z_SOAP_Handler soap_handlers[3] = { - {YAZ_XMLNS_SRU_v1_1, 0, (Z_SOAP_fun) yaz_srw_codec}, - {YAZ_XMLNS_UPDATE_v0_9, 0, (Z_SOAP_fun) yaz_ucp_codec}, - {0, 0, 0} - }; - ret = z_soap_codec(o, &soap_package, - &hres->content_buf, &hres->content_len, - soap_handlers); - if (!ret && soap_package->which == Z_SOAP_generic) + if (!yaz_matchstr(sru_method, "solr")) { - Z_SRW_PDU *sr = (Z_SRW_PDU *) soap_package->u.generic->p; - if (sr->which == Z_SRW_searchRetrieve_response) + Z_SRW_PDU *sr = 0; + ODR o = odr_createmem(ODR_DECODE); + ret = yaz_solr_decode_response(o, hres, &sr); + + if (ret == 0 && sr->which == Z_SRW_searchRetrieve_response) handle_srw_response(sr->u.response); - else if (sr->which == Z_SRW_explain_response) - handle_srw_explain_response(sr->u.explain_response); - else if (sr->which == Z_SRW_scan_response) - handle_srw_scan_response(sr->u.scan_response); - else if (sr->which == Z_SRW_update_response) - printf("Got update response. Status: %s\n", - sr->u.update_response->operationStatus); else + { + printf("Decoding of SOLR package failed\n"); ret = -1; - } - else if (soap_package && (soap_package->which == Z_SOAP_fault - || soap_package->which == Z_SOAP_error)) - { - printf ("HTTP Error Status=%d\n", hres->code); - printf ("SOAP Fault code %s\n", - soap_package->u.fault->fault_code); - printf ("SOAP Fault string %s\n", - soap_package->u.fault->fault_string); - if (soap_package->u.fault->details) - printf ("SOAP Details %s\n", - soap_package->u.fault->details); + } + odr_destroy(o); } else { - printf("z_soap_codec failed. (no SOAP error)\n"); - ret = -1; + Z_SOAP *soap_package = 0; + ODR o = odr_createmem(ODR_DECODE); + Z_SOAP_Handler soap_handlers[4] = { + {YAZ_XMLNS_SRU_v1_1, 0, (Z_SOAP_fun) yaz_srw_codec}, + {YAZ_XMLNS_SRU_v2_response, 0, (Z_SOAP_fun) yaz_srw_codec}, + {YAZ_XMLNS_UPDATE_v0_9, 0, (Z_SOAP_fun) yaz_ucp_codec}, + {0, 0, 0} + }; + ret = z_soap_codec(o, &soap_package, + &hres->content_buf, &hres->content_len, + soap_handlers); + if (!ret && soap_package->which == Z_SOAP_generic) + { + Z_SRW_PDU *sr = (Z_SRW_PDU *) soap_package->u.generic->p; + if (sr->which == Z_SRW_searchRetrieve_response) + handle_srw_response(sr->u.response); + else if (sr->which == Z_SRW_explain_response) + handle_srw_explain_response(sr->u.explain_response); + else if (sr->which == Z_SRW_scan_response) + handle_srw_scan_response(sr->u.scan_response); + else if (sr->which == Z_SRW_update_response) + printf("Got update response. Status: %s\n", + sr->u.update_response->operationStatus); + else + { + printf("Decoding of SRW package failed\n"); + ret = -1; + } + } + else if (soap_package && (soap_package->which == Z_SOAP_fault + || soap_package->which == Z_SOAP_error)) + { + printf("SOAP Fault code %s\n", + soap_package->u.fault->fault_code); + printf("SOAP Fault string %s\n", + soap_package->u.fault->fault_string); + if (soap_package->u.fault->details) + printf("SOAP Details %s\n", + soap_package->u.fault->details); + } + else + { + printf("z_soap_codec failed. (no SOAP error)\n"); + ret = -1; + } + odr_destroy(o); } - odr_destroy(o); } if (ret) - { - if (hres->code != 200) - { - printf ("HTTP Error Status=%d\n", hres->code); - } - else - { - printf ("Decoding of SRW package failed\n"); - } - close_session(); - } + close_session(); /* close session on error */ else { if (!strcmp(hres->version, "1.0")) @@ -3999,7 +4515,7 @@ static void http_response(Z_HTTP_Response *hres) if (!connection_head || strcmp(connection_head, "Keep-Alive")) close_session(); } - else + else { /* HTTP 1.1: only if no close we stay alive .. */ if (connection_head && !strcmp(connection_head, "close")) @@ -4009,9 +4525,12 @@ static void http_response(Z_HTTP_Response *hres) } #endif -void wait_and_handle_response(int one_response_only) +#define max_HTTP_redirects 2 + +static void wait_and_handle_response(int one_response_only) { int reconnect_ok = 1; + int no_redirects = 0; int res; char *netbuffer= 0; int netbufferlen = 0; @@ -4020,7 +4539,7 @@ void wait_and_handle_response(int one_response_only) struct timeval tv_end; #endif Z_GDU *gdu; - + while(conn) { res = cs_get(conn, &netbuffer, &netbufferlen); @@ -4028,19 +4547,19 @@ void wait_and_handle_response(int one_response_only) { cs_close(conn); conn = 0; - cmd_open(0); + session_connect(cur_host); reconnect_ok = 0; if (conn) { char *buf_out; int len_out; - + buf_out = odr_getbuf(out, &len_out, 0); - + do_hex_dump(buf_out, len_out); cs_put(conn, buf_out, len_out); - + odr_reset(out); continue; } @@ -4053,7 +4572,7 @@ void wait_and_handle_response(int one_response_only) } #if HAVE_GETTIMEOFDAY if (got_tv_end == 0) - gettimeofday (&tv_end, 0); /* count first one only */ + gettimeofday(&tv_end, 0); /* count first one only */ got_tv_end++; #endif odr_reset(out); @@ -4061,7 +4580,7 @@ void wait_and_handle_response(int one_response_only) record_last = 0; do_hex_dump(netbuffer, res); odr_setbuf(in, netbuffer, res, 0); - + if (!z_GDU(in, &gdu, 0, 0)) { FILE *f = ber_file ? ber_file : stdout; @@ -4090,57 +4609,76 @@ void wait_and_handle_response(int one_response_only) if (gdu->which == Z_GDU_Z3950) { Z_APDU *apdu = gdu->u.z3950; - switch(apdu->which) + switch (apdu->which) { case Z_APDU_initResponse: - process_initResponse(apdu->u.initResponse); + process_Z3950_initResponse(apdu->u.initResponse); break; case Z_APDU_searchResponse: - process_searchResponse(apdu->u.searchResponse); + process_Z3950_searchResponse(apdu->u.searchResponse); break; case Z_APDU_scanResponse: - process_scanResponse(apdu->u.scanResponse); + process_Z3950_scanResponse(apdu->u.scanResponse); break; case Z_APDU_presentResponse: - print_refid (apdu->u.presentResponse->referenceId); + print_refid(apdu->u.presentResponse->referenceId); setno += *apdu->u.presentResponse->numberOfRecordsReturned; if (apdu->u.presentResponse->records) display_records(apdu->u.presentResponse->records); else printf("No records.\n"); - printf ("nextResultSetPosition = %d\n", + printf("nextResultSetPosition = " ODR_INT_PRINTF "\n", *apdu->u.presentResponse->nextResultSetPosition); break; case Z_APDU_sortResponse: - process_sortResponse(apdu->u.sortResponse); + process_Z3950_sortResponse(apdu->u.sortResponse); break; case Z_APDU_extendedServicesResponse: printf("Got extended services response\n"); - process_ESResponse(apdu->u.extendedServicesResponse); + process_Z3950_ESResponse(apdu->u.extendedServicesResponse); break; case Z_APDU_close: printf("Target has closed the association.\n"); - process_close(apdu->u.close); + process_Z3950_close(apdu->u.close); break; case Z_APDU_resourceControlRequest: - process_resourceControlRequest - (apdu->u.resourceControlRequest); + process_Z3950_resourceControlRequest( + apdu->u.resourceControlRequest); break; case Z_APDU_deleteResultSetResponse: - process_deleteResultSetResponse(apdu->u. - deleteResultSetResponse); + process_Z3950_deleteResultSetResponse( + apdu->u.deleteResultSetResponse); break; default: - printf("Received unknown APDU type (%d).\n", + printf("Received unknown APDU type (%d).\n", apdu->which); - close_session (); + close_session(); } } #if YAZ_HAVE_XML2 else if (gdu->which == Z_GDU_HTTP_Response) { - http_response(gdu->u.HTTP_Response); + Z_HTTP_Response *hres = gdu->u.HTTP_Response; + int code = hres->code; + const char *location = 0; + if ((code == 301 || code == 302) + && no_redirects < max_HTTP_redirects + && !yaz_matchstr(sru_method, "get") + && (location = z_HTTP_header_lookup(hres->headers, "Location"))) + { + const char *base_tmp; + session_connect_base(location, &base_tmp); + no_redirects++; + if (conn) + { + if (send_SRW_redirect(location, hres) == 2) + continue; + } + printf("Redirect failed\n"); + } + else + http_response(gdu->u.HTTP_Response); } #endif if (one_response_only) @@ -4152,75 +4690,76 @@ void wait_and_handle_response(int one_response_only) if (got_tv_end) { #if 0 - printf ("S/U S/U=%ld/%ld %ld/%ld", + printf("S/U S/U=%ld/%ld %ld/%ld", (long) tv_start.tv_sec, (long) tv_start.tv_usec, (long) tv_end.tv_sec, (long) tv_end.tv_usec); #endif - printf ("Elapsed: %.6f\n", + printf("Elapsed: %.6f\n", (double) tv_end.tv_usec / 1e6 + tv_end.tv_sec - ((double) tv_start.tv_usec / 1e6 + tv_start.tv_sec)); } #endif - xfree (netbuffer); + xfree(netbuffer); } - -int cmd_cclparse(const char* arg) +static int cmd_cclparse(const char* arg) { int error, pos; struct ccl_rpn_node *rpn=NULL; - - - rpn = ccl_find_str (bibset, arg, &error, &pos); - - if (error) { + + + rpn = ccl_find_str(bibset, arg, &error, &pos); + + if (error) + { int ioff = 3+strlen(last_cmd)+1+pos; - printf ("%*s^ - ", ioff, " "); - printf ("%s\n", ccl_err_msg (error)); + printf("%*s^ - ", ioff, " "); + printf("%s\n", ccl_err_msg(error)); } else { if (rpn) - { - ccl_pr_tree(rpn, stdout); + { + ccl_pr_tree(rpn, stdout); } } if (rpn) ccl_rpn_delete(rpn); - - printf ("\n"); - + + printf("\n"); + return 0; } - -int cmd_set_otherinfo(const char* args) +static int cmd_set_otherinfo(const char* args) { char oidstr[101], otherinfoString[101]; int otherinfoNo; int sscan_res; - - sscan_res = sscanf (args, "%d %100[^ ] %100s", + + sscan_res = sscanf(args, "%d %100[^ ] %100s", &otherinfoNo, oidstr, otherinfoString); - if (sscan_res > 0 && otherinfoNo >= maxOtherInfosSupported) { + if (sscan_res > 0 && otherinfoNo >= maxOtherInfosSupported) + { printf("Error otherinfo index too large (%d>=%d)\n", otherinfoNo,maxOtherInfosSupported); return 0; } - - if (sscan_res==1) + + if (sscan_res==1) { /* reset this otherinfo */ extraOtherInfos[otherinfoNo].oid[0] = -1; - xfree(extraOtherInfos[otherinfoNo].value); + xfree(extraOtherInfos[otherinfoNo].value); extraOtherInfos[otherinfoNo].value = 0; return 0; } - if (sscan_res != 3) { + if (sscan_res != 3) + { printf("Error in set_otherinfo command \n"); return 0; } @@ -4231,34 +4770,35 @@ int cmd_set_otherinfo(const char* args) yaz_string_to_oid_nmem(yaz_oid_std(), CLASS_GENERAL, oidstr, oid_tmp); oid_oidcpy(extraOtherInfos[otherinfoNo].oid, oid); - + xfree(extraOtherInfos[otherinfoNo].value); extraOtherInfos[otherinfoNo].value = xstrdup(otherinfoString); nmem_destroy(oid_tmp); } - + return 0; } -int cmd_sleep(const char* args ) +static int cmd_sleep(const char* args ) { - int sec=atoi(args); - if( sec > 0 ) { + int sec = atoi(args); + if (sec > 0) + { #ifdef WIN32 Sleep(sec*1000); #else sleep(sec); #endif - printf("Done sleeping %d seconds\n", sec); + printf("Done sleeping %d seconds\n", sec); } - return 1; + return 1; } -int cmd_list_otherinfo(const char* args) +static int cmd_list_otherinfo(const char* args) { - int i; - + int i; + if (strlen(args)>0) { i = atoi(args); @@ -4278,11 +4818,11 @@ int cmd_list_otherinfo(const char* args) i, name ? name : "null", extraOtherInfos[i].value); } - - } - else - { - for(i = 0; i < maxOtherInfosSupported; ++i) + + } + else + { + for (i = 0; i < maxOtherInfosSupported; ++i) { if (extraOtherInfos[i].value) { @@ -4300,38 +4840,37 @@ int cmd_list_otherinfo(const char* args) return 0; } - -int cmd_list_all(const char* args) { +static int cmd_list_all(const char* args) +{ int i; - + /* connection options */ - if(conn) { - printf("Connected to : %s\n",last_open_command); - } else { - if(last_open_command) - printf("Not connected to : %s\n",last_open_command); - else - printf("Not connected : \n"); - - } - if(yazProxy) printf("using proxy : %s\n",yazProxy); - + if (conn) + printf("Connected to : %s\n", cur_host); + else if (*cur_host) + printf("Not connected to : %s\n", cur_host); + else + printf("Not connected : \n"); + if (yazProxy) printf("using proxy : %s\n",yazProxy); + printf("auto_reconnect : %s\n",auto_reconnect?"on":"off"); printf("auto_wait : %s\n",auto_wait?"on":"off"); - - if (!auth) { + + if (!auth) printf("Authentication : none\n"); - } else { - switch(auth->which) { + else + { + switch (auth->which) + { case Z_IdAuthentication_idPass: - printf("Authentication : IdPass\n"); + printf("Authentication : IdPass\n"); printf(" Login User : %s\n",auth->u.idPass->userId?auth->u.idPass->userId:""); printf(" Login Group : %s\n",auth->u.idPass->groupId?auth->u.idPass->groupId:""); printf(" Password : %s\n",auth->u.idPass->password?auth->u.idPass->password:""); break; case Z_IdAuthentication_open: - printf("Authentication : psOpen\n"); - printf(" Open string : %s\n",auth->u.open); + printf("Authentication : psOpen\n"); + printf(" Open string : %s\n",auth->u.open); break; default: printf("Authentication : Unknown\n"); @@ -4339,22 +4878,22 @@ int cmd_list_all(const char* args) { } if (negotiationCharset) printf("Neg. Character set : `%s'\n", negotiationCharset); - + /* bases */ printf("Bases : "); for (i = 0; i 0) { @@ -4362,40 +4901,44 @@ int cmd_list_all(const char* args) { } printf("Schema : %s\n",record_schema ? record_schema : "not set"); printf("Elements : %s\n",elementSetNames?elementSetNames->u.generic:""); - + /* loging options */ printf("APDU log : %s\n",apdu_file?"on":"off"); printf("Record log : %s\n",marc_file?"on":"off"); - + /* other infos */ printf("Other Info: \n"); cmd_list_otherinfo(""); - + return 0; } -int cmd_clear_otherinfo(const char* args) +static int cmd_clear_otherinfo(const char* args) { - if(strlen(args)>0) { + if (strlen(args) > 0) + { int otherinfoNo = atoi(args); - if (otherinfoNo >= maxOtherInfosSupported) { + if (otherinfoNo >= maxOtherInfosSupported) + { printf("Error otherinfo index too large (%d>=%d)\n", otherinfoNo, maxOtherInfosSupported); return 0; } if (extraOtherInfos[otherinfoNo].value) - { + { /* only clear if set. */ extraOtherInfos[otherinfoNo].oid[0] = -1; xfree(extraOtherInfos[otherinfoNo].value); extraOtherInfos[otherinfoNo].value = 0; } - } else { + } + else + { int i; - for(i = 0; i < maxOtherInfosSupported; ++i) + for (i = 0; i < maxOtherInfosSupported; ++i) { if (extraOtherInfos[i].value) - { + { extraOtherInfos[i].oid[0] = -1; xfree(extraOtherInfos[i].value); extraOtherInfos[i].value = 0; @@ -4405,21 +4948,19 @@ int cmd_clear_otherinfo(const char* args) return 0; } -int cmd_wait_response(const char *arg) +static int cmd_wait_response(const char *arg) { + int i; int wait_for = atoi(arg); - int i=0; - if( wait_for < 1 ) { + if (wait_for < 1) wait_for = 1; - }; - - for( i=0 ; i < wait_for ; ++i ) { + + for (i = 0 ; i < wait_for; ++i ) wait_and_handle_response(1); - }; return 0; } -static int cmd_help (const char *line); +static int cmd_help(const char *line); typedef char *(*completerFunctionType)(const char *text, int state); @@ -4434,6 +4975,7 @@ static struct { {"open", cmd_open, "('tcp'|'ssl')':[':'][/]",NULL,0,NULL}, {"quit", cmd_quit, "",NULL,0,NULL}, {"find", cmd_find, "",NULL,0,NULL}, + {"facets", cmd_facets, "",NULL,0,NULL}, {"delete", cmd_delete, "",NULL,0,NULL}, {"base", cmd_base, "",NULL,0,NULL}, {"show", cmd_show, "['+'<#recs>['+']]",NULL,0,NULL}, @@ -4505,23 +5047,24 @@ static struct { {"zversion", cmd_zversion, "", NULL, 0, NULL}, {"help", cmd_help, "", NULL,0,NULL}, {"init", cmd_init, "", NULL,0,NULL}, - {"sru", cmd_sru, "", NULL,0,NULL}, + {"sru", cmd_sru, " ", NULL,0,NULL}, + {"url", cmd_url, "", NULL,0,NULL}, {"exit", cmd_quit, "",NULL,0,NULL}, {0,0,0,0,0,0} }; -static int cmd_help (const char *line) +static int cmd_help(const char *line) { int i; char topic[21]; - + *topic = 0; - sscanf (line, "%20s", topic); + sscanf(line, "%20s", topic); if (*topic == 0) printf("Commands:\n"); for (i = 0; cmd_array[i].cmd; i++) - if (*topic == 0 || strcmp (topic, cmd_array[i].cmd) == 0) + if (*topic == 0 || strcmp(topic, cmd_array[i].cmd) == 0) printf(" %s %s\n", cmd_array[i].cmd, cmd_array[i].ad); if (!strcmp(topic, "find")) { @@ -4569,41 +5112,42 @@ static int cmd_help (const char *line) return 1; } -int cmd_register_tab(const char* arg) +static int cmd_register_tab(const char* arg) { #if HAVE_READLINE_READLINE_H char command[101], tabargument[101]; int i; int num_of_tabs; const char** tabslist; - - if (sscanf (arg, "%100s %100s", command, tabargument) < 1) { + + if (sscanf(arg, "%100s %100s", command, tabargument) < 1) + { return 0; } - + /* locate the amdn in the list */ - for (i = 0; cmd_array[i].cmd; i++) { - if (!strncmp(cmd_array[i].cmd, command, strlen(command))) { + for (i = 0; cmd_array[i].cmd; i++) + { + if (!strncmp(cmd_array[i].cmd, command, strlen(command))) break; - } } - - if (!cmd_array[i].cmd) { + + if (!cmd_array[i].cmd) + { fprintf(stderr,"Unknown command %s\n",command); return 1; } - - + + if (!cmd_array[i].local_tabcompletes) cmd_array[i].local_tabcompletes = (const char **) calloc(1,sizeof(char**)); - - num_of_tabs=0; - + + num_of_tabs=0; + tabslist = cmd_array[i].local_tabcompletes; - for(; tabslist && *tabslist; tabslist++) { + for (; tabslist && *tabslist; tabslist++) num_of_tabs++; - } - + cmd_array[i].local_tabcompletes = (const char **) realloc(cmd_array[i].local_tabcompletes, (num_of_tabs+2)*sizeof(char**)); @@ -4614,16 +5158,15 @@ int cmd_register_tab(const char* arg) return 1; } - -void process_cmd_line(char* line) -{ +static void process_cmd_line(char* line) +{ int i, res; char word[32], arg[10240]; - + #if HAVE_GETTIMEOFDAY - gettimeofday (&tv_start, 0); + gettimeofday(&tv_start, 0); #endif - + if ((res = sscanf(line, "%31s %10239[^;]", word, arg)) <= 0) { strcpy(word, last_cmd); @@ -4632,55 +5175,57 @@ void process_cmd_line(char* line) else if (res == 1) *arg = 0; strcpy(last_cmd, word); - + /* removed tailing spaces from the arg command */ - { + { char* p = arg; char* lastnonspace=NULL; - - for(;*p; ++p) { - if(!isspace(*(unsigned char *) p)) { + + for (; *p; ++p) + { + if (!yaz_isspace(*p)) lastnonspace = p; - } } - if(lastnonspace) + if (lastnonspace) *(++lastnonspace) = 0; } - + for (i = 0; cmd_array[i].cmd; i++) if (!strncmp(cmd_array[i].cmd, word, strlen(word))) { res = (*cmd_array[i].fun)(arg); break; } - + if (!cmd_array[i].cmd) /* dump our help-screen */ { printf("Unknown command: %s.\n", word); printf("Type 'help' for list of commands\n"); res = 1; } - - if(apdu_file) fflush(apdu_file); - + + if (apdu_file) + fflush(apdu_file); + if (res >= 2 && auto_wait) wait_and_handle_response(0); - - if(apdu_file) + + if (apdu_file) fflush(apdu_file); - if(marc_file) + if (marc_file) fflush(marc_file); } -static char *command_generator(const char *text, int state) +static char *command_generator(const char *text, int state) { #if HAVE_READLINE_READLINE_H - static int idx; - if (state==0) { + static int idx; + if (state == 0) idx = 0; - } - for( ; cmd_array[idx].cmd; ++idx) { - if (!strncmp(cmd_array[idx].cmd, text, strlen(text))) { + for (; cmd_array[idx].cmd; ++idx) + { + if (!strncmp(cmd_array[idx].cmd, text, strlen(text))) + { ++idx; /* skip this entry on the next run */ return strdup(cmd_array[idx-1].cmd); } @@ -4700,45 +5245,50 @@ static char* default_completer(const char* text, int state) #if HAVE_READLINE_READLINE_H -/* +/* This function only known how to complete on the first word */ -char **readline_completer(char *text, int start, int end) +static char **readline_completer(char *text, int start, int end) { completerFunctionType completerToUse; - - if(start == 0) { + + if (start == 0) + { #if HAVE_READLINE_RL_COMPLETION_MATCHES - char** res = rl_completion_matches(text, command_generator); + char** res = rl_completion_matches(text, command_generator); #else char** res = completion_matches(text, - (CPFunction*)command_generator); + (CPFunction*)command_generator); #endif rl_attempted_completion_over = 1; return res; - } else { + } + else + { char arg[10240],word[32]; - int i=0 ,res; - if ((res = sscanf(rl_line_buffer, "%31s %10239[^;]", word, arg)) <= 0) { + int i ,res; + if ((res = sscanf(rl_line_buffer, "%31s %10239[^;]", word, arg)) <= 0) + { rl_attempted_completion_over = 1; return NULL; } - + for (i = 0; cmd_array[i].cmd; i++) if (!strncmp(cmd_array[i].cmd, word, strlen(word))) break; - - if(!cmd_array[i].cmd) + + if (!cmd_array[i].cmd) return NULL; - + default_completer_list = cmd_array[i].local_tabcompletes; - + completerToUse = cmd_array[i].rl_completerfunction; - if (!completerToUse) + if (!completerToUse) { /* if command completer is not defined use the default completer */ completerToUse = default_completer; } - if (completerToUse) { + if (completerToUse) + { #ifdef HAVE_READLINE_RL_COMPLETION_MATCHES char** res= rl_completion_matches(text, completerToUse); @@ -4746,11 +5296,13 @@ char **readline_completer(char *text, int start, int end) char** res= completion_matches(text, (CPFunction*)completerToUse); #endif - if (!cmd_array[i].complete_filenames) + if (!cmd_array[i].complete_filenames) rl_attempted_completion_over = 1; return res; - } else { - if (!cmd_array[i].complete_filenames) + } + else + { + if (!cmd_array[i].complete_filenames) rl_attempted_completion_over = 1; return 0; } @@ -4759,7 +5311,7 @@ char **readline_completer(char *text, int start, int end) #endif #ifndef WIN32 -void ctrl_c_handler(int x) +static void ctrl_c_handler(int x) { exit_client(0); } @@ -4776,7 +5328,7 @@ static void client(void) #endif #if HAVE_GETTIMEOFDAY - gettimeofday (&tv_start, 0); + gettimeofday(&tv_start, 0); #endif while (1) @@ -4787,7 +5339,10 @@ static void client(void) { line_in=readline(C_PROMPT); if (!line_in) + { + putchar('\n'); break; + } #if HAVE_READLINE_HISTORY_H if (*line_in) add_history(line_in); @@ -4795,15 +5350,15 @@ static void client(void) strncpy(line, line_in, sizeof(line)-1); free(line_in); } -#endif +#endif if (!line_in) { char *end_p; - printf (C_PROMPT); + printf(C_PROMPT); fflush(stdout); if (!fgets(line, sizeof(line)-1, stdin)) break; - if ((end_p = strchr (line, '\n'))) + if ((end_p = strchr(line, '\n'))) *end_p = '\0'; } if (isatty(0)) @@ -4814,12 +5369,12 @@ static void client(void) static void show_version(void) { - char vstr[20]; + char vstr[20], sha1_str[41]; - yaz_version(vstr, 0); - printf ("YAZ version: %s\n", YAZ_VERSION); - if (strcmp(vstr, YAZ_VERSION)) - printf ("YAZ DLL/SO: %s\n", vstr); + yaz_version(vstr, sha1_str); + printf("YAZ version: %s %s\n", YAZ_VERSION, YAZ_VERSION_SHA1); + if (strcmp(sha1_str, YAZ_VERSION_SHA1)) + printf("YAZ DLL/SO: %s %s\n", vstr, sha1_str); exit(0); } @@ -4829,11 +5384,12 @@ int main(int argc, char **argv) char *open_command = 0; char *auth_command = 0; char *arg; + const char *rc_file = 0; int ret; - + #if HAVE_LOCALE_H if (!setlocale(LC_CTYPE, "")) - fprintf (stderr, "setlocale failed\n"); + fprintf(stderr, "setlocale failed\n"); #endif #if HAVE_LANGINFO_H #ifdef CODESET @@ -4842,7 +5398,7 @@ int main(int argc, char **argv) #endif if (codeset) outputCharset = xstrdup(codeset); - + ODR_MASK_SET(&z3950_options, Z_Options_search); ODR_MASK_SET(&z3950_options, Z_Options_present); ODR_MASK_SET(&z3950_options, Z_Options_namedResultSets); @@ -4851,18 +5407,19 @@ int main(int argc, char **argv) ODR_MASK_SET(&z3950_options, Z_Options_sort); ODR_MASK_SET(&z3950_options, Z_Options_extendedServices); ODR_MASK_SET(&z3950_options, Z_Options_delSet); - ODR_MASK_SET(&z3950_options, Z_Options_negotiationModel); - while ((ret = options("k:c:q:a:b:m:v:p:u:t:Vxd:", argv, argc, &arg)) != -2) + nmem_auth = nmem_create(); + + while ((ret = options("k:c:q:a:b:m:v:p:u:t:Vxd:f:", argv, argc, &arg)) != -2) { switch (ret) { case 0: if (!open_command) { - open_command = (char *) xmalloc (strlen(arg)+6); - strcpy (open_command, "open "); - strcat (open_command, arg); + open_command = (char *) xmalloc(strlen(arg)+6); + strcpy(open_command, "open "); + strcat(open_command, arg); } else { @@ -4871,54 +5428,54 @@ int main(int argc, char **argv) exit(1); } break; + case 'a': + if (!strcmp(arg, "-")) + apdu_file=stderr; + else + apdu_file=fopen(arg, "a"); + break; + case 'b': + if (!strcmp(arg, "-")) + ber_file=stderr; + else + ber_file=fopen(arg, "a"); + break; + case 'c': + strncpy(ccl_fields, arg, sizeof(ccl_fields)-1); + ccl_fields[sizeof(ccl_fields)-1] = '\0'; + break; case 'd': dump_file_prefix = arg; break; + case 'f': + rc_file = arg; + break; case 'k': kilobytes = atoi(arg); break; case 'm': - if (!(marc_file = fopen (arg, "a"))) + if (!(marc_file = fopen(arg, "a"))) { - perror (arg); - exit (1); + perror(arg); + exit(1); } break; - case 't': - outputCharset = xstrdup(arg); - break; - case 'c': - strncpy (ccl_fields, arg, sizeof(ccl_fields)-1); - ccl_fields[sizeof(ccl_fields)-1] = '\0'; + case 'p': + yazProxy = xstrdup(arg); break; case 'q': - strncpy (cql_fields, arg, sizeof(cql_fields)-1); + strncpy(cql_fields, arg, sizeof(cql_fields)-1); cql_fields[sizeof(cql_fields)-1] = '\0'; break; - case 'b': - if (!strcmp(arg, "-")) - ber_file=stderr; - else - ber_file=fopen(arg, "a"); - break; - case 'a': - if (!strcmp(arg, "-")) - apdu_file=stderr; - else - apdu_file=fopen(arg, "a"); - break; - case 'x': - hex_dump = 1; - break; - case 'p': - yazProxy = xstrdup(arg); + case 't': + outputCharset = xstrdup(arg); break; case 'u': if (!auth_command) { - auth_command = (char *) xmalloc (strlen(arg)+6); - strcpy (auth_command, "auth "); - strcat (auth_command, arg); + auth_command = (char *) xmalloc(strlen(arg)+6); + strcpy(auth_command, "auth "); + strcat(auth_command, arg); } break; case 'v': @@ -4927,30 +5484,37 @@ int main(int argc, char **argv) case 'V': show_version(); break; + case 'x': + hex_dump = 1; + break; default: - fprintf (stderr, "Usage: %s " - " [-a ]" + fprintf(stderr, "Usage: %s " + " [-a apdulog]" " [-b berdump]" - " [-d dump]\n" - " [-c cclfields]" + " [-c cclfile]" + " [-d dump]" + " [-f cmdfile]" " [-k size]" - " [-m ]\n" - " [-p ]" - " [-q cqlfields]" - " [-u ]" + " [-m marclog]" + " [-p proxy-addr]" + " [-q cqlfile]" + " [-t dispcharset]" + " [-u auth]" + " [-v loglevel]" " [-V]" - " []\n", + " [-x]" + " [server-addr]\n", prog); - exit (1); - } + exit(1); + } } - initialize(); + initialize(rc_file); if (auth_command) { #ifdef HAVE_GETTIMEOFDAY - gettimeofday (&tv_start, 0); + gettimeofday(&tv_start, 0); #endif - process_cmd_line (auth_command); + process_cmd_line(auth_command); #if HAVE_READLINE_HISTORY_H add_history(auth_command); #endif @@ -4959,9 +5523,9 @@ int main(int argc, char **argv) if (open_command) { #ifdef HAVE_GETTIMEOFDAY - gettimeofday (&tv_start, 0); + gettimeofday(&tv_start, 0); #endif - process_cmd_line (open_command); + process_cmd_line(open_command); #if HAVE_READLINE_HISTORY_H add_history(open_command); #endif @@ -4974,6 +5538,7 @@ int main(int argc, char **argv) /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab