X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=client%2Fclient.c;h=85063a57a531a12caf2805ec37e4f86e303512fc;hb=73453b196192a42ea0ef9c26e0a1a0cc759fd105;hp=82586b5462aaade93bd592561e2f24dcf3400407;hpb=398b30f86d12b3b14c7d389325164ee2df7836b9;p=yaz-moved-to-github.git diff --git a/client/client.c b/client/client.c index 82586b5..85063a5 100644 --- a/client/client.c +++ b/client/client.c @@ -1,8 +1,8 @@ /* - * Copyright (c) 1995-2001, Index Data + * Copyright (c) 1995-2002, Index Data * See the file LICENSE for details. * - * $Id: client.c,v 1.132 2001-11-21 11:13:13 adam Exp $ + * $Id: client.c,v 1.153 2002-05-19 15:39:54 oleg Exp $ */ #include @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -39,7 +40,11 @@ #include #endif +#include + + #include "admin.h" +#include "tabcomplete.h" #define C_PROMPT "Z> " @@ -67,6 +72,9 @@ static char last_scan_query[512] = "0"; 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; @@ -84,11 +92,27 @@ static QueryType queryType = QueryType_Prefix; 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 0 +#define AVOID_MARC_DECODE 1 + +/* nice helper macro as extensive tabbing gives spaces at the en of the args lines */ +#define REMOVE_TAILING_BLANKS(a) {\ + char* args_end=(a)+strlen(a)-1; \ + while(isspace(*args_end)) {*args_end=0;--args_end;}; \ + } + void process_cmd_line(char* line); +char ** readline_completer(char *text, int start, int end); +char *command_generator(const char *text, int state); + ODR getODROutputStream() { @@ -120,11 +144,23 @@ void send_apdu(Z_APDU *a) odr_reset(out); /* release the APDU structure */ } +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])) + printf ("%c", buf[i]); + else + printf ("\\X%02X", buf[i]); +} + static void print_refid (Z_ReferenceId *id) { if (id) { - printf ("ReferenceId: '%.*s'\n", id->len, id->buf); + printf ("Reference Id: "); + print_stringn (id->buf, id->len); + printf ("\n"); } } @@ -160,8 +196,8 @@ static void send_initRequest(const char* type_and_host) ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_2); ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_3); - *req->maximumRecordSize = 1024*1024; - *req->preferredMessageSize = 1024*1024; + *req->maximumRecordSize = 1024*kilobytes; + *req->preferredMessageSize = 1024*kilobytes; req->idAuthentication = auth; @@ -171,6 +207,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"); } @@ -237,7 +290,35 @@ 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, *lang; + 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 ); + } + } fflush (stdout); return 0; } @@ -271,17 +352,16 @@ 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) @@ -294,30 +374,30 @@ int cmd_open(char *arg) base[0] = '\0'; if (sscanf (arg, "%100[^/]/%100s", type_and_host, base) < 1) return 0; - + if(yazProxy) - conn = cs_create_host(yazProxy, 1, &add); + conn = cs_create_host(yazProxy, 1, &add); else - conn = cs_create_host(type_and_host, 1, &add); - + 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); @@ -327,7 +407,9 @@ int cmd_open(char *arg) int cmd_authentication(char *arg) { static Z_IdAuthentication au; - static char open[256]; + static char user[40], group[40], pass[40]; + static Z_IdPass idPass; + int r; if (!*arg) { @@ -335,10 +417,27 @@ int cmd_authentication(char *arg) auth = 0; return 1; } - auth = &au; - au.which = Z_IdAuthentication_open; - au.u.open = open; - strcpy(open, arg); + r = sscanf (arg, "%39s %39s %39s", user, group, pass); + if (r == 0) + { + printf("Auth field set to null\n"); + auth = 0; + } + if (r == 1) + { + auth = &au; + au.which = Z_IdAuthentication_open; + au.u.open = user; + } + if (r == 3) + { + auth = &au; + au.which = Z_IdAuthentication_idPass; + au.u.idPass = &idPass; + idPass.groupId = group; + idPass.userId = user; + idPass.password = pass; + } return 1; } @@ -393,7 +492,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 @@ -428,22 +527,18 @@ static void display_grs1(Z_GenericRecord *r, int level) } } + static void print_record(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); - else - printf ("\\X%02X", buf[i]); - /* add newline if not already added ... */ - if (i <= 0 || buf[i-1] != '\n') - fputc ('\n', stdout); + size_t i = len; + print_stringn (buf, len); + /* add newline if not already added ... */ + if (i <= 0 || buf[i-1] != '\n') + printf ("\n"); } -static void display_record(Z_DatabaseRecord *p) +static void display_record(Z_External *r) { - Z_External *r = (Z_External*) p; oident *ent = oid_getentbyoid(r->direct_reference); record_last = r; @@ -472,15 +567,15 @@ static void display_record(Z_DatabaseRecord *p) /* * Call the given decoder to process the record. */ - odr_setbuf(in, (char*)p->u.octet_aligned->buf, - p->u.octet_aligned->len, 0); + odr_setbuf(in, (char*)r->u.octet_aligned->buf, + r->u.octet_aligned->len, 0); if (!(*type->fun)(in, (char **)&rr, 0, 0)) { odr_perror(in, "Decoding constructed record."); fprintf(stderr, "[Near %d]\n", odr_offset(in)); fprintf(stderr, "Packet dump:\n---------\n"); - odr_dumpBER(stderr, (char*)p->u.octet_aligned->buf, - p->u.octet_aligned->len); + odr_dumpBER(stderr, (char*)r->u.octet_aligned->buf, + r->u.octet_aligned->len); fprintf(stderr, "---------\n"); exit(1); } @@ -495,33 +590,50 @@ static void display_record(Z_DatabaseRecord *p) 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 && p->u.octet_aligned->len) + else if (r->which == Z_External_octet && r->u.octet_aligned->len) { - const char *octet_buf = (char*)p->u.octet_aligned->buf; + const char *octet_buf = (char*)r->u.octet_aligned->buf; if (ent->value == VAL_TEXT_XML || ent->value == VAL_APPLICATION_XML || ent->value == VAL_HTML) + { print_record((const unsigned char *) octet_buf, - p->u.octet_aligned->len); + r->u.octet_aligned->len); + } + else if (ent->value == VAL_POSTSCRIPT) + { + int size = r->u.octet_aligned->len; + if (size > 100) + size = 100; + print_record((const unsigned char *) octet_buf, size); + } else { 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 #endif - marc_display_exl (octet_buf, NULL, 0 /* debug */, - p->u.octet_aligned->len) <= 0) + ) + { + if (marc_display_exl (octet_buf, NULL, 0 /* debug */, + r->u.octet_aligned->len) <= 0) + { + printf ("bad MARC. Dumping as it is:\n"); + print_record((const unsigned char*) octet_buf, + r->u.octet_aligned->len); + } + } + else { - printf ("Hmm.. doesn't look like a MARC.\n"); - print_record((const unsigned char*) octet_buf, - p->u.octet_aligned->len); - } else { print_record((const unsigned char*) octet_buf, - p->u.octet_aligned->len); + r->u.octet_aligned->len); } } if (marcdump) - fwrite (octet_buf, 1, p->u.octet_aligned->len, marcdump); + fwrite (octet_buf, 1, r->u.octet_aligned->len, marcdump); } else if (ent && ent->value == VAL_SUTRS) { @@ -552,7 +664,6 @@ static void display_record(Z_DatabaseRecord *p) } } - static void display_diagrecs(Z_DiagRec **pp, int num) { int i; @@ -761,6 +872,59 @@ 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; + if (term->which == Z_Term_general) + printf (" %.*s", term->u.general->len, term->u.general->buf); + } + } + +} + +/* 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"); @@ -772,8 +936,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); @@ -839,18 +1005,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; } } } @@ -862,18 +1028,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); } } @@ -888,18 +1058,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; } } } @@ -916,14 +1086,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; } } } @@ -942,7 +1112,7 @@ static int process_resourceControlRequest (Z_ResourceControlRequest *req) void process_ESResponse(Z_ExtendedServicesResponse *res) { - printf("process_ESResponse status="); + printf("Status: "); switch (*res->operationStatus) { case Z_ExtendedServicesResponse_done: @@ -955,19 +1125,59 @@ void process_ESResponse(Z_ExtendedServicesResponse *res) printf ("failure\n"); display_diagrecs(res->diagnostics, res->num_diagnostics); break; + default: + printf ("unknown\n"); } if ( (*res->operationStatus != Z_ExtendedServicesResponse_failure) && (res->num_diagnostics != 0) ) { display_diagrecs(res->diagnostics, res->num_diagnostics); } - + print_refid (res->referenceId); + 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"); + } + if (ext->which == Z_External_update) + { + Z_IUUpdateTaskPackage *utp = ext->u.update->u.taskPackage; + if (utp && utp->targetPart) + { + Z_IUTargetPart *targetPart = utp->targetPart; + int i; + + for (i = 0; inum_taskPackageRecords; i++) + { + + Z_IUTaskPackageRecordStructure *tpr = + targetPart->taskPackageRecords[i]; + printf ("task package record %d\n", i+1); + if (tpr->which == Z_IUTaskPackageRecordStructure_record) + { + display_record (tpr->u.record); + } + else + { + printf ("other type\n"); + } + } + } + } + } } #if YAZ_MODULE_ill const char *get_ill_element (void *clientData, const char *element) { - printf ("%s\n", element); return 0; } @@ -982,7 +1192,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"); @@ -1018,7 +1228,7 @@ static Z_External *create_external_itemRequest() r->u.single_ASN1_type = (Odr_oct *) 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, @@ -1077,7 +1287,7 @@ static Z_External *create_external_ILL_APDU(int which) r->u.single_ASN1_type = (Odr_oct *) 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); @@ -1146,12 +1356,12 @@ static Z_External *create_ItemOrderExternal(const char *type, int itemno) } else if (!strcmp(type, "xml") || !strcmp(type, "3")) { - const char *xml_buf = - "\n" - " request\n" - " 000200\n" - " 1212 \n" - ""; + const char *xml_buf = + "\n" + " request\n" + " 000200\n" + " 1212 \n" + ""; r->u.itemOrder->u.esRequest->notToKeep->itemRequest = z_ext_record (out, VAL_TEXT_XML, xml_buf, strlen(xml_buf)); } @@ -1193,7 +1403,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; @@ -1241,19 +1451,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) @@ -1363,13 +1572,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; @@ -1431,6 +1633,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) { @@ -1454,16 +1668,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; @@ -1875,7 +2080,8 @@ int cmd_close(char *arg) return 2; } -int cmd_packagename(char* arg) { +int cmd_packagename(char* arg) +{ xfree (esPackageName); esPackageName = NULL; if (*arg) @@ -1884,9 +2090,14 @@ int cmd_packagename(char* arg) { strcpy (esPackageName, arg); } return 1; -}; +} -int cmd_proxy(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) @@ -1895,26 +2106,66 @@ int cmd_proxy(char* arg) { strcpy (yazProxy, arg); } return 1; -}; +} + +int cmd_charset(char* arg) +{ + if (*arg == '\0') { + printf("Current character set is `%s'\n", (yazCharset)?yazCharset:NULL); + return 1; + } + xfree (yazCharset); + yazCharset = NULL; + if (*arg) + { + yazCharset = (char *) xmalloc (strlen(arg)+1); + strcpy (yazCharset, arg); + } + 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.. */ FILE* includeFile; char line[1024], *cp; + + { + char* args_end=(arg)+strlen(arg)-1; + while(isspace(*args_end)) + {*args_end=0; + --args_end;}; + } + + REMOVE_TAILING_BLANKS(arg); if(strlen(arg)<1) { - fprintf(stderr,"Error in source command use a filename"); + 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); return -1; - }; - + } while(!feof(includeFile)) { memset(line,0,sizeof(line)); @@ -1927,8 +2178,7 @@ int cmd_source(char* arg) *cp = '\0'; process_cmd_line(line); - }; - + } if(fclose(includeFile)<0) { perror("unable to close include file"); @@ -1937,11 +2187,205 @@ int cmd_source(char* arg) return 1; } -int cmd_subshell(char* args) { - system(args); +int cmd_subshell(char* args) +{ + if(strlen(args)) + system(args); + else + system(getenv("SHELL")); + + printf("\n"); + return 1; +} + +int cmd_set_apdufile(char* arg) +{ + REMOVE_TAILING_BLANKS(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) { + return 1; + } + + if(!strcmp(arg,"-")) + apdu_file=stderr; + else + apdu_file=fopen(arg, "a"); + + if(!apdu_file) { + perror("unable to open apdu log file no apdu log loaded"); + } else { + odr_setprint(print, apdu_file); + } + + return 1; +} + +int cmd_set_cclfields(char* arg) +{ +#if YAZ_MODULE_ccl + FILE *inf; + + REMOVE_TAILING_BLANKS(arg); + + bibset = ccl_qual_mk (); + inf = fopen (arg, "r"); + if (inf) + { + ccl_qual_file (bibset, inf); + fclose (inf); + } +#else + fprintf(stderr,"Not compiled with the yaz ccl module\n"); +#endif + return 1; } +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) { + 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) { + if(yazProxy) free(yazProxy); + yazProxy=NULL; + + if(strlen(arg) > 1) { + yazProxy=strdup(arg); + } + return 1; +} + +/* + this command takes 3 arge {name class oid} + */ +int cmd_register_oid(char* args) { + static struct { + char* className; + oid_class oclass; + } oid_classes[] = { + {"appctx",CLASS_APPCTX}, + {"absyn",CLASS_ABSYN}, + {"attset",CLASS_ATTSET}, + {"transyn",CLASS_TRANSYN}, + {"diagset",CLASS_DIAGSET}, + {"recsyn",CLASS_RECSYN}, + {"resform",CLASS_RESFORM}, + {"accform",CLASS_ACCFORM}, + {"extserv",CLASS_EXTSERV}, + {"userinfo",CLASS_USERINFO}, + {"elemspec",CLASS_ELEMSPEC}, + {"varset",CLASS_VARSET}, + {"schema",CLASS_SCHEMA}, + {"tagset",CLASS_TAGSET}, + {"general",CLASS_GENERAL}, + {0,0} + }; + char oname_str[101], oclass_str[101], oid_str[101]; + char* name; + int i; + oid_class oidclass = CLASS_GENERAL; + int val = 0, oid[OID_SIZE]; + struct oident * new_oident=NULL; + + if (sscanf (args, "%100[^ ] %100[^ ] %100s", + oname_str,oclass_str, oid_str) < 1) { + printf("Error in regristrate command \n"); + return 0; + } + + 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)) { + printf("Unknonwn oid class %s\n",oclass_str); + return 0; + } + + i = 0; + name = oid_str; + val = 0; + + while (isdigit (*name)) + { + val = val*10 + (*name - '0'); + name++; + if (*name == '.') + { + if (i < OID_SIZE-1) + oid[i++] = val; + val = 0; + name++; + } + } + oid[i] = val; + oid[i+1] = -1; + + new_oident=oid_addent (oid,PROTO_GENERAL,oidclass,oname_str,VAL_DYNAMIC); + if(strcmp(new_oident->desc,oname_str)) { + fprintf(stderr,"oid is already named as %s, regristration faild\n", + new_oident->desc); + } + return 1; +} + +int cmd_push_command(char* arg) { +#if HAVE_READLINE_HISTORY_H + if(strlen(arg)>1) + add_history(arg); +#else + fprintf(stderr,"Not compiled with the readline/history module\n"); +#endif + return 1; +} + +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); + + if(stat(buffer,&statbuf)==0) { + cmd_source(buffer); + } + + if(stat(".yazclientrc",&statbuf)==0) { + cmd_source(".yazclientrc"); + } +} + + static void initialize(void) { #if YAZ_MODULE_ccl @@ -1954,6 +2398,8 @@ static void initialize(void) fprintf(stderr, "failed to allocate ODR streams\n"); exit(1); } + oid_init(); + setvbuf(stdout, 0, _IONBF, 0); if (apdu_file) odr_setprint(print, apdu_file); @@ -1968,6 +2414,12 @@ static void initialize(void) } #endif cmd_base("Default"); + +#if HAVE_READLINE_READLINE_H + rl_attempted_completion_function = (CPPFunction*)readline_completer; +#endif + + source_rcfile(); } @@ -1975,7 +2427,7 @@ static void initialize(void) struct timeval tv_start, tv_end; #endif -void wait_and_handle_responce() +void wait_and_handle_responce() { int res; @@ -1984,23 +2436,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; @@ -2014,7 +2464,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)) { @@ -2066,7 +2517,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)); @@ -2084,60 +2535,114 @@ void wait_and_handle_responce() ((double) tv_start.tv_usec / 1e6 + tv_start.tv_sec)); #endif } + xfree (netbuffer); +} + + +static int cmd_help (char *line); + +static struct { + char *cmd; + int (*fun)(char *arg); + char *ad; + char *(*rl_completerfunction)(const char *text, int state); + int complete_filenames; +} 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}, + {"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}, + /* 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} +}; + +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; } void process_cmd_line(char* line) -{ - static struct { - char *cmd; - int (*fun)(char *arg); - char *ad; - } cmd[] = { - {"open", cmd_open, "('tcp'|'ssl')':[':'][/]"}, - {"quit", cmd_quit, ""}, - {"find", cmd_find, ""}, - {"delete", cmd_delete, ""}, - {"base", cmd_base, ""}, - {"show", cmd_show, "['+'<#recs>['+']]"}, - {"scan", cmd_scan, ""}, - {"sort", cmd_sort, " ..."}, - {"sort+", cmd_sort_newset, " ..."}, - {"authentication", cmd_authentication, ""}, - {"lslb", cmd_lslb, ""}, - {"ssub", cmd_ssub, ""}, - {"mspn", cmd_mspn, ""}, - {"status", cmd_status, ""}, - {"setnames", cmd_setnames, ""}, - {"cancel", cmd_cancel, ""}, - {"format", cmd_format, ""}, - {"schema", cmd_schema, ""}, - {"elements", cmd_elements, ""}, - {"close", cmd_close, ""}, - {"attributeset", cmd_attributeset, ""}, - {"querytype", cmd_querytype, ""}, - {"refid", cmd_refid, ""}, - {"itemorder", cmd_itemorder, "ill|item "}, - {"update", cmd_update, ""}, - {"packagename", cmd_packagename, ""}, - {"proxy", cmd_proxy, "('tcp'|'osi')':'['/'][':']"}, - {".", cmd_source, ""}, - {"!", cmd_subshell, "Subshell command"}, - /* Server Admin Functions */ - {"adm-reindex", cmd_adm_reindex, ""}, - {"adm-truncate", cmd_adm_truncate, "('database'|'index')"}, - {"adm-create", cmd_adm_create, ""}, - {"adm-drop", cmd_adm_drop, "('database'|'index')"}, - {"adm-import", cmd_adm_import, " "}, - {"adm-refresh", cmd_adm_refresh, ""}, - {"adm-commit", cmd_adm_commit, ""}, - {"adm-shutdown", cmd_adm_shutdown, ""}, - {"adm-startup", cmd_adm_startup, ""}, - {0,0} - }; +{ int i,res; char word[32], arg[1024]; - #if HAVE_GETTIMEOFDAY gettimeofday (&tv_start, 0); #endif @@ -2150,28 +2655,130 @@ 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; + char* lastnonspace=NULL; + p = arg; + + for(;*p; ++p) { + if(!isspace(*p)) { + lastnonspace = p; + } + } + if(lastnonspace) + *(++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); - 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); + if (res >= 2) wait_and_handle_responce(); + + if(apdu_file) + fflush(apdu_file); + if(marcdump) + fflush(marcdump); } +char *command_generator(const char *text, int state) +{ + static int idx; + if (state==0) { + idx = 0; + } + for( ; cmd[idx].cmd; ++idx) { + if (!strncmp(cmd[idx].cmd,text,strlen(text))) { + ++idx; /* skip this entry on the next run */ + return strdup(cmd[idx-1].cmd); + } + } + return NULL; +} + + +/* + This function only known how to complete on the first word +*/ +char ** readline_completer(char *text, int start, int end) { +#if HAVE_READLINE_READLINE_H + + if(start == 0) { +#if HAVE_READLINE_RL_COMPLETION_MATCHES + char** res=rl_completion_matches(text, + command_generator); +#else + char** res=completion_matches(text, + (CPFunction*)command_generator); +#endif + rl_attempted_completion_over = 1; + return res; + } else { + char arg[1024],word[32]; + int i=0 ,res; + 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; + 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) { +#ifdef HAVE_READLINE_RL_COMPLETION_MATCHES + char** res= + rl_completion_matches(text, + cmd[i].rl_completerfunction); +#else + char** res= + completion_matches(text, + (CPFunction*)cmd[i].rl_completerfunction); +#endif + rl_attempted_completion_over = 1; + return res; + } else { + 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); @@ -2179,14 +2786,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; + if (isatty(0)) + { line_in=readline(C_PROMPT); if (!line_in) break; @@ -2194,9 +2797,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); @@ -2204,9 +2810,8 @@ static void client(void) break; if ((end_p = strchr (line, '\n'))) *end_p = '\0'; -#endif - process_cmd_line(line); - } + } + process_cmd_line(line); } } @@ -2214,21 +2819,25 @@ int main(int argc, char **argv) { char *prog = *argv; char *open_command = 0; + char *auth_command = 0; char *arg; int ret; - - while ((ret = options("c:a:m:v:p:", argv, argc, &arg)) != -2) + + while ((ret = options("k:c:a:m:v:p:u:", argv, argc, &arg)) != -2) { switch (ret) { case 0: if (!open_command) { - open_command = xmalloc (strlen(arg)+6); + open_command = (char *) xmalloc (strlen(arg)+6); strcpy (open_command, "open "); strcat (open_command, arg); } break; + case 'k': + kilobytes = atoi(arg); + break; case 'm': if (!(marcdump = fopen (arg, "a"))) { @@ -2236,30 +2845,50 @@ 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) + { + auth_command = (char *) xmalloc (strlen(arg)+6); + strcpy (auth_command, "auth "); + strcat (auth_command, arg); + } + break; case 'v': yaz_log_init (yaz_log_mask_str(arg), "", NULL); break; default: fprintf (stderr, "Usage: %s [-m ] [ -a ] " - "[-c cclfields] [-p ] []\n", + "[-c cclfields]\n [-p ] [-u ] " + "[-k size] []\n", prog); exit (1); - } + } } initialize(); + if (auth_command) + { +#ifdef HAVE_GETTIMEOFDAY + gettimeofday (&tv_start, 0); +#endif + process_cmd_line (auth_command); +#if HAVE_READLINE_HISTORY_H + add_history(auth_command); +#endif + xfree(auth_command); + } if (open_command) { #ifdef HAVE_GETTIMEOFDAY @@ -2274,3 +2903,11 @@ int main(int argc, char **argv) client (); exit (0); } + + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + */