X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=client%2Fclient.c;h=0cdb8e23694b2f2209e900103b2cd23f285186e6;hb=a6a8ea2837dd78d21fe036fff4b8d91c0d6e09c8;hp=6944d261088724c9743d94bedd7c241ba25dd95c;hpb=7401a51ed865b1dcdf5905b2bc6c793dc023416e;p=yaz-moved-to-github.git diff --git a/client/client.c b/client/client.c index 6944d26..0cdb8e2 100644 --- a/client/client.c +++ b/client/client.c @@ -2,7 +2,7 @@ * Copyright (c) 1995-2002, Index Data * See the file LICENSE for details. * - * $Id: client.c,v 1.140 2002-01-30 22:02:03 adam Exp $ + * $Id: client.c,v 1.163 2002-08-26 12:15:35 adam Exp $ */ #include @@ -11,29 +11,24 @@ #include -#include -#ifdef USE_XTIMOSI -#include -#endif +#include #include #include #include #include +#include #include #include -#if YAZ_MODULE_ill #include -#endif -#if YAZ_MODULE_ccl #include -#endif #if HAVE_READLINE_READLINE_H #include +#include #endif #if HAVE_READLINE_HISTORY_H #include @@ -72,6 +67,9 @@ static char ccl_fields[512] = "default.bib"; static char* esPackageName = 0; static char* yazProxy = 0; static int kilobytes = 1024; +static char* yazCharset = 0; +static char* yazLang = 0; + static char last_cmd[32] = "?"; static FILE *marcdump = 0; @@ -85,10 +83,14 @@ typedef enum { static QueryType queryType = QueryType_Prefix; -#if YAZ_MODULE_ccl static CCL_bibset bibset; /* CCL bibset handle */ -#endif +#if HAVE_READLINE_COMPLETION_OVER + +#else +/* readline doesn't have this var. Define it ourselves. */ +int rl_attempted_completion_over = 0; +#endif /* set this one to 1, to avoid decode of unknown MARCs */ #define AVOID_MARC_DECODE 1 @@ -103,7 +105,8 @@ static CCL_bibset bibset; /* CCL bibset handle */ 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() { @@ -140,7 +143,7 @@ static void print_stringn(const unsigned char *buf, size_t len) size_t i; for (i = 0; i= 32) || strchr ("\n\r\t\f", buf[i])) - fputc (buf[i], stdout); + printf ("%c", buf[i]); else printf ("\\X%02X", buf[i]); } @@ -198,6 +201,23 @@ static void send_initRequest(const char* type_and_host) yaz_oi_set_string_oidval(&req->otherInfo, out, VAL_PROXY, 1, type_and_host); + if (yazCharset || 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(out, + (const char**)&yazCharset, (yazCharset)?1:0, + (const char**)&yazLang, (yazLang)?1:0, 1); + } + } + send_apdu(apdu); printf("Sent initrequest.\n"); } @@ -264,7 +284,36 @@ static int process_initResponse(Z_InitResponse *res) printf (" namedResultSets"); setnumber = 0; } + if (ODR_MASK_GET(res->options, Z_Options_encapsulation)) + printf (" encapsulation"); + if (ODR_MASK_GET(res->options, Z_Options_resultCount)) + printf (" resultCount"); + if (ODR_MASK_GET(res->options, Z_Options_negotiationModel)) + printf (" negotiationModel"); + if (ODR_MASK_GET(res->options, Z_Options_duplicateDetection)) + printf (" duplicateDetection"); + if (ODR_MASK_GET(res->options, Z_Options_queryType104)) + printf (" queryType104"); printf ("\n"); + + if (ODR_MASK_GET(res->options, Z_Options_negotiationModel)) { + + Z_CharSetandLanguageNegotiation *p = + 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 ? lang : "none"); + printf("Accepted records in ...: %d\n", selected ); + } + } fflush (stdout); return 0; } @@ -284,13 +333,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; @@ -298,17 +354,15 @@ static int cmd_base(char *arg) return 1; } - int cmd_open(char *arg) { void *add; char type_and_host[101], base[101]; - CS_TYPE t; - + if (conn) { printf("Already connected.\n"); - + cs_close (conn); conn = NULL; if (session_mem) @@ -317,34 +371,39 @@ int cmd_open(char *arg) session_mem = NULL; } } - 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); - + if (strncmp (arg, "unix:", 5) == 0) + { + base[0] = '\0'; + conn = cs_create_host(arg, 1, &add); + } + else + { + 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); + } if (!conn) { - printf ("Couldn't create comstack\n"); - return 0; + printf ("Couldn't create comstack\n"); + return 0; } printf("Connecting..."); fflush(stdout); if (cs_connect(conn, add) < 0) { - printf ("error = %s\n", cs_strerror(conn)); - if (conn->cerrno == CSYSERR) - perror("system"); + printf ("error = %s\n", cs_strerror(conn)); + if (conn->cerrno == CSYSERR) + perror("system"); cs_close(conn); conn = 0; return 0; } printf("Ok.\n"); - + send_initRequest(type_and_host); if (*base) cmd_base (base); @@ -376,6 +435,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; @@ -389,6 +457,7 @@ int cmd_authentication(char *arg) } /* SEARCH SERVICE ------------------------------ */ +static void display_record(Z_External *r); static void display_variant(Z_Variant *v, int level) { @@ -410,7 +479,9 @@ 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; @@ -428,8 +499,13 @@ static void display_grs1(Z_GenericRecord *r, int level) printf("%s) ", t->tagValue->u.string); if (t->content->which == Z_ElementData_subtree) { - printf("\n"); - display_grs1(t->content->u.subtree, level+1); + 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); @@ -439,7 +515,7 @@ static void display_grs1(Z_GenericRecord *r, int level) { int *ip = t->content->u.oid; oident *oent; - + if ((oent = oid_getentbyoid(t->content->u.oid))) printf("OID: %s\n", oent->desc); else @@ -456,8 +532,15 @@ static void display_grs1(Z_GenericRecord *r, int level) 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("??????\n"); + printf("? type = %d\n",t->content->which); if (t->appliedVariant) display_variant(t->appliedVariant, level+1); if (t->metaData && t->metaData->supportedVariants) @@ -481,7 +564,7 @@ static void print_record(const unsigned char *buf, size_t len) print_stringn (buf, len); /* add newline if not already added ... */ if (i <= 0 || buf[i-1] != '\n') - fputc ('\n', stdout); + printf ("\n"); } static void display_record(Z_External *r) @@ -521,19 +604,22 @@ static void display_record(Z_External *r) odr_perror(in, "Decoding constructed record."); 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); + odr_dumpBER(stderr, (char*)r->u.octet_aligned->buf,r->u.octet_aligned->len); fprintf(stderr, "---------\n"); - exit(1); - } - /* - * 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 just ignores the error ant print the bytes form the octet_aligned laiter */ + } 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; + }; } } + 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); @@ -557,13 +643,14 @@ static void display_record(Z_External *r) { if ( #if AVOID_MARC_DECODE - /* primitive check for a marc OID 5.1-29 */ - ent->oidsuffix[0] == 5 && ent->oidsuffix[1] < 30 + /* primitive check for a marc OID 5.1-29 except 16 */ + ent->oidsuffix[0] == 5 && ent->oidsuffix[1] < 30 && + ent->oidsuffix[1] != 16 #else - 1 + 1 #endif - ) - { + ) + { if (marc_display_exl (octet_buf, NULL, 0 /* debug */, r->u.octet_aligned->len) <= 0) { @@ -610,7 +697,6 @@ static void display_record(Z_External *r) } } - static void display_diagrecs(Z_DiagRec **pp, int num) { int i; @@ -720,15 +806,12 @@ static int send_searchRequest(char *arg) Z_SearchRequest *req = apdu->u.searchRequest; Z_Query query; int oid[OID_SIZE]; -#if YAZ_MODULE_ccl struct ccl_rpn_node *rpn = NULL; int error, pos; -#endif char setstring[100]; Z_RPNQuery *RPNquery; Odr_oct ccl_query; -#if YAZ_MODULE_ccl if (queryType == QueryType_CCL2RPN) { rpn = ccl_find_str(bibset, arg, &error, &pos); @@ -738,7 +821,6 @@ static int send_searchRequest(char *arg) return 0; } } -#endif req->referenceId = set_refid (out); if (!strcmp(arg, "@big")) /* strictly for troublemaking */ { @@ -796,7 +878,6 @@ static int send_searchRequest(char *arg) ccl_query.buf = (unsigned char*) arg; ccl_query.len = strlen(arg); break; -#if YAZ_MODULE_ccl case QueryType_CCL2RPN: query.which = Z_Query_type_1; RPNquery = ccl_rpn_query(out, rpn); @@ -808,7 +889,6 @@ static int send_searchRequest(char *arg) query.u.type_1 = RPNquery; ccl_rpn_delete (rpn); break; -#endif default: printf ("Unsupported query type\n"); return 0; @@ -819,6 +899,71 @@ static int send_searchRequest(char *arg) return 2; } +/* display Query Expression as part of searchResult-1 */ +static void display_queryExpression (Z_QueryExpression *qe) +{ + if (!qe) + return; + if (qe->which == Z_QueryExpression_term) + { + if (qe->u.term->queryTerm) + { + Z_Term *term = qe->u.term->queryTerm; + 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 */ +static void display_searchResult (Z_OtherInformation *o) +{ + int i; + if (!o) + return ; + for (i = 0; i < o->num_elements; i++) + { + 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 (!sr->elements[j]->subqueryExpression) + printf (" %d", j); + display_queryExpression ( + sr->elements[j]->subqueryExpression); + display_queryExpression ( + sr->elements[j]->subqueryInterpretation); + display_queryExpression ( + sr->elements[j]->subqueryRecommendation); + if (sr->elements[j]->subqueryCount) + printf ("(%d)", *sr->elements[j]->subqueryCount); + } + printf ("\n"); + } + } + } +} + static int process_searchResponse(Z_SearchResponse *res) { printf ("Received SearchResponse.\n"); @@ -830,8 +975,10 @@ static int process_searchResponse(Z_SearchResponse *res) printf("Number of hits: %d", *res->resultCount); if (setnumber >= 0) printf (", setno %d", setnumber); - printf("\nrecords returned: %d\n", - *res->numberOfRecordsReturned); + printf ("\n"); + display_searchResult (res->additionalSearchInfo); + printf("records returned: %d\n", + *res->numberOfRecordsReturned); setno += *res->numberOfRecordsReturned; if (res->records) display_records(res->records); @@ -897,18 +1044,18 @@ static void print_string_or_numeric(int iLevel, const char *pTag, Z_StringOrNume { switch (pStringNumeric->which) { - 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); - break; + 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); + break; } } } @@ -920,18 +1067,22 @@ static void print_universe_report_duplicate(int iLevel, Z_UniverseReportDuplicat print_level(iLevel); printf("Universe Report Duplicate: \n"); iLevel++; - print_string_or_numeric(iLevel, "Hit No", pUniverseReportDuplicate->hitno); + print_string_or_numeric(iLevel, "Hit No", + pUniverseReportDuplicate->hitno); } } -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) { print_level(iLevel); printf("Universe Report Hits: \n"); iLevel++; - print_string_or_numeric(iLevel, "Database", pUniverseReportHits->database); + print_string_or_numeric(iLevel, "Database", + pUniverseReportHits->database); print_string_or_numeric(iLevel, "Hits", pUniverseReportHits->hits); } } @@ -946,18 +1097,18 @@ static void print_universe_report(int iLevel, Z_UniverseReport *pUniverseReport) print_int(iLevel, "Total Hits", pUniverseReport->totalHits); switch (pUniverseReport->which) { - case Z_UniverseReport_databaseHits: - 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); - break; + case Z_UniverseReport_databaseHits: + 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); + break; } } } @@ -974,14 +1125,14 @@ static void print_external(int iLevel, Z_External *pExternal) print_string(iLevel, "Descriptor", pExternal->descriptor); switch (pExternal->which) { - case Z_External_universeReport: - print_universe_report(iLevel, pExternal->u.universeReport); - break; - - default: - print_level(iLevel); - printf("Type: %d\n", pExternal->which); - break; + case Z_External_universeReport: + print_universe_report(iLevel, pExternal->u.universeReport); + break; + + default: + print_level(iLevel); + printf("Type: %d\n", pExternal->which); + break; } } } @@ -1062,8 +1213,6 @@ void process_ESResponse(Z_ExtendedServicesResponse *res) } } -#if YAZ_MODULE_ill - const char *get_ill_element (void *clientData, const char *element) { return 0; @@ -1080,7 +1229,7 @@ static Z_External *create_external_itemRequest() 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"); @@ -1125,9 +1274,7 @@ static Z_External *create_external_itemRequest() } return r; } -#endif -#ifdef YAZ_MODULE_ill static Z_External *create_external_ILL_APDU(int which) { struct ill_get_ctl ctl; @@ -1183,7 +1330,6 @@ static Z_External *create_external_ILL_APDU(int which) } return r; } -#endif static Z_External *create_ItemOrderExternal(const char *type, int itemno) @@ -1229,7 +1375,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"); @@ -1256,9 +1401,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; } @@ -1291,7 +1433,7 @@ static int cmd_update(char *arg) oident update_oid; printf ("Update request\n"); fflush(stdout); - + if (!record_last) return 0; update_oid.proto = PROTO_Z3950; @@ -1339,19 +1481,18 @@ static int cmd_update(char *arg) return 2; } -/* II : Added to do DALI Item Order Extended services request */ static int cmd_itemorder(char *arg) { char type[12]; int itemno; - + if (sscanf (arg, "%10s %d", type, &itemno) != 2) return 0; printf("Item order request\n"); fflush(stdout); send_itemorder(type, itemno); - return(2); + return 2; } static int cmd_find(char *arg) @@ -1461,13 +1602,6 @@ static int send_presentRequest(char *arg) sprintf(setstring, "%d", setnumber); req->resultSetId = setstring; } -#if 0 - if (1) - { - static Z_Range range; - static Z_Range *rangep = ⦥ - req->num_ranges = 1; -#endif req->resultSetStartPoint = &setno; req->numberOfRecordsRequested = &nos; prefsyn.proto = protocol; @@ -1529,6 +1663,18 @@ static int send_presentRequest(char *arg) printf("Sent presentRequest (%d+%d).\n", setno, nos); return 2; } + +static void close_session (void) +{ + cs_close (conn); + conn = 0; + if (session_mem) + { + nmem_destroy (session_mem); + session_mem = NULL; + } + sent_close = 0; +} void process_close(Z_Close *req) { @@ -1552,16 +1698,7 @@ void process_close(Z_Close *req) printf("Reason: %s, message: %s\n", reasons[*req->closeReason], req->diagnosticInformation ? req->diagnosticInformation : "NULL"); if (sent_close) - { - cs_close (conn); - conn = NULL; - if (session_mem) - { - nmem_destroy (session_mem); - session_mem = NULL; - } - sent_close = 0; - } + close_session (); else { *res->closeReason = Z_Close_finished; @@ -1621,7 +1758,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; -#if YAZ_MODULE_ccl int oid[OID_SIZE]; if (queryType == QueryType_CCL2RPN) @@ -1648,7 +1784,6 @@ int send_scanrequest(const char *query, int pp, int num, const char *term) } ccl_rpn_delete (rpn); } -#endif if (use_rpn && !(req->termListAndStartPoint = p_query_scan(out, protocol, &req->attributeSet, query))) { @@ -1928,18 +2063,14 @@ int cmd_querytype (char *arg) queryType = QueryType_CCL; else if (!strcmp (arg, "prefix") || !strcmp(arg, "rpn")) queryType = QueryType_Prefix; -#if YAZ_MODULE_ccl else if (!strcmp (arg, "ccl2rpn") || !strcmp (arg, "cclrpn")) queryType = QueryType_CCL2RPN; -#endif else { printf ("Querytype must be one of:\n"); printf (" prefix - Prefix query\n"); printf (" ccl - CCL query\n"); -#if YAZ_MODULE_ccl printf (" ccl2rpn - CCL query converted to RPN\n"); -#endif return 0; } return 1; @@ -1987,6 +2118,10 @@ 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; if (*arg) @@ -1997,6 +2132,45 @@ int cmd_proxy(char* arg) return 1; } +int cmd_charset(char* arg) +{ + 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 (*l1) + yazCharset = xstrdup(l1); + if (*l2) + { + odr_set_charset (out, l1, l2); + odr_set_charset (in, l2, l1); + } + return 1; +} + +int cmd_lang(char* arg) +{ + if (*arg == '\0') { + printf("Current language is `%s'\n", (yazLang)?yazLang:NULL); + return 1; + } + xfree (yazLang); + yazLang = NULL; + if (*arg) + { + yazLang = (char *) xmalloc (strlen(arg)+1); + strcpy (yazLang, arg); + } + return 1; +} + int cmd_source(char* arg) { /* first should open the file and read one line at a time.. */ @@ -2061,7 +2235,7 @@ int cmd_set_apdufile(char* arg) if(apdu_file && apdu_file != stderr) { /* don't close stdout*/ perror("unable to close apdu log file"); - }; + } apdu_file=NULL; if(strlen(arg)<1) { @@ -2084,7 +2258,6 @@ int cmd_set_apdufile(char* arg) int cmd_set_cclfields(char* arg) { -#if YAZ_MODULE_ccl FILE *inf; REMOVE_TAILING_BLANKS(arg); @@ -2096,9 +2269,6 @@ int cmd_set_cclfields(char* arg) ccl_qual_file (bibset, inf); fclose (inf); } -#else - fprintf(stderr,"Not compiled with the yaz ccl module\n"); -#endif return 1; } @@ -2107,7 +2277,7 @@ int cmd_set_marcdump(char* arg) { if(marcdump && marcdump != stderr) { /* don't close stdout*/ perror("unable to close apdu log file"); - }; + } marcdump=NULL; if(strlen(arg)<1) { @@ -2214,7 +2384,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); @@ -2224,11 +2395,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); @@ -2245,9 +2418,7 @@ void source_rcfile() { static void initialize(void) { -#if YAZ_MODULE_ccl FILE *inf; -#endif if (!(out = odr_createmem(ODR_ENCODE)) || !(in = odr_createmem(ODR_DECODE)) || !(print = odr_createmem(ODR_PRINT))) @@ -2261,7 +2432,6 @@ static void initialize(void) if (apdu_file) odr_setprint(print, apdu_file); -#if YAZ_MODULE_ccl bibset = ccl_qual_mk (); inf = fopen (ccl_fields, "r"); if (inf) @@ -2269,7 +2439,6 @@ static void initialize(void) ccl_qual_file (bibset, inf); fclose (inf); } -#endif cmd_base("Default"); #if HAVE_READLINE_READLINE_H @@ -2284,7 +2453,7 @@ static void initialize(void) struct timeval tv_start, tv_end; #endif -void wait_and_handle_responce() +void wait_and_handle_responce() { int res; @@ -2293,23 +2462,21 @@ void wait_and_handle_responce() Z_APDU *apdu; - if (conn -#ifdef USE_SELECT - && FD_ISSET(cs_fileno(conn), &input) -#endif - ) + if (conn) { do { if ((res = cs_get(conn, &netbuffer, &netbufferlen)) < 0) { - perror("cs_get"); - exit(1); + printf("Target closed connection\n"); + close_session (); + break; } if (!res) { printf("Target closed connection.\n"); - exit(1); + close_session (); + break; } odr_reset(in); /* release APDU from last round */ record_last = 0; @@ -2323,7 +2490,8 @@ void wait_and_handle_responce() fprintf(stderr, "---------\n"); if (apdu_file) z_APDU(print, &apdu, 0, 0); - exit(1); + close_session (); + break; } if (apdu_file && !z_APDU(print, &apdu, 0, 0)) { @@ -2375,7 +2543,7 @@ void wait_and_handle_responce() default: printf("Received unknown APDU type (%d).\n", apdu->which); - exit(1); + close_session (); } } while (conn && cs_more(conn)); @@ -2393,63 +2561,185 @@ void wait_and_handle_responce() ((double) tv_start.tv_usec / 1e6 + tv_start.tv_sec)); #endif } + xfree (netbuffer); } +int cmd_cclparse(char* arg) { + int error, pos; + struct ccl_rpn_node *rpn=NULL; + + + rpn = ccl_find_str (bibset, arg, &error, &pos); + + if (error) { + printf ("%*s^ - ", 3+strlen(last_cmd)+1+pos, " "); + printf ("%s\n", ccl_err_msg (error)); + } + else + { + if (rpn) + { + ccl_pr_tree(rpn, stdout); + } + } + if (rpn) + ccl_rpn_delete(rpn); + + printf ("\n"); + + return 0; +}; + + +static int cmd_help (char *line); + +typedef char *(*completerFunctionType)(const char *text, int state); + static struct { char *cmd; int (*fun)(char *arg); char *ad; - char *(*rl_completerfunction)(const char *text, int state); + completerFunctionType rl_completerfunction; int complete_filenames; + char **local_tabcompletes; } cmd[] = { - {"open", cmd_open, "('tcp'|'ssl')':[':'][/]",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}, - {".", 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_cclfields," ",NULL,1,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}, /* 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}, - {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) +{ + int i; + char topic[21]; + + *topic = 0; + sscanf (line, "%20s", topic); + + if (*topic == 0) + printf("Commands:\n"); + for (i = 0; cmd[i].cmd; i++) + if (*topic == 0 || strcmp (topic, cmd[i].cmd) == 0) + printf(" %s %s\n", cmd[i].cmd, cmd[i].ad); + if (strcmp (topic, "find") == 0) + { + printf ("RPN:\n"); + printf (" \"term\" Simple Term\n"); + printf (" @attr [attset] type=value op Attribute\n"); + printf (" @and opl opr And\n"); + printf (" @or opl opr Or\n"); + printf (" @not opl opr And-Not\n"); + printf (" @set set Result set\n"); + printf ("\n"); + printf ("Bib-1 attribute types\n"); + printf ("1=Use: "); + printf ("4=Title 7=ISBN 8=ISSN 30=Date 62=Abstract 1003=Author 1016=Any\n"); + printf ("2=Relation: "); + printf ("1< 2<= 3= 4>= 5> 6!= 102=Relevance\n"); + printf ("3=Position: "); + printf ("1=First in Field 2=First in subfield 3=Any position\n"); + printf ("4=Structure: "); + printf ("1=Phrase 2=Word 3=Key 4=Year 5=Date 6=WordList\n"); + printf ("5=Truncation: "); + printf ("1=Right 2=Left 3=L&R 100=No 101=# 102=Re-1 103=Re-2\n"); + printf ("6=Completeness:"); + printf ("1=Incomplete subfield 2=Complete subfield 3=Complete field\n"); + } + 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 = calloc(1,sizeof(char**)); + }; + + num_of_tabs=0; + + tabslist = cmd[i].local_tabcompletes; + for(;tabslist && *tabslist;tabslist++) { + num_of_tabs++; + }; + + cmd[i].local_tabcompletes=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; @@ -2477,11 +2767,11 @@ void process_cmd_line(char* line) for(;*p; ++p) { if(!isspace(*p)) { lastnonspace = p; - }; - }; + } + } if(lastnonspace) *(++lastnonspace) = 0; - }; + } for (i = 0; cmd[i].cmd; i++) @@ -2490,13 +2780,12 @@ void process_cmd_line(char* line) res = (*cmd[i].fun)(arg); break; } + if (!cmd[i].cmd) /* dump our help-screen */ { printf("Unknown command: %s.\n", word); - printf("Currently recognized commands:\n"); - for (i = 0; cmd[i].cmd; i++) - printf(" %s %s\n", cmd[i].cmd, cmd[i].ad); - return; + cmd_help (""); + res = 1; } if(apdu_file) fflush(apdu_file); @@ -2504,14 +2793,16 @@ void process_cmd_line(char* line) if (res >= 2) wait_and_handle_responce(); - if(apdu_file) fflush(apdu_file); - if(marcdump) fflush(marcdump); + if(apdu_file) + fflush(apdu_file); + if(marcdump) + fflush(marcdump); } char *command_generator(const char *text, int state) { - static idx; // index is the last used the last time command_generator was called + static int idx; if (state==0) { idx = 0; } @@ -2519,7 +2810,7 @@ char *command_generator(const char *text, int state) if (!strncmp(cmd[idx].cmd,text,strlen(text))) { ++idx; /* skip this entry on the next run */ return strdup(cmd[idx-1].cmd); - }; + } } return NULL; } @@ -2531,8 +2822,10 @@ 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) { -#ifdef RL_READLINE_VERSION +#if HAVE_READLINE_RL_COMPLETION_MATCHES char** res=rl_completion_matches(text, command_generator); #else @@ -2547,7 +2840,7 @@ char ** readline_completer(char *text, int start, int end) { if ((res = sscanf(rl_line_buffer, "%31s %1023[^;]", word, arg)) <= 0) { rl_attempted_completion_over = 1; return NULL; - }; + } if(start != strlen(word) +1 ) { rl_attempted_completion_over = 1; @@ -2559,34 +2852,45 @@ char ** readline_completer(char *text, int start, int end) { } } + if(!cmd[i].cmd) return NULL; - if(!cmd[i].complete_filenames) - rl_attempted_completion_over = 1; - if(cmd[i].rl_completerfunction) { -#ifdef RL_READLINE_VERSION + + 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; - return res; + 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; - }; - }; + } + } #else return 0; #endif -}; +} static void client(void) { + char line[1024]; + + line[1023] = '\0'; #if HAVE_GETTIMEOFDAY gettimeofday (&tv_start, 0); @@ -2594,14 +2898,10 @@ static void client(void) while (1) { -#ifdef USE_SELECT - fd_set input; -#endif - char line[1024]; - - { + char *line_in = NULL; #if HAVE_READLINE_READLINE_H - char* line_in=NULL; + if (isatty(0)) + { line_in=readline(C_PROMPT); if (!line_in) break; @@ -2609,9 +2909,12 @@ static void client(void) if (*line_in) add_history(line_in); #endif - strcpy(line,line_in); + strncpy(line, line_in, 1023); free (line_in); -#else + } +#endif + if (!line_in) + { char *end_p; printf (C_PROMPT); fflush(stdout); @@ -2619,10 +2922,9 @@ static void client(void) break; if ((end_p = strchr (line, '\n'))) *end_p = '\0'; -#endif + } process_cmd_line(line); } - } } int main(int argc, char **argv) @@ -2655,19 +2957,19 @@ 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 '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) { @@ -2715,8 +3017,6 @@ int main(int argc, char **argv) } - - /* * Local variables: * tab-width: 4