X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=client%2Fclient.c;h=2ee4efd156674a7bfc091a59560b6670c32b8ea1;hp=774a08bbad0ca8869ea421e96f8b06d61162a07a;hb=2984a4a74dbbe7aaf4f07788ae4785041cf6004a;hpb=109b6408fbe38ca68651a23b59a9ac875e7b8944 diff --git a/client/client.c b/client/client.c index 774a08b..2ee4efd 100644 --- a/client/client.c +++ b/client/client.c @@ -1,14 +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.127 2001-08-08 19:35:06 adam Exp $ - * - */ - -/* - * This is the obligatory little toy client, whose primary purpose is - * to illustrate the use of the YAZ service-level API. + * $Id: client.c,v 1.138 2002-01-29 20:17:41 ja7 Exp $ */ #include @@ -45,7 +39,11 @@ #include #endif +#include + + #include "admin.h" +#include "tabcomplete.h" #define C_PROMPT "Z> " @@ -56,7 +54,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 = 0; /* current result set number */ +static int setnumber = -1; /* current result set number */ static int smallSetUpperBound = 0; static int largeSetLowerBound = 1; static int mediumSetPresentNumber = 0; @@ -73,6 +71,7 @@ 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 last_cmd[32] = "?"; static FILE *marcdump = 0; @@ -90,6 +89,22 @@ static QueryType queryType = QueryType_Prefix; static CCL_bibset bibset; /* CCL bibset handle */ #endif + +/* set this one to 1, to avoid decode of unknown MARCs */ +#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(char *text, int state); + + ODR getODROutputStream() { return out; @@ -120,11 +135,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])) + fputc (buf[i], stdout); + 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 +187,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; @@ -233,7 +260,10 @@ static int process_initResponse(Z_InitResponse *res) if (ODR_MASK_GET(res->options, Z_Options_concurrentOperations)) printf (" concurrentOperations"); if (ODR_MASK_GET(res->options, Z_Options_namedResultSets)) + { printf (" namedResultSets"); + setnumber = 0; + } printf ("\n"); fflush (stdout); return 0; @@ -293,13 +323,9 @@ int cmd_open(char *arg) return 0; if(yazProxy) - { conn = cs_create_host(yazProxy, 1, &add); - } else - { conn = cs_create_host(type_and_host, 1, &add); - } if (!conn) { @@ -328,7 +354,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) { @@ -336,10 +364,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; } @@ -429,22 +474,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') + size_t i = len; + print_stringn (buf, len); + /* add newline if not already added ... */ + if (i <= 0 || buf[i-1] != '\n') fputc ('\n', stdout); } -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; @@ -473,15 +514,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); } @@ -494,25 +535,51 @@ 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) + 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) { - 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 (marc_display (octet_buf, NULL) <= 0) + if ( +#if AVOID_MARC_DECODE + /* primitive check for a marc OID 5.1-29 */ + ent->oidsuffix[0] == 5 && ent->oidsuffix[1] < 30 +#else + 1 +#endif + ) + { + 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 ("ISO2709 decoding failed, dumping record as is:\n"); 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) { @@ -565,7 +632,6 @@ static void display_diagrecs(Z_DiagRec **pp, int num) ent->oclass != CLASS_DIAGSET || ent->value != VAL_BIB1) printf("Missing or unknown diagset\n"); printf(" [%d] %s", *r->condition, diagbib1_str(*r->condition)); -#ifdef ASN_COMPILED switch (r->which) { case Z_DefaultDiagFormat_v2Addinfo: @@ -575,12 +641,6 @@ static void display_diagrecs(Z_DiagRec **pp, int num) printf (" -- v3 addinfo '%s'\n", r->u.v3Addinfo); break; } -#else - if (r->addinfo && *r->addinfo) - printf(" -- '%s'\n", r->addinfo); - else - printf("\n"); -#endif } } @@ -601,14 +661,10 @@ static void display_records(Z_Records *p) if (p->which == Z_Records_NSD) { -#ifdef ASN_COMPILED Z_DiagRec dr, *dr_p = &dr; dr.which = Z_DiagRec_defaultFormat; dr.u.defaultFormat = p->u.nonSurrogateDiagnostic; display_diagrecs (&dr_p, 1); -#else - display_diagrecs (&p->u.nonSurrogateDiagnostic, 1); -#endif } else if (p->which == Z_Records_multipleNSD) display_diagrecs (p->u.multipleNonSurDiagnostics->diagRecs, @@ -771,9 +827,10 @@ static int process_searchResponse(Z_SearchResponse *res) printf("Search was a success.\n"); else printf("Search was a bloomin' failure.\n"); - printf("Number of hits: %d, setno %d\n", - *res->resultCount, setnumber); - printf("records returned: %d\n", + printf("Number of hits: %d", *res->resultCount); + if (setnumber >= 0) + printf (", setno %d", setnumber); + printf("\nrecords returned: %d\n", *res->numberOfRecordsReturned); setno += *res->numberOfRecordsReturned; if (res->records) @@ -943,7 +1000,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: @@ -956,19 +1013,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; } @@ -1106,11 +1203,7 @@ static Z_External *create_ItemOrderExternal(const char *type, int itemno) r->u.itemOrder = (Z_ItemOrder *) odr_malloc(out,sizeof(Z_ItemOrder)); memset(r->u.itemOrder, 0, sizeof(Z_ItemOrder)); -#ifdef ASN_COMPILED r->u.itemOrder->which=Z_IOItemOrder_esRequest; -#else - r->u.itemOrder->which=Z_ItemOrder_esRequest; -#endif r->u.itemOrder->u.esRequest = (Z_IORequest *) odr_malloc(out,sizeof(Z_IORequest)); @@ -1321,16 +1414,19 @@ static int cmd_status(char *arg) static int cmd_setnames(char *arg) { - if (setnumber < 0) - { - printf("Set numbering enabled.\n"); + if (*arg == '1') /* enable ? */ + setnumber = 0; + else if (*arg == '0') /* disable ? */ + setnumber = -1; + else if (setnumber < 0) /* no args, toggle .. */ setnumber = 0; - } else - { - printf("Set numbering disabled.\n"); setnumber = -1; - } + + if (setnumber >= 0) + printf("Set numbering enabled.\n"); + else + printf("Set numbering disabled.\n"); return 1; } @@ -1490,6 +1586,7 @@ static int cmd_show(char *arg) int cmd_quit(char *arg) { printf("See you later, alligator.\n"); + xmalloc_trav (""); exit(0); return 0; } @@ -1595,20 +1692,10 @@ int send_sortrequest(char *arg, int newset) req->referenceId = set_refid (out); -#ifdef ASN_COMPILED req->num_inputResultSetNames = 1; req->inputResultSetNames = (Z_InternationalString **) odr_malloc (out, sizeof(*req->inputResultSetNames)); req->inputResultSetNames[0] = odr_strdup (out, setstring); -#else - req->inputResultSetNames = - (Z_StringList *)odr_malloc (out, sizeof(*req->inputResultSetNames)); - req->inputResultSetNames->num_strings = 1; - req->inputResultSetNames->strings = - (char **)odr_malloc (out, sizeof(*req->inputResultSetNames->strings)); - req->inputResultSetNames->strings[0] = - odr_strdup (out, setstring); -#endif if (newset && setnumber >= 0) sprintf (setstring, "%d", ++setnumber); @@ -1691,15 +1778,9 @@ void process_sortResponse(Z_SortResponse *res) } printf ("\n"); print_refid (res->referenceId); -#ifdef ASN_COMPILED if (res->diagnostics) display_diagrecs(res->diagnostics, res->num_diagnostics); -#else - if (res->diagnostics) - display_diagrecs(res->diagnostics->diagRecs, - res->diagnostics->num_diagRecs); -#endif } void process_deleteResultSetResponse (Z_DeleteResultSetResponse *res) @@ -1914,12 +1995,259 @@ int cmd_proxy(char* 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\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)); + fgets(line,sizeof(line),includeFile); + + if(strlen(line) < 2) continue; + if(line[0] == '#') continue; + + if ((cp = strrchr (line, '\n'))) + *cp = '\0'; + + process_cmd_line(line); + }; + + + if(fclose(includeFile)<0) { + perror("unable to close include file"); + exit(1); + } + return 1; +} + +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 FILE *inf; #endif - nmem_init(); if (!(out = odr_createmem(ODR_ENCODE)) || !(in = odr_createmem(ODR_DECODE)) || !(print = odr_createmem(ODR_PRINT))) @@ -1927,6 +2255,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); @@ -1941,92 +2271,324 @@ static void initialize(void) } #endif cmd_base("Default"); + +#if HAVE_READLINE_READLINE_H + rl_attempted_completion_function = (CPPFunction*)readline_completer; +#endif + + source_rcfile(); } -static int client(int wait) -{ - static struct { - char *cmd; - int (*fun)(char *arg); - char *ad; - } cmd[] = { - {"open", cmd_open, "('tcp'|'osi')':'['/'][':']"}, - {"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')':'['/'][':']"}, -#ifdef ASN_COMPILED - /* 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, ""}, + +#if HAVE_GETTIMEOFDAY +struct timeval tv_start, tv_end; #endif - {0,0} - }; + +void wait_and_handle_responce() +{ + + int res; char *netbuffer= 0; int netbufferlen = 0; - int i; Z_APDU *apdu; + + + if (conn +#ifdef USE_SELECT + && FD_ISSET(cs_fileno(conn), &input) +#endif + ) + { + do + { + if ((res = cs_get(conn, &netbuffer, &netbufferlen)) < 0) + { + perror("cs_get"); + exit(1); + } + if (!res) + { + printf("Target closed connection.\n"); + exit(1); + } + odr_reset(in); /* release APDU from last round */ + record_last = 0; + odr_setbuf(in, netbuffer, res, 0); + if (!z_APDU(in, &apdu, 0, 0)) + { + odr_perror(in, "Decoding incoming APDU"); + fprintf(stderr, "[Near %d]\n", odr_offset(in)); + fprintf(stderr, "Packet dump:\n---------\n"); + odr_dumpBER(stderr, netbuffer, res); + fprintf(stderr, "---------\n"); + if (apdu_file) + z_APDU(print, &apdu, 0, 0); + exit(1); + } + if (apdu_file && !z_APDU(print, &apdu, 0, 0)) + { + odr_perror(print, "Failed to print incoming APDU"); + odr_reset(print); + continue; + } + switch(apdu->which) + { + case Z_APDU_initResponse: + process_initResponse(apdu->u.initResponse); + break; + case Z_APDU_searchResponse: + process_searchResponse(apdu->u.searchResponse); + break; + case Z_APDU_scanResponse: + process_scanResponse(apdu->u.scanResponse); + break; + case Z_APDU_presentResponse: + print_refid (apdu->u.presentResponse->referenceId); + setno += + *apdu->u.presentResponse->numberOfRecordsReturned; + if (apdu->u.presentResponse->records) + display_records(apdu->u.presentResponse->records); + else + printf("No records.\n"); + printf ("nextResultSetPosition = %d\n", + *apdu->u.presentResponse->nextResultSetPosition); + break; + case Z_APDU_sortResponse: + process_sortResponse(apdu->u.sortResponse); + break; + case Z_APDU_extendedServicesResponse: + printf("Got extended services response\n"); + process_ESResponse(apdu->u.extendedServicesResponse); + break; + case Z_APDU_close: + printf("Target has closed the association.\n"); + process_close(apdu->u.close); + break; + case Z_APDU_resourceControlRequest: + process_resourceControlRequest + (apdu->u.resourceControlRequest); + break; + case Z_APDU_deleteResultSetResponse: + process_deleteResultSetResponse(apdu->u. + deleteResultSetResponse); + break; + default: + printf("Received unknown APDU type (%d).\n", + apdu->which); + exit(1); + } + } + while (conn && cs_more(conn)); +#if HAVE_GETTIMEOFDAY + gettimeofday (&tv_end, 0); +#if 0 + printf ("S/U S/U=%ld/%ld %ld/%ld", + (long) tv_start.tv_sec, + (long) tv_start.tv_usec, + (long) tv_end.tv_sec, + (long) tv_end.tv_usec); +#endif + printf ("Elapsed: %.6f\n", + (double) tv_end.tv_usec / 1e6 + tv_end.tv_sec - + ((double) tv_start.tv_usec / 1e6 + tv_start.tv_sec)); +#endif + } +} + + +static struct { + char *cmd; + int (*fun)(char *arg); + char *ad; + char *(*rl_completerfunction)(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'|'osi')':'['/'][':']",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}, + {0,0,0,0,0} +}; + +void process_cmd_line(char* line) +{ + int i,res; + char word[32], arg[1024]; + +#if HAVE_GETTIMEOFDAY + gettimeofday (&tv_start, 0); +#endif + + if ((res = sscanf(line, "%31s %1023[^;]", word, arg)) <= 0) + { + strcpy(word, last_cmd); + *arg = '\0'; + } + 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; + } + + 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(char *text, int state) +{ + static idx; // index is the last used the last time command_generator was called + char *command; + 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) { + char** res=completion_matches(text, (CPFunction*)command_generator); + 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) { + char** res=completion_matches(text, (CPFunction*)cmd[i].rl_completerfunction); + rl_attempted_completion_over = 1; + return res; + } else { + rl_attempted_completion_over = 1; + return 0; + }; + }; +#else + return 0; +#endif +}; + + +static void client(void) +{ + #if HAVE_GETTIMEOFDAY - struct timeval tv_start, tv_end; gettimeofday (&tv_start, 0); #endif while (1) { - int res; #ifdef USE_SELECT fd_set input; #endif - char line[1024], word[32], arg[1024]; + char line[1024]; -#ifdef USE_SELECT - FD_ZERO(&input); - FD_SET(0, &input); - if (conn) - FD_SET(cs_fileno(conn), &input); - if ((res = select(20, &input, 0, 0, 0)) < 0) - { - perror("select"); - exit(1); - } - if (!res) - continue; - if (!wait && FD_ISSET(0, &input)) -#else - if (!wait) -#endif { #if HAVE_READLINE_READLINE_H - char* line_in; + char* line_in=NULL; line_in=readline(C_PROMPT); if (!line_in) break; @@ -2045,166 +2607,34 @@ static int client(int wait) if ((end_p = strchr (line, '\n'))) *end_p = '\0'; #endif -#if HAVE_GETTIMEOFDAY - gettimeofday (&tv_start, 0); -#endif - - if ((res = sscanf(line, "%31s %1023[^;]", word, arg)) <= 0) - { - strcpy(word, last_cmd); - *arg = '\0'; - } - else if (res == 1) - *arg = 0; - strcpy(last_cmd, word); - 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); - res = 1; - } - if (res < 2) - { - continue; - } - } - wait = 0; - if (conn -#ifdef USE_SELECT - && FD_ISSET(cs_fileno(conn), &input) -#endif - ) - { - do - { - if ((res = cs_get(conn, &netbuffer, &netbufferlen)) < 0) - { - perror("cs_get"); - exit(1); - } - if (!res) - { - printf("Target closed connection.\n"); - exit(1); - } - odr_reset(in); /* release APDU from last round */ - record_last = 0; - odr_setbuf(in, netbuffer, res, 0); - if (!z_APDU(in, &apdu, 0, 0)) - { - odr_perror(in, "Decoding incoming APDU"); - fprintf(stderr, "[Near %d]\n", odr_offset(in)); - fprintf(stderr, "Packet dump:\n---------\n"); - odr_dumpBER(stderr, netbuffer, res); - fprintf(stderr, "---------\n"); - if (apdu_file) - z_APDU(print, &apdu, 0, 0); - exit(1); - } - if (apdu_file && !z_APDU(print, &apdu, 0, 0)) - { - odr_perror(print, "Failed to print incoming APDU"); - odr_reset(print); - continue; - } - switch(apdu->which) - { - case Z_APDU_initResponse: - process_initResponse(apdu->u.initResponse); - break; - case Z_APDU_searchResponse: - process_searchResponse(apdu->u.searchResponse); - break; - case Z_APDU_scanResponse: - process_scanResponse(apdu->u.scanResponse); - break; - case Z_APDU_presentResponse: - print_refid (apdu->u.presentResponse->referenceId); - setno += - *apdu->u.presentResponse->numberOfRecordsReturned; - if (apdu->u.presentResponse->records) - display_records(apdu->u.presentResponse->records); - else - printf("No records.\n"); - printf ("nextResultSetPosition = %d\n", - *apdu->u.presentResponse->nextResultSetPosition); - break; - case Z_APDU_sortResponse: - process_sortResponse(apdu->u.sortResponse); - break; - case Z_APDU_extendedServicesResponse: - printf("Got extended services response\n"); - process_ESResponse(apdu->u.extendedServicesResponse); - break; - case Z_APDU_close: - printf("Target has closed the association.\n"); - process_close(apdu->u.close); - break; - case Z_APDU_resourceControlRequest: - process_resourceControlRequest - (apdu->u.resourceControlRequest); - break; - case Z_APDU_deleteResultSetResponse: - process_deleteResultSetResponse(apdu->u. - deleteResultSetResponse); - break; - default: - printf("Received unknown APDU type (%d).\n", - apdu->which); - exit(1); - } - } - while (conn && cs_more(conn)); -#if HAVE_GETTIMEOFDAY - gettimeofday (&tv_end, 0); - if (1) - { - printf ("Elapsed: %.6f\n", (double) tv_end.tv_usec / - 1e6 + tv_end.tv_sec - - ((double) tv_start.tv_usec / 1e6 + tv_start.tv_sec)); - } -#endif - } + process_cmd_line(line); + } } - return 0; } int main(int argc, char **argv) { char *prog = *argv; + char *open_command = 0; + char *auth_command = 0; char *arg; int ret; - int opened = 0; - - 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 (!opened) + if (!open_command) { - initialize (); - if (cmd_open (arg) == 2) { -#if HAVE_READLINE_HISTORY_H - char* tmp=(char*)malloc(strlen(arg)+6); - *tmp=0; - strcat(tmp,"open "); - strcat(tmp,arg); - add_history(tmp); - free(tmp); -#endif - opened = 1; - }; + 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"))) { @@ -2225,17 +2655,58 @@ int main(int argc, char **argv) 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); - } + } } - if (!opened) - initialize (); - return client (opened); + 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 + gettimeofday (&tv_start, 0); +#endif + process_cmd_line (open_command); +#if HAVE_READLINE_HISTORY_H + add_history(open_command); +#endif + xfree(open_command); + } + client (); + exit (0); } + + + + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + */