X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=client%2Fclient.c;h=bb3b465a4c7cc69707165e6bb38f7c8f2401c7b7;hp=b1147d6f80cf94cfc3f2f041b884fed814082d11;hb=650cc0539b6a484eba203949cb43a08b9084504d;hpb=d8b453a7e9a34f0254a3d9483a26add0aff3eb6c diff --git a/client/client.c b/client/client.c index b1147d6..bb3b465 100644 --- a/client/client.c +++ b/client/client.c @@ -1,20 +1,32 @@ -/* - * Copyright (c) 1995-2002, Index Data +/* + * Copyright (c) 1995-2003, Index Data * See the file LICENSE for details. * - * $Id: client.c,v 1.158 2002-06-10 11:07:57 adam Exp $ + * $Id: client.c,v 1.179 2003-01-27 21:31:35 adam Exp $ */ #include #include +#if HAVE_LOCALE_H +#include +#endif + +#if HAVE_LANGINFO_H +#include +#endif + #include +#include + +#ifdef WIN32 +#include +#define S_ISREG(x) (x & _S_IFREG) +#define S_ISDIR(x) (x & _S_IFDIR) +#endif #include -#include -#ifdef USE_XTIMOSI -#include -#endif +#include #include #include @@ -31,6 +43,7 @@ #if HAVE_READLINE_READLINE_H #include +#include #endif #if HAVE_READLINE_HISTORY_H #include @@ -44,6 +57,8 @@ #define C_PROMPT "Z> " +static char *codeset = 0; /* character set for output */ + static ODR out, in, print; /* encoding and decoding streams */ static FILE *apdu_file = 0; static COMSTACK conn = 0; /* our z-association */ @@ -51,7 +66,7 @@ static Z_IdAuthentication *auth = 0; /* our current auth definition */ char *databaseNames[128]; int num_databaseNames = 0; static Z_External *record_last = 0; -static int setnumber = -1; /* current result set number */ +static int setnumber = -1; /* current result set number */ static int smallSetUpperBound = 0; static int largeSetLowerBound = 1; static int mediumSetPresentNumber = 0; @@ -61,7 +76,7 @@ static enum oid_proto protocol = PROTO_Z3950; /* current app protocol */ static enum oid_value recordsyntax = VAL_USMARC; static enum oid_value schema = VAL_NONE; static int sent_close = 0; -static NMEM session_mem = NULL; /* memory handle for init-response */ +static NMEM session_mem = NULL; /* memory handle for init-response */ static Z_InitResponse *session = 0; /* session parameters */ static char last_scan_line[512] = "0"; static char last_scan_query[512] = "0"; @@ -72,14 +87,18 @@ static int kilobytes = 1024; static char* yazCharset = 0; static char* yazLang = 0; + static char last_cmd[32] = "?"; static FILE *marcdump = 0; static char *refid = NULL; +static char *last_open_command = NULL; +static int auto_reconnect = 0; typedef enum { QueryType_Prefix, QueryType_CCL, - QueryType_CCL2RPN + QueryType_CCL2RPN, + QueryType_CQL } QueryType; static QueryType queryType = QueryType_Prefix; @@ -102,22 +121,73 @@ int rl_attempted_completion_over = 0; while(isspace(*args_end)) {*args_end=0;--args_end;}; \ } +#define maxOtherInfosSupported 10 +struct { + int oidval; + char* value; +} extraOtherInfos[maxOtherInfosSupported]; + void process_cmd_line(char* line); char ** readline_completer(char *text, int start, int end); char *command_generator(const char *text, int state); - +char** curret_global_list=NULL; +int cmd_register_tab(char* arg); ODR getODROutputStream() { return out; } +const char* query_type_as_string(QueryType 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)"; + default: + return "unknown Query type internal yaz-client error"; + } +} + + +void do_hex_dump(char* buf,int len) +{ +#if 0 + int i,x; + for( i=0; i= 32) || strchr ("\n\r\t\f", buf[i])) - printf ("%c", buf[i]); - else - printf ("\\X%02X", buf[i]); + size_t i; + for (i = 0; i= 32) || strchr ("\n\r\t\f", buf[i])) + printf ("%c", buf[i]); + else + printf ("\\X%02X", buf[i]); } static void print_refid (Z_ReferenceId *id) @@ -207,7 +279,7 @@ static void send_initRequest(const char* type_and_host) yaz_oi_APDU(apdu, &p); - if (p0=yaz_oi_update(p, out, NULL, 0, 0)) { + if ((p0=yaz_oi_update(p, out, NULL, 0, 0))) { ODR_MASK_SET(req->options, Z_Options_negotiationModel); p0->which = Z_OtherInfo_externallyDefinedInfo; @@ -302,15 +374,16 @@ static int process_initResponse(Z_InitResponse *res) yaz_get_charneg_record(res->otherInfo); if (p) { - - char *charset=NULL, *lang=NULL; - int selected; - - yaz_get_response_charneg(session_mem, p, &charset, &lang, &selected); - - printf("Accepted character set : `%s'\n", charset); - printf("Accepted code language : `%s'\n", lang); - printf("Accepted records in ...: %d\n", selected ); + + char *charset=NULL, *lang=NULL; + int selected; + + yaz_get_response_charneg(session_mem, p, &charset, &lang, + &selected); + + printf("Accepted character set : %s\n", charset); + printf("Accepted code language : %s\n", lang ? lang : "none"); + printf("Accepted records in ...: %d\n", selected ); } } fflush (stdout); @@ -332,13 +405,20 @@ static int cmd_base(char *arg) num_databaseNames = 0; while (1) { + char *cp1; if (!(cp = strchr(arg, ' '))) cp = arg + strlen(arg); if (cp - arg < 1) break; databaseNames[num_databaseNames] = (char *)xmalloc (1 + cp - arg); memcpy (databaseNames[num_databaseNames], arg, cp - arg); - databaseNames[num_databaseNames++][cp - arg] = '\0'; + databaseNames[num_databaseNames][cp - arg] = '\0'; + + for (cp1 = databaseNames[num_databaseNames]; *cp1 ; cp1++) + if (*cp1 == '+') + *cp1 = ' '; + num_databaseNames++; + if (!*cp) break; arg = cp+1; @@ -346,11 +426,19 @@ static int cmd_base(char *arg) return 1; } +void cmd_open_remember_last_open_command(char* arg, char* new_open_command) +{ + if(last_open_command != arg) + { + if(last_open_command) xfree(last_open_command); + last_open_command = xstrdup(new_open_command); + } +} + int cmd_open(char *arg) { void *add; - char type_and_host[101], base[101]; - CS_TYPE t; + char type_and_host[101], base[101]; if (conn) { @@ -363,24 +451,25 @@ int cmd_open(char *arg) nmem_destroy (session_mem); session_mem = NULL; } - } - if (strncmp (arg, "unix:", 5) == 0) - { + } + + if (strncmp (arg, "unix:", 5) == 0) + { base[0] = '\0'; conn = cs_create_host(arg, 1, &add); - } - else - { - t = tcpip_type; - base[0] = '\0'; - if (sscanf (arg, "%100[^/]/%100s", type_and_host, base) < 1) - return 0; - - if(yazProxy) - conn = cs_create_host(yazProxy, 1, &add); - else - conn = cs_create_host(type_and_host, 1, &add); + cmd_open_remember_last_open_command(arg,arg); + } + else + { + base[0] = '\0'; + if (sscanf (arg, "%100[^/]/%100s", type_and_host, base) < 1) + return 0; + cmd_open_remember_last_open_command(arg,type_and_host); + if (yazProxy) + conn = cs_create_host(yazProxy, 1, &add); + else + conn = cs_create_host(type_and_host, 1, &add); } if (!conn) { @@ -393,7 +482,11 @@ int cmd_open(char *arg) { printf ("error = %s\n", cs_strerror(conn)); if (conn->cerrno == CSYSERR) - perror("system"); + { + char msg[256]; + yaz_strerror(msg, sizeof(msg)); + printf ("%s\n", msg); + } cs_close(conn); conn = 0; return 0; @@ -403,9 +496,28 @@ int cmd_open(char *arg) send_initRequest(type_and_host); if (*base) cmd_base (base); + return 2; } + +void try_reconnect() +{ + + char* open_command; + + if(!( auto_reconnect && last_open_command) ) return ; + + 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); +} + int cmd_authentication(char *arg) { static Z_IdAuthentication au; @@ -431,6 +543,15 @@ int cmd_authentication(char *arg) au.which = Z_IdAuthentication_open; au.u.open = user; } + if (r == 2) + { + auth = &au; + au.which = Z_IdAuthentication_idPass; + au.u.idPass = &idPass; + idPass.groupId = NULL; + idPass.userId = user; + idPass.password = group; + } if (r == 3) { auth = &au; @@ -446,105 +567,6 @@ int cmd_authentication(char *arg) /* SEARCH SERVICE ------------------------------ */ static void display_record(Z_External *r); -static void display_variant(Z_Variant *v, int level) -{ - int i; - - for (i = 0; i < v->num_triples; i++) - { - printf("%*sclass=%d,type=%d", level * 4, "", *v->triples[i]->zclass, - *v->triples[i]->type); - if (v->triples[i]->which == Z_Triple_internationalString) - printf(",value=%s\n", v->triples[i]->value.internationalString); - else - printf("\n"); - } -} - -static void display_grs1(Z_GenericRecord *r, int level) -{ - int i; - - if (!r) - { - return; - } - for (i = 0; i < r->num_elements; i++) - { - Z_TaggedElement *t; - - printf("%*s", level * 4, ""); - t = r->elements[i]; - printf("("); - if (t->tagType) - printf("%d,", *t->tagType); - else - printf("?,"); - if (t->tagValue->which == Z_StringOrNumeric_numeric) - printf("%d) ", *t->tagValue->u.numeric); - else - printf("%s) ", t->tagValue->u.string); - if (t->content->which == Z_ElementData_subtree) - { - if (!t->content->u.subtree) - printf (" (no subtree)\n"); - else - { - printf("\n"); - display_grs1(t->content->u.subtree, level+1); - } - } - else if (t->content->which == Z_ElementData_string) - printf("%s\n", t->content->u.string); - else if (t->content->which == Z_ElementData_numeric) - printf("%d\n", *t->content->u.numeric); - else if (t->content->which == Z_ElementData_oid) - { - int *ip = t->content->u.oid; - oident *oent; - - if ((oent = oid_getentbyoid(t->content->u.oid))) - printf("OID: %s\n", oent->desc); - else - { - printf("{"); - while (ip && *ip >= 0) - printf(" %d", *(ip++)); - printf(" }\n"); - } - } - else if (t->content->which == Z_ElementData_noDataRequested) - printf("[No data requested]\n"); - else if (t->content->which == Z_ElementData_elementEmpty) - printf("[Element empty]\n"); - else if (t->content->which == Z_ElementData_elementNotThere) - printf("[Element not there]\n"); - else if (t->content->which == Z_ElementData_date) - printf("Date: %s\n", t->content->u.date); - else if (t->content->which == Z_ElementData_ext) - { - printf ("External\n"); - display_record (t->content->u.ext); - } - else - printf("? type = %d\n",t->content->which); - if (t->appliedVariant) - display_variant(t->appliedVariant, level+1); - if (t->metaData && t->metaData->supportedVariants) - { - int c; - - printf("%*s---- variant list\n", (level+1)*4, ""); - for (c = 0; c < t->metaData->num_supportedVariants; c++) - { - printf("%*svariant #%d\n", (level+1)*4, "", c); - display_variant(t->metaData->supportedVariants[c], level + 2); - } - } - } -} - - static void print_record(const unsigned char *buf, size_t len) { size_t i = len; @@ -592,24 +614,26 @@ static void display_record(Z_External *r) fprintf(stderr, "[Near %d]\n", odr_offset(in)); fprintf(stderr, "Packet dump:\n---------\n"); odr_dumpBER(stderr, (char*)r->u.octet_aligned->buf, - r->u.octet_aligned->len); + r->u.octet_aligned->len); fprintf(stderr, "---------\n"); - exit(1); + + /* note just ignores the error ant print the bytes form the octet_aligned later */ + } else { + /* + * Note: we throw away the original, BER-encoded record here. + * Do something else with it if you want to keep it. + */ + r->u.sutrs = (Z_SUTRS *) rr; /* we don't actually check the type here. */ + r->which = type->what; } - /* - * Note: we throw away the original, BER-encoded record here. - * Do something else with it if you want to keep it. - */ - r->u.sutrs = (Z_SUTRS *) rr; /* we don't actually check the type here. */ - r->which = type->what; } } - if (ent && ent->oclass != CLASS_RECSYN) + if (ent && ent->oclass != CLASS_RECSYN) return; if (ent && ent->value == VAL_SOIF) print_record((const unsigned char *) r->u.octet_aligned->buf, r->u.octet_aligned->len); - else if (r->which == Z_External_octet && r->u.octet_aligned->len) + else if (r->which == Z_External_octet) { const char *octet_buf = (char*)r->u.octet_aligned->buf; if (ent->value == VAL_TEXT_XML || ent->value == VAL_APPLICATION_XML || @@ -637,13 +661,64 @@ static void display_record(Z_External *r) #endif ) { - if (marc_display_exl (octet_buf, NULL, 0 /* debug */, - r->u.octet_aligned->len) <= 0) + char *result; + int rlen; + yaz_iconv_t cd = 0; + yaz_marc_t mt = yaz_marc_create(); + + if (yaz_marc_decode_buf(mt, octet_buf,r->u.octet_aligned->len, + &result, &rlen)> 0) + { + char *from = 0; + if (ent->value == VAL_USMARC) + { + if (octet_buf[9] == 'a') + from = "UTF-8"; + else + from = "MARC8"; + } + else + from = "ISO-8859-1"; + + if (codeset && from) + { + printf ("convert from %s to %s\n", from, codeset); + cd = yaz_iconv_open(codeset, from); + } + if (!cd) + fwrite (result, 1, rlen, stdout); + else + { + char outbuf[12]; + size_t inbytesleft = rlen; + const char *inp = result; + + while (inbytesleft) + { + size_t outbytesleft = sizeof(outbuf); + char *outp = outbuf; + size_t r = yaz_iconv (cd, (char**) &inp, + &inbytesleft, + &outp, &outbytesleft); + if (r == (size_t) (-1)) + { + int e = yaz_iconv_error(cd); + if (e != YAZ_ICONV_E2BIG) + break; + } + fwrite (outbuf, outp - outbuf, 1, stdout); + } + } + } + else { printf ("bad MARC. Dumping as it is:\n"); print_record((const unsigned char*) octet_buf, - r->u.octet_aligned->len); - } + r->u.octet_aligned->len); + } + yaz_marc_destroy(mt); + if (cd) + yaz_iconv_close(cd); } else { @@ -665,12 +740,16 @@ static void display_record(Z_External *r) } else if (ent && ent->value == VAL_GRS1) { + WRBUF w; if (r->which != Z_External_grs1) { printf("Expecting single GRS type for GRS.\n"); return; } - display_grs1(r->u.grs1, 0); + w = wrbuf_alloc(); + yaz_display_grs1(w, r->u.grs1, 0); + puts (wrbuf_buf(w)); + wrbuf_free(w, 1); } else { @@ -797,6 +876,8 @@ static int send_searchRequest(char *arg) char setstring[100]; Z_RPNQuery *RPNquery; Odr_oct ccl_query; + YAZ_PQF_Parser pqf_parser; + Z_External *ext; if (queryType == QueryType_CCL2RPN) { @@ -850,12 +931,20 @@ static int send_searchRequest(char *arg) { case QueryType_Prefix: query.which = Z_Query_type_1; - RPNquery = p_query_rpn (out, protocol, arg); + pqf_parser = yaz_pqf_create (); + RPNquery = yaz_pqf_parse (pqf_parser, out, arg); if (!RPNquery) { - printf("Prefix query error\n"); + const char *pqf_msg; + size_t off; + int code = yaz_pqf_error (pqf_parser, &pqf_msg, &off); + printf("%*s^\n", off+4, ""); + printf("Prefix query error: %s (code %d)\n", pqf_msg, code); + + yaz_pqf_destroy (pqf_parser); return 0; } + yaz_pqf_destroy (pqf_parser); query.u.type_1 = RPNquery; break; case QueryType_CCL: @@ -875,6 +964,16 @@ static int send_searchRequest(char *arg) query.u.type_1 = RPNquery; ccl_rpn_delete (rpn); break; + case QueryType_CQL: + query.which = Z_Query_type_104; + ext = odr_malloc(out, sizeof(*ext)); + ext->direct_reference = odr_getoidbystr(out, "1.2.840.10003.16.2"); + ext->indirect_reference = 0; + ext->descriptor = 0; + ext->which = Z_External_CQL; + ext->u.cql = odr_strdup(out, arg); + query.u.type_104 = ext; + break; default: printf ("Unsupported query type\n"); return 0; @@ -895,11 +994,23 @@ static void display_queryExpression (Z_QueryExpression *qe) if (qe->u.term->queryTerm) { Z_Term *term = qe->u.term->queryTerm; - if (term->which == Z_Term_general) + 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 (" %d", *term->u.numeric); + break; + case Z_Term_null: + printf (" null"); + break; + } } } - } /* see if we can find USR:SearchResult-1 */ @@ -1034,7 +1145,9 @@ static void print_string_or_numeric(int iLevel, const char *pTag, Z_StringOrNume } } -static void print_universe_report_duplicate(int iLevel, Z_UniverseReportDuplicate *pUniverseReportDuplicate) +static void print_universe_report_duplicate( + int iLevel, + Z_UniverseReportDuplicate *pUniverseReportDuplicate) { if (pUniverseReportDuplicate != NULL) { @@ -1046,9 +1159,9 @@ static void print_universe_report_duplicate(int iLevel, Z_UniverseReportDuplicat } } -static void -print_universe_report_hits(int iLevel, - Z_UniverseReportHits *pUniverseReportHits) +static void print_universe_report_hits( + int iLevel, + Z_UniverseReportHits *pUniverseReportHits) { if (pUniverseReportHits != NULL) { @@ -1072,11 +1185,13 @@ static void print_universe_report(int iLevel, Z_UniverseReport *pUniverseReport) switch (pUniverseReport->which) { case Z_UniverseReport_databaseHits: - print_universe_report_hits(iLevel, pUniverseReport->u.databaseHits); + print_universe_report_hits(iLevel, + pUniverseReport->u.databaseHits); break; case Z_UniverseReport_duplicate: - print_universe_report_duplicate(iLevel, pUniverseReport->u.duplicate); + print_universe_report_duplicate(iLevel, + pUniverseReport->u.duplicate); break; default: @@ -1244,7 +1359,8 @@ static Z_External *create_external_itemRequest() r->u.single_ASN1_type->size = item_request_size; memcpy (r->u.single_ASN1_type->buf, item_request_buf, item_request_size); - printf ("len = %d\n", item_request_size); + + do_hex_dump(item_request_buf,item_request_size); } return r; } @@ -1300,7 +1416,10 @@ static Z_External *create_external_ILL_APDU(int which) 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); +/* printf ("len = %d\n", ill_request_size); */ +/* do_hex_dump(ill_request_buf,ill_request_size); */ +/* printf("--- end of extenal\n"); */ + } return r; } @@ -1349,7 +1468,6 @@ static Z_External *create_ItemOrderExternal(const char *type, int itemno) (int *) odr_malloc(out, sizeof(int)); *r->u.itemOrder->u.esRequest->notToKeep->resultSetItem->item = itemno; -#if YAZ_MODULE_ill if (!strcmp (type, "item") || !strcmp(type, "2")) { printf ("using item-request\n"); @@ -1376,9 +1494,6 @@ static Z_External *create_ItemOrderExternal(const char *type, int itemno) else r->u.itemOrder->u.esRequest->notToKeep->itemRequest = 0; -#else - r->u.itemOrder->u.esRequest->notToKeep->itemRequest = 0; -#endif return r; } @@ -1409,11 +1524,64 @@ static int cmd_update(char *arg) Z_IUOriginPartToKeep *toKeep; Z_IUSuppliedRecords *notToKeep; oident update_oid; - printf ("Update request\n"); - fflush(stdout); - - if (!record_last) + char action[20], recid[20], fname[80]; + int action_no; + Z_External *record_this = 0; + + *action = 0; + *recid = 0; + *fname = 0; + sscanf (arg, "%19s %19s %79s", action, recid, fname); + + if (!strcmp (action, "insert")) + action_no = Z_IUOriginPartToKeep_recordInsert; + else if (!strcmp (action, "replace")) + action_no = Z_IUOriginPartToKeep_recordReplace; + else if (!strcmp (action, "delete")) + action_no = Z_IUOriginPartToKeep_recordDelete; + else if (!strcmp (action, "update")) + action_no = Z_IUOriginPartToKeep_specialUpdate; + else + { + printf ("Bad action: %s\n", action); + printf ("Possible values: insert, replace, delete, update\n"); return 0; + } + + if (*fname) + { + FILE *inf; + struct stat status; + stat (fname, &status); + if (S_ISREG(status.st_mode) && (inf = fopen(fname, "r"))) + { + size_t len = status.st_size; + char *buf = (char *) xmalloc (len); + + fread (buf, 1, len, inf); + + fclose (inf); + + record_this = z_ext_record (out, VAL_TEXT_XML, buf, len); + + xfree (buf); + } + else + { + printf ("File %s doesn't exist\n", fname); + return 0; + } + } + else + { + if (!record_last) + { + printf ("No last record (update ignored)\n"); + return 0; + } + record_this = record_last; + } + update_oid.proto = PROTO_Z3950; update_oid.oclass = CLASS_EXTSERV; update_oid.value = VAL_DBUPDATE; @@ -1440,7 +1608,7 @@ static int cmd_update(char *arg) toKeep->elementSetName = 0; toKeep->actionQualifier = 0; toKeep->action = (int *) odr_malloc(out, sizeof(*toKeep->action)); - *toKeep->action = Z_IUOriginPartToKeep_recordInsert; + *toKeep->action = action_no; notToKeep = r->u.update->u.esRequest->notToKeep = (Z_IUSuppliedRecords *) odr_malloc(out, sizeof(*r->u.update->u.esRequest->notToKeep)); @@ -1449,10 +1617,20 @@ static int cmd_update(char *arg) odr_malloc(out, sizeof(*notToKeep->elements)); notToKeep->elements[0] = (Z_IUSuppliedRecords_elem *) odr_malloc(out, sizeof(**notToKeep->elements)); - notToKeep->elements[0]->u.number = 0; + notToKeep->elements[0]->which = Z_IUSuppliedRecords_elem_opaque; + if (*recid) + { + notToKeep->elements[0]->u.opaque = (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); + } + else + notToKeep->elements[0]->u.opaque = 0; notToKeep->elements[0]->supplementalId = 0; notToKeep->elements[0]->correlationInfo = 0; - notToKeep->elements[0]->record = record_last; + notToKeep->elements[0]->record = record_this; send_apdu(apdu); @@ -1482,8 +1660,12 @@ static int cmd_find(char *arg) } if (!conn) { - printf("Not connected yet\n"); - return 0; + try_reconnect(); + + if (!conn) { + printf("Not connected yet\n"); + return 0; + }; } if (!send_searchRequest(arg)) return 0; @@ -1735,7 +1917,6 @@ int send_scanrequest(const char *query, int pp, int num, const char *term) { Z_APDU *apdu = zget_APDU(out, Z_APDU_scanRequest); Z_ScanRequest *req = apdu->u.scanRequest; - int use_rpn = 1; int oid[OID_SIZE]; if (queryType == QueryType_CCL2RPN) @@ -1750,7 +1931,6 @@ int send_scanrequest(const char *query, int pp, int num, const char *term) printf("CCL ERROR: %s\n", ccl_err_msg(error)); return -1; } - use_rpn = 0; bib1.proto = PROTO_Z3950; bib1.oclass = CLASS_ATTSET; bib1.value = VAL_BIB1; @@ -1762,11 +1942,22 @@ int send_scanrequest(const char *query, int pp, int num, const char *term) } ccl_rpn_delete (rpn); } - if (use_rpn && !(req->termListAndStartPoint = - p_query_scan(out, protocol, &req->attributeSet, query))) + else { - printf("Prefix query error\n"); - return -1; + 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); + printf("%*s^\n", off+7, ""); + printf("Prefix query error: %s (code %d)\n", pqf_msg, code); + yaz_pqf_destroy (pqf_parser); + return -1; + } + yaz_pqf_destroy (pqf_parser); } if (term && *term) { @@ -1946,8 +2137,12 @@ int cmd_scan(char *arg) { if (!conn) { - printf("Session not initialized yet\n"); - return 0; + try_reconnect(); + + if (!conn) { + printf("Session not initialized yet\n"); + return 0; + }; } if (!ODR_MASK_GET(session->options, Z_Options_scan)) { @@ -1986,17 +2181,19 @@ int cmd_schema(char *arg) int cmd_format(char *arg) { + oid_value nsyntax; if (!arg || !*arg) { printf("Usage: format \n"); return 0; } - recordsyntax = oid_getvalbyname (arg); - if (recordsyntax == VAL_NONE) + nsyntax = oid_getvalbyname (arg); + if (strcmp(arg, "none") && nsyntax == VAL_NONE) { printf ("unknown record syntax\n"); return 0; } + recordsyntax = nsyntax; return 1; } @@ -2043,12 +2240,15 @@ int cmd_querytype (char *arg) queryType = QueryType_Prefix; else if (!strcmp (arg, "ccl2rpn") || !strcmp (arg, "cclrpn")) queryType = QueryType_CCL2RPN; + else if (!strcmp(arg, "cql")) + queryType = QueryType_CQL; 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"); return 0; } return 1; @@ -2097,8 +2297,9 @@ int cmd_packagename(char* arg) int cmd_proxy(char* arg) { if (*arg == '\0') { - printf("Current proxy is `%s'\n", (yazCharset)?yazProxy:NULL); - return 1; + xfree (yazProxy); + yazProxy = NULL; + } xfree (yazProxy); yazProxy = NULL; @@ -2112,17 +2313,23 @@ int cmd_proxy(char* arg) int cmd_charset(char* arg) { - if (*arg == '\0') { - printf("Current character set is `%s'\n", (yazCharset)?yazCharset:NULL); + char l1[30], l2[30]; + + *l1 = *l2 = 0; + if (sscanf(arg, "%29s %29s", l1, l2) < 1) + { + printf("Current character set is `%s'\n", (yazCharset) ? yazCharset:NULL); return 1; } xfree (yazCharset); yazCharset = NULL; - if (*arg) + if (*l1) + yazCharset = xstrdup(l1); + if (*l2) { - yazCharset = (char *) xmalloc (strlen(arg)+1); - strcpy (yazCharset, arg); - } + odr_set_charset (out, l1, l2); + odr_set_charset (in, l2, l1); + } return 1; } @@ -2227,7 +2434,7 @@ int cmd_set_apdufile(char* arg) return 1; } -int cmd_set_cclfields(char* arg) +int cmd_set_cclfile(char* arg) { FILE *inf; @@ -2240,8 +2447,32 @@ int cmd_set_cclfields(char* arg) ccl_qual_file (bibset, inf); fclose (inf); } + strcpy(ccl_fields,arg); + return 0; +} + + +int cmd_set_auto_reconnect(char* arg) +{ + REMOVE_TAILING_BLANKS(arg); + + if(strlen(arg)==0) { + auto_reconnect = ! auto_reconnect; + } else if(strcmp(arg,"on")==0) { + auto_reconnect = 1; + } else if(strcmp(arg,"off")==0) { + auto_reconnect = 0; + } else { + printf("Error use on or off\n"); + return 1; + } - return 1; + if (auto_reconnect) + printf("Set auto reconnect enabled.\n"); + else + printf("Set auto reconnect disabled.\n"); + + return 0; } int cmd_set_marcdump(char* arg) @@ -2254,23 +2485,24 @@ int cmd_set_marcdump(char* arg) if(strlen(arg)<1) { return 1; } - + if(!strcmp(arg,"-")) marcdump=stderr; else marcdump=fopen(arg, "a"); - + if(!marcdump) { perror("unable to open apdu marcdump file no marcdump done\n"); } - + return 1; } -int cmd_set_proxy(char* arg) { +int cmd_set_proxy(char* arg) +{ if(yazProxy) free(yazProxy); yazProxy=NULL; - + if(strlen(arg) > 1) { yazProxy=strdup(arg); } @@ -2279,7 +2511,7 @@ int cmd_set_proxy(char* arg) { /* this command takes 3 arge {name class oid} - */ +*/ int cmd_register_oid(char* args) { static struct { char* className; @@ -2300,7 +2532,7 @@ int cmd_register_oid(char* args) { {"schema",CLASS_SCHEMA}, {"tagset",CLASS_TAGSET}, {"general",CLASS_GENERAL}, - {0,0} + {0,(enum oid_class) 0} }; char oname_str[101], oclass_str[101], oid_str[101]; char* name; @@ -2327,7 +2559,7 @@ int cmd_register_oid(char* args) { printf("Unknonwn oid class %s\n",oclass_str); return 0; } - + i = 0; name = oid_str; val = 0; @@ -2355,7 +2587,8 @@ int cmd_register_oid(char* args) { return 1; } -int cmd_push_command(char* arg) { +int cmd_push_command(char* arg) +{ #if HAVE_READLINE_HISTORY_H if(strlen(arg)>1) add_history(arg); @@ -2365,11 +2598,13 @@ int cmd_push_command(char* arg) { return 1; } -void source_rcfile() { +void source_rcfile() +{ /* Look for a $HOME/.yazclientrc and source it if it exists */ struct stat statbuf; char buffer[1000]; char* homedir=getenv("HOME"); + if(!homedir) return; sprintf(buffer,"%s/.yazclientrc",homedir); @@ -2386,9 +2621,9 @@ void source_rcfile() { static void initialize(void) { -#if YAZ_MODULE_ccl FILE *inf; -#endif + int i; + if (!(out = odr_createmem(ODR_ENCODE)) || !(in = odr_createmem(ODR_DECODE)) || !(print = odr_createmem(ODR_PRINT))) @@ -2397,12 +2632,11 @@ static void initialize(void) exit(1); } oid_init(); - + setvbuf(stdout, 0, _IONBF, 0); if (apdu_file) odr_setprint(print, apdu_file); -#if YAZ_MODULE_ccl bibset = ccl_qual_mk (); inf = fopen (ccl_fields, "r"); if (inf) @@ -2410,13 +2644,17 @@ static void initialize(void) ccl_qual_file (bibset, inf); fclose (inf); } -#endif cmd_base("Default"); #if HAVE_READLINE_READLINE_H rl_attempted_completion_function = (CPPFunction*)readline_completer; #endif - + + + for(i=0; i=maxOtherInfosSupported) { + printf("Error otherinfo index to large (%d>%d)\n",otherinfoNo,maxOtherInfosSupported); + } + extraOtherInfos[otherinfoNo].oidval = -1; + if(extraOtherInfos[otherinfoNo].value) free(extraOtherInfos[otherinfoNo].value); + return 0; + } + if (sscan_res<3) { + printf("Error in set_otherinfo command \n"); + return 0; + } + + if(otherinfoNo>=maxOtherInfosSupported) { + printf("Error otherinfo index to large (%d>%d)\n",otherinfoNo,maxOtherInfosSupported); + } + + + oidval = oid_getvalbyname (oid); + if(oidval == -1 ) { + printf("Error in set_otherinfo command unknown oid %s \n",oid); + return 0; + } + extraOtherInfos[otherinfoNo].oidval = oidval; + if(extraOtherInfos[otherinfoNo].value) free(extraOtherInfos[otherinfoNo].value); + extraOtherInfos[otherinfoNo].value = strdup(otherinfoString); + + return 0; +} + +int cmd_list_otherinfo(char* args) +{ + int i; + + if(strlen(args)>0) { + i = atoi(args); + if( i >= maxOtherInfosSupported ) { + printf("Error otherinfo index to large (%d>%d)\n",i,maxOtherInfosSupported); + return 0; + } + + if(extraOtherInfos[i].oidval != -1) + printf(" otherinfo %d %s %s\n", + i, + yaz_z3950_oid_value_to_str( + (enum oid_value) extraOtherInfos[i].oidval, + CLASS_RECSYN), + extraOtherInfos[i].value); + + } else { + for(i=0; iwhich) { + case Z_IdAuthentication_idPass: + 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); + break; + default: + printf("Authentication : Unknown\n"); + } + } + if ( yazCharset ) printf("Character set : `%s'\n", (yazCharset) ? yazCharset:NULL); + + /* bases */ + printf("Bases : "); + for (i = 0; iu.generic:""); + + /* loging options */ + printf("APDU log : %s\n",apdu_file?"on":"off"); + printf("Record log : %s\n",marcdump?"on":"off"); + + /* other infos */ + printf("Other Info: \n"); + cmd_list_otherinfo(""); + + return 0; +} + +int cmd_clear_otherinfo(char* args) +{ + if(strlen(args)>0) { + int otherinfoNo; + otherinfoNo = atoi(args); + if( otherinfoNo >= maxOtherInfosSupported ) { + printf("Error otherinfo index to large (%d>%d)\n",otherinfoNo,maxOtherInfosSupported); + return 0; + } + + if(extraOtherInfos[otherinfoNo].oidval != -1) { + /* only clear if set. */ + extraOtherInfos[otherinfoNo].oidval=-1; + free(extraOtherInfos[otherinfoNo].value); + } + } else { + int i; + + for(i=0; i[':'][/]",NULL,0}, - {"quit", cmd_quit, "",NULL,0}, - {"find", cmd_find, "",NULL,0}, - {"delete", cmd_delete, "",NULL,0}, - {"base", cmd_base, "",NULL,0}, - {"show", cmd_show, "['+'<#recs>['+']]",NULL,0}, - {"scan", cmd_scan, "",NULL,0}, - {"sort", cmd_sort, " ...",NULL,0}, - {"sort+", cmd_sort_newset, " ...",NULL,0}, - {"authentication", cmd_authentication, "",NULL,0}, - {"lslb", cmd_lslb, "",NULL,0}, - {"ssub", cmd_ssub, "",NULL,0}, - {"mspn", cmd_mspn, "",NULL,0}, - {"status", cmd_status, "",NULL,0}, - {"setnames", cmd_setnames, "",NULL,0}, - {"cancel", cmd_cancel, "",NULL,0}, - {"format", cmd_format, "",complete_format,0}, - {"schema", cmd_schema, "",complete_schema,0}, - {"elements", cmd_elements, "",NULL,0}, - {"close", cmd_close, "",NULL,0}, - {"attributeset", cmd_attributeset, "",complete_attributeset,0}, - {"querytype", cmd_querytype, "",complete_querytype,0}, - {"refid", cmd_refid, "",NULL,0}, - {"itemorder", cmd_itemorder, "ill|item ",NULL,0}, - {"update", cmd_update, "",NULL,0}, - {"packagename", cmd_packagename, "",NULL,0}, - {"proxy", cmd_proxy, "[('tcp'|'ssl')][':']",NULL,0}, - {"charset", cmd_charset, "",NULL,0}, - {"lang", cmd_lang, "",NULL,0}, - {".", cmd_source, "",NULL,1}, - {"!", cmd_subshell, "Subshell command",NULL,0}, - {"set_apdufile", cmd_set_apdufile, "",NULL,0}, - {"set_marcdump", cmd_set_marcdump," ",NULL,0}, - {"set_cclfields", cmd_set_cclfields,"",NULL,1}, - {"register_oid",cmd_register_oid," ",NULL,0}, - {"push_command",cmd_push_command,"",command_generator,0}, + {"open", cmd_open, "('tcp'|'ssl')':[':'][/]",NULL,0,NULL}, + {"quit", cmd_quit, "",NULL,0,NULL}, + {"find", cmd_find, "",NULL,0,NULL}, + {"delete", cmd_delete, "",NULL,0,NULL}, + {"base", cmd_base, "",NULL,0,NULL}, + {"show", cmd_show, "['+'<#recs>['+']]",NULL,0,NULL}, + {"scan", cmd_scan, "",NULL,0,NULL}, + {"sort", cmd_sort, " ...",NULL,0,NULL}, + {"sort+", cmd_sort_newset, " ...",NULL,0,NULL}, + {"authentication", cmd_authentication, "",NULL,0,NULL}, + {"lslb", cmd_lslb, "",NULL,0,NULL}, + {"ssub", cmd_ssub, "",NULL,0,NULL}, + {"mspn", cmd_mspn, "",NULL,0,NULL}, + {"status", cmd_status, "",NULL,0,NULL}, + {"setnames", cmd_setnames, "",NULL,0,NULL}, + {"cancel", cmd_cancel, "",NULL,0,NULL}, + {"format", cmd_format, "",complete_format,0,NULL}, + {"schema", cmd_schema, "",complete_schema,0,NULL}, + {"elements", cmd_elements, "",NULL,0,NULL}, + {"close", cmd_close, "",NULL,0,NULL}, + {"attributeset", cmd_attributeset, "",complete_attributeset,0,NULL}, + {"querytype", cmd_querytype, "",complete_querytype,0,NULL}, + {"refid", cmd_refid, "",NULL,0,NULL}, + {"itemorder", cmd_itemorder, "ill|item ",NULL,0,NULL}, + {"update", cmd_update, " []",NULL,0,NULL}, + {"packagename", cmd_packagename, "",NULL,0,NULL}, + {"proxy", cmd_proxy, "[('tcp'|'ssl')][':']",NULL,0,NULL}, + {"charset", cmd_charset, "",NULL,0,NULL}, + {"lang", cmd_lang, "",NULL,0,NULL}, + {".", cmd_source, "",NULL,1,NULL}, + {"!", cmd_subshell, "Subshell command",NULL,1,NULL}, + {"set_apdufile", cmd_set_apdufile, "",NULL,1,NULL}, + {"set_marcdump", cmd_set_marcdump," ",NULL,1,NULL}, + {"set_cclfile", cmd_set_cclfile," ",NULL,1,NULL}, + {"set_auto_reconnect", cmd_set_auto_reconnect," on|off",complete_auto_reconnect,1,NULL}, + {"set_otherinfo", cmd_set_otherinfo," ",NULL,0,NULL}, + {"register_oid", cmd_register_oid," ",NULL,0,NULL}, + {"push_command", cmd_push_command,"",command_generator,0,NULL}, + {"register_tab", cmd_register_tab," ",command_generator,0,NULL}, + {"cclparse", cmd_cclparse,"",NULL,0,NULL}, + {"list_otherinfo",cmd_list_otherinfo,"[otherinfoinddex]",NULL,0,NULL}, + {"list_all",cmd_list_all,"",NULL,0,NULL}, + {"clear_otherinfo",cmd_clear_otherinfo,"",NULL,0,NULL}, /* Server Admin Functions */ - {"adm-reindex", cmd_adm_reindex, "",NULL,0}, - {"adm-truncate", cmd_adm_truncate, "('database'|'index')",NULL,0}, - {"adm-create", cmd_adm_create, "",NULL,0}, - {"adm-drop", cmd_adm_drop, "('database'|'index')",NULL,0}, - {"adm-import", cmd_adm_import, " ",NULL,0}, - {"adm-refresh", cmd_adm_refresh, "",NULL,0}, - {"adm-commit", cmd_adm_commit, "",NULL,0}, - {"adm-shutdown", cmd_adm_shutdown, "",NULL,0}, - {"adm-startup", cmd_adm_startup, "",NULL,0}, - {"help", cmd_help, "", NULL}, - {0,0,0,0,0} + {"adm-reindex", cmd_adm_reindex, "",NULL,0,NULL}, + {"adm-truncate", cmd_adm_truncate, "('database'|'index')",NULL,0,NULL}, + {"adm-create", cmd_adm_create, "",NULL,0,NULL}, + {"adm-drop", cmd_adm_drop, "('database'|'index')",NULL,0,NULL}, + {"adm-import", cmd_adm_import, " ",NULL,0,NULL}, + {"adm-refresh", cmd_adm_refresh, "",NULL,0,NULL}, + {"adm-commit", cmd_adm_commit, "",NULL,0,NULL}, + {"adm-shutdown", cmd_adm_shutdown, "",NULL,0,NULL}, + {"adm-startup", cmd_adm_startup, "",NULL,0,NULL}, + {"help", cmd_help, "", NULL,0,NULL}, + {0,0,0,0,0,0} }; static int cmd_help (char *line) @@ -2636,6 +3081,49 @@ static int cmd_help (char *line) return 1; } +int cmd_register_tab(char* arg) { + + char command[101], tabargument[101]; + int i; + int num_of_tabs; + char** tabslist; + + if (sscanf (arg, "%100s %100s", command, tabargument) < 1) { + return 0; + } + + /* locate the amdn in the list */ + for (i = 0; cmd[i].cmd; i++) { + if (!strncmp(cmd[i].cmd, command, strlen(command))) { + break; + } + } + + if(!cmd[i].cmd) { + fprintf(stderr,"Unknown command %s\n",command); + return 1; + } + + + if(!cmd[i].local_tabcompletes) + cmd[i].local_tabcompletes = (char **) calloc(1,sizeof(char**)); + + num_of_tabs=0; + + tabslist = cmd[i].local_tabcompletes; + for(;tabslist && *tabslist;tabslist++) { + num_of_tabs++; + } + + cmd[i].local_tabcompletes = (char **) + realloc(cmd[i].local_tabcompletes,(num_of_tabs+2)*sizeof(char**)); + tabslist=cmd[i].local_tabcompletes; + tabslist[num_of_tabs]=strdup(tabargument); + tabslist[num_of_tabs+1]=NULL; + return 1; +} + + void process_cmd_line(char* line) { int i,res; @@ -2669,26 +3157,27 @@ void process_cmd_line(char* line) *(++lastnonspace) = 0; } - + for (i = 0; cmd[i].cmd; i++) if (!strncmp(cmd[i].cmd, word, strlen(word))) { res = (*cmd[i].fun)(arg); break; } - + if (!cmd[i].cmd) /* dump our help-screen */ { printf("Unknown command: %s.\n", word); - cmd_help (""); + printf("use help for list of commands\n"); + /* cmd_help (""); */ res = 1; } - + if(apdu_file) fflush(apdu_file); if (res >= 2) wait_and_handle_responce(); - + if(apdu_file) fflush(apdu_file); if(marcdump) @@ -2718,6 +3207,8 @@ char *command_generator(const char *text, int state) char ** readline_completer(char *text, int start, int end) { #if HAVE_READLINE_READLINE_H + completerFunctionType completerToUse; + if(start == 0) { #if HAVE_READLINE_RL_COMPLETION_MATCHES char** res=rl_completion_matches(text, @@ -2735,34 +3226,38 @@ char ** readline_completer(char *text, int start, int end) { rl_attempted_completion_over = 1; return NULL; } - - if(start != strlen(word) +1 ) { - rl_attempted_completion_over = 1; - return 0; - } + for (i = 0; cmd[i].cmd; i++) { if (!strncmp(cmd[i].cmd, word, strlen(word))) { break; } } - - - if(!cmd[i].complete_filenames) - rl_attempted_completion_over = 1; - if(cmd[i].rl_completerfunction) { + + if(!cmd[i].cmd) return NULL; + + + curret_global_list = cmd[i].local_tabcompletes; + + completerToUse = cmd[i].rl_completerfunction; + if(completerToUse==NULL) /* if no pr. command completer is defined use the default completer */ + completerToUse = default_completer; + + if(completerToUse) { #ifdef HAVE_READLINE_RL_COMPLETION_MATCHES char** res= rl_completion_matches(text, - cmd[i].rl_completerfunction); + completerToUse); #else char** res= completion_matches(text, - (CPFunction*)cmd[i].rl_completerfunction); + (CPFunction*)completerToUse); #endif - rl_attempted_completion_over = 1; + if(!cmd[i].complete_filenames) + rl_attempted_completion_over = 1; return res; } else { - rl_attempted_completion_over = 1; + if(!cmd[i].complete_filenames) + rl_attempted_completion_over = 1; return 0; } } @@ -2821,7 +3316,15 @@ int main(int argc, char **argv) char *arg; int ret; - while ((ret = options("k:c:a:m:v:p:u:", argv, argc, &arg)) != -2) +#if HAVE_LOCALE_H + if (!setlocale(LC_CTYPE, "")) + fprintf (stderr, "setlocale failed\n"); +#endif +#if HAVE_LANGINFO_H + codeset = nl_langinfo(CODESET); +#endif + + while ((ret = options("k:c:a:m:v:p:u:t:", argv, argc, &arg)) != -2) { switch (ret) { @@ -2843,19 +3346,22 @@ int main(int argc, char **argv) exit (1); } break; - case 'c': - strncpy (ccl_fields, arg, sizeof(ccl_fields)-1); - ccl_fields[sizeof(ccl_fields)-1] = '\0'; - break; + case 't': + codeset = arg; + break; + case 'c': + strncpy (ccl_fields, arg, sizeof(ccl_fields)-1); + ccl_fields[sizeof(ccl_fields)-1] = '\0'; + break; case 'a': if (!strcmp(arg, "-")) apdu_file=stderr; else apdu_file=fopen(arg, "a"); break; - case 'p': - yazProxy=strdup(arg); - break; + case 'p': + yazProxy=strdup(arg); + break; case 'u': if (!auth_command) { @@ -2902,10 +3408,11 @@ int main(int argc, char **argv) exit (0); } - /* * Local variables: - * tab-width: 4 + * tab-width: 8 * c-basic-offset: 4 * End: + * vim600: sw=4 ts=8 fdm=marker + * vim<600: sw=4 ts=8 */