X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=client%2Fclient.c;h=e27a246ad36cd5b5054036bdb38a9a4509361250;hb=fde978ee5097a46b9a162dcff3b4b15d24c8c82f;hp=774a08bbad0ca8869ea421e96f8b06d61162a07a;hpb=109b6408fbe38ca68651a23b59a9ac875e7b8944;p=yaz-moved-to-github.git diff --git a/client/client.c b/client/client.c index 774a08b..e27a246 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.136 2002-01-23 22:40:36 adam Exp $ */ #include @@ -56,7 +50,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 +67,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 +85,12 @@ 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 + +void process_cmd_line(char* line); + ODR getODROutputStream() { return out; @@ -120,11 +121,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 +173,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 +246,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 +309,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) { @@ -429,22 +441,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 +481,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 +502,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 +599,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 +608,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 +628,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 +794,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 +967,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 +980,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 +1170,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 +1381,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 +1553,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 +1659,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 +1745,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 +1962,56 @@ 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; + + if(strlen(arg)<1) { + fprintf(stderr,"Error in source command use a filename"); + 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) { + system(args); + return 1; +} + 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))) @@ -1943,14 +2035,130 @@ static void initialize(void) cmd_base("Default"); } -static int client(int wait) + +#if HAVE_GETTIMEOFDAY +struct timeval tv_start, tv_end; +#endif + +void wait_and_handle_responce() +{ + + int res; + char *netbuffer= 0; + int netbufferlen = 0; + 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 + } +} + +void process_cmd_line(char* line) { static struct { char *cmd; int (*fun)(char *arg); char *ad; } cmd[] = { - {"open", cmd_open, "('tcp'|'osi')':'['/'][':']"}, + {"open", cmd_open, "('tcp'|'ssl')':[':'][/]"}, {"quit", cmd_quit, ""}, {"find", cmd_find, ""}, {"delete", cmd_delete, ""}, @@ -1977,7 +2185,8 @@ static int client(int wait) {"update", cmd_update, ""}, {"packagename", cmd_packagename, ""}, {"proxy", cmd_proxy, "('tcp'|'osi')':'['/'][':']"}, -#ifdef ASN_COMPILED + {".", cmd_source, ""}, + {"!", cmd_subshell, "Subshell command"}, /* Server Admin Functions */ {"adm-reindex", cmd_adm_reindex, ""}, {"adm-truncate", cmd_adm_truncate, "('database'|'index')"}, @@ -1988,42 +2197,58 @@ static int client(int wait) {"adm-commit", cmd_adm_commit, ""}, {"adm-shutdown", cmd_adm_shutdown, ""}, {"adm-startup", cmd_adm_startup, ""}, -#endif {0,0} }; - char *netbuffer= 0; - int netbufferlen = 0; - int i; - Z_APDU *apdu; + 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); + 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 (res >= 2) + wait_and_handle_responce(); +} + + + +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; @@ -2045,166 +2270,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 = 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 +2318,48 @@ int main(int argc, char **argv) case 'p': yazProxy=strdup(arg); break; + case 'u': + if (!auth_command) + { + auth_command = 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 ] " + "[]\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); }