X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=client%2Fclient.c;h=3022b3f5f61bfb6dc264d5312dd3ddf5a969ae72;hb=e7abd38ba0b6a5076d710a9bdc1eecd22abe00a8;hp=483b83805a264c888018e54f1e02680f3fcfc3b4;hpb=bb182c49a5a8b379b8a021eed572d070307333a9;p=yaz-moved-to-github.git diff --git a/client/client.c b/client/client.c index 483b838..3022b3f 100644 --- a/client/client.c +++ b/client/client.c @@ -1,10 +1,41 @@ + /* * Copyright (c) 1995-1996, Index Data. * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: client.c,v $ - * Revision 1.40 1996-08-29 14:19:34 quinn + * Revision 1.49 1997-09-04 13:45:17 adam + * Added UNImarc to list of available syntaxes. + * + * Revision 1.48 1997/09/01 08:48:44 adam + * New windows NT/95 port using MSV5.0. Only a few changes made + * to avoid warnings. Sub project created: client.dsp. + * + * Revision 1.47 1997/07/01 13:49:56 adam + * Take care of case when invalid target is specified on command line. + * + * Revision 1.46 1997/06/23 10:30:18 adam + * Added call to ccl_rpn_delete in search. Added ODR stream "out" + * as parameter to ccl_rpn_query to release RPN query. + * + * Revision 1.45 1997/05/14 06:53:29 adam + * C++ support. + * + * Revision 1.44 1997/05/05 11:20:35 adam + * Client uses "options" utility and marc dump filename may be specified + * as an option (-m ). + * + * Revision 1.43 1996/11/08 11:03:26 adam + * Client accepts multiple database names. + * + * Revision 1.42 1996/10/08 10:44:57 quinn + * Resolved conflicts. + * + * Revision 1.41 1996/10/07 15:29:03 quinn + * Work + * + * Revision 1.40 1996/08/29 14:19:34 quinn * Fixed conflict (CVS) * * Revision 1.39 1996/08/27 10:43:22 quinn @@ -148,6 +179,7 @@ #include #include #include +#include #include @@ -160,7 +192,8 @@ static ODR out, in, print; /* encoding and decoding streams */ static COMSTACK conn = 0; /* our z-association */ static Z_IdAuthentication *auth = 0; /* our current auth definition */ -static char database[512] = "Default"; /* Database name */ +static char *databaseNames[128]; +static int num_databaseNames = 0; static int setnumber = 0; /* current result set number */ static int smallSetUpperBound = 0; static int largeSetLowerBound = 1; @@ -175,7 +208,6 @@ static Z_InitResponse *session = 0; /* session parameters */ static char last_scan[512] = "0"; static char last_cmd[100] = "?"; static FILE *marcdump = 0; -static char marcdump_file[512] = "marc.out"; typedef enum { QueryType_Prefix, @@ -356,7 +388,7 @@ static void display_variant(Z_Variant *v, int level) for (i = 0; i < v->num_triples; i++) { - printf("%*sclass=%d,type=%d", level * 4, "", *v->triples[i]->class, + printf("%*sclass=%d,type=%d", level * 4, "", *v->triples[i]->zclass, *v->triples[i]->type); if (v->triples[i]->which == Z_Triple_internationalString) printf(",value=%s\n", v->triples[i]->value.internationalString); @@ -485,8 +517,15 @@ static void display_record(Z_DatabaseRecord *p) r->which = type->what; } } - if (r->which == Z_External_octet && p->u.octet_aligned->len) - marc_display ((char*)p->u.octet_aligned->buf, stdout); + if (ent->value == VAL_SOIF) + printf("%.*s", r->u.octet_aligned->len, r->u.octet_aligned->buf); + else if (r->which == Z_External_octet && p->u.octet_aligned->len) + { + const char *marc_buf = (char*)p->u.octet_aligned->buf; + marc_display (marc_buf, NULL); + if (marcdump) + fwrite (marc_buf, strlen (marc_buf), 1, marcdump); + } else if (ent->value == VAL_SUTRS) { if (r->which != Z_External_sutrs) @@ -573,7 +612,6 @@ static int send_searchRequest(char *arg) { Z_APDU *apdu = zget_APDU(out, Z_APDU_searchRequest); Z_SearchRequest *req = apdu->u.searchRequest; - char *databaseNames = database; Z_Query query; #if CCL2RPN struct ccl_rpn_node *rpn; @@ -629,8 +667,8 @@ static int send_searchRequest(char *arg) req->smallSetElementSetNames = req->mediumSetElementSetNames = elementSetNames; } - req->num_databaseNames = 1; - req->databaseNames = &databaseNames; + req->num_databaseNames = num_databaseNames; + req->databaseNames = databaseNames; req->query = &query; @@ -655,12 +693,13 @@ static int send_searchRequest(char *arg) #if CCL2RPN case QueryType_CCL2RPN: query.which = Z_Query_type_1; - assert((RPNquery = ccl_rpn_query(rpn))); + assert((RPNquery = ccl_rpn_query(out, rpn))); bib1.proto = protocol; bib1.oclass = CLASS_ATTSET; bib1.value = VAL_BIB1; RPNquery->attributeSetId = oid_getoidbyent(&bib1); query.u.type_1 = RPNquery; + ccl_rpn_delete (rpn); break; #endif default: @@ -737,12 +776,30 @@ static int cmd_status(char *arg) static int cmd_base(char *arg) { + int i; + char *cp; + if (!*arg) { - printf("Usage: base \n"); + printf("Usage: base ...\n"); return 0; } - strcpy(database, arg); + for (i = 0; inum_ranges = 1; #endif - - - - - - - - - req->resultSetStartPoint = &setno; req->numberOfRecordsRequested = &nos; prefsyn.proto = protocol; @@ -864,6 +912,7 @@ int cmd_quit(char *arg) { printf("See you later, alligator.\n"); exit(0); + return 0; } int cmd_cancel(char *arg) @@ -871,7 +920,7 @@ int cmd_cancel(char *arg) Z_APDU *apdu = zget_APDU(out, Z_APDU_triggerResourceControlRequest); Z_TriggerResourceControlRequest *req = apdu->u.triggerResourceControlRequest; - bool_t false = 0; + bool_t rfalse = 0; if (!session) { @@ -884,7 +933,7 @@ int cmd_cancel(char *arg) return 0; } *req->requestedAction = Z_TriggerResourceCtrl_cancel; - req->resultSetWanted = &false; + req->resultSetWanted = &rfalse; send_apdu(apdu); printf("Sent cancel request\n"); @@ -895,10 +944,9 @@ int send_scanrequest(char *string, int pp, int num) { Z_APDU *apdu = zget_APDU(out, Z_APDU_scanRequest); Z_ScanRequest *req = apdu->u.scanRequest; - char *db = database; - req->num_databaseNames = 1; - req->databaseNames = &db; + req->num_databaseNames = num_databaseNames; + req->databaseNames = databaseNames; req->termListAndStartPoint = p_query_scan(out, protocol, &req->attributeSet, string); req->numberOfTermsRequested = # @@ -1001,12 +1049,24 @@ int cmd_format(char *arg) recordsyntax = VAL_UKMARC; return 1; } + else if (!strcmp(arg, "unimarc")) + { + printf("Preferred format is UNIMARC\n"); + recordsyntax = VAL_UNIMARC; + return 1; + } else if (!strcmp(arg, "grs1")) { printf("Preferred format is GRS1\n"); recordsyntax = VAL_GRS1; return 1; } + else if (!strcmp(arg, "soif")) + { + printf("Preferred format is SOIF\n"); + recordsyntax = VAL_SOIF; + return 1; + } else if (!strcmp(arg, "summary")) { printf("Preferred format is Summary\n"); @@ -1021,7 +1081,7 @@ int cmd_format(char *arg) } else { - printf("Specify one of {sutrs,usmarc,danmarc,ukmarc,grs1,summary,explain}.\n"); + printf("Specify one of {sutrs,usmarc,danmarc,ukmarc,unimarc,grs1,summary,explain}.\n"); return 0; } } @@ -1286,15 +1346,36 @@ static int client(int wait) int main(int argc, char **argv) { + char *prog = *argv; + char *arg; + int ret; + int opened = 0; + initialize(); - if (argc > 1) - cmd_open(argv[1]); - else - printf(C_PROMPT); - if (*marcdump_file && !(marcdump = fopen(marcdump_file, "a"))) + cmd_base("Default"); + + while ((ret = options("m:", argv, argc, &arg)) != -2) { - perror(marcdump_file); - exit(1); + switch (ret) + { + case 0: + if (cmd_open (arg) == 2) + opened = 1; + break; + case 'm': + if (!(marcdump = fopen (arg, "a"))) + { + perror (arg); + exit (1); + } + break; + default: + fprintf (stderr, "Usage: %s [-m ] []\n", + prog); + exit (1); + } } - return client((argc > 1)); + if (!opened) + printf (C_PROMPT); + return client (opened); }