X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=client%2Fclient.c;h=fdf7830bc1925d695d0daf4095201582257b8f65;hp=f727e5c0e62333501d298d2d2dfb795d047750c2;hb=16d8b52d5affdc95443895a2ac4a92dfcd5703eb;hpb=413ba1f52face6dc6c160b24e64eb650591784ac diff --git a/client/client.c b/client/client.c index f727e5c..fdf7830 100644 --- a/client/client.c +++ b/client/client.c @@ -4,7 +4,32 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: client.c,v $ - * Revision 1.63 1998-03-05 08:05:10 adam + * Revision 1.70 1998-09-22 09:40:37 adam + * Minor changes in sort spec. + * + * Revision 1.69 1998/08/19 16:10:06 adam + * Changed som member names of DeleteResultSetRequest/Response. + * + * Revision 1.68 1998/07/20 12:37:06 adam + * Added 'delete ' command. Changed open command so that + * it reconnects if already connected. + * + * Revision 1.67 1998/06/09 13:55:06 adam + * Minor changes. + * + * Revision 1.66 1998/05/18 13:06:53 adam + * Changed the way attribute sets are handled by the retriaval module. + * Extended Explain conversion / schema. + * Modified server and client to work with ASN.1 compiled protocol handlers. + * + * Revision 1.65 1998/03/31 15:13:19 adam + * Development towards compiled ASN.1. + * + * Revision 1.64 1998/03/31 11:07:44 adam + * Furhter work on UNIverse resource report. + * Added Extended Services handling in frontend server. + * + * Revision 1.63 1998/03/05 08:05:10 adam * Added a few casts to make C++ happy. * * Revision 1.62 1998/02/11 11:53:33 adam @@ -245,10 +270,10 @@ static int largeSetLowerBound = 1; static int mediumSetPresentNumber = 0; static Z_ElementSetNames *elementSetNames = 0; static int setno = 1; /* current set offset */ -static int protocol = PROTO_Z3950; /* current app protocol */ -static int recordsyntax = VAL_USMARC; +static enum oid_proto protocol = PROTO_Z3950; /* current app protocol */ +static enum oid_value recordsyntax = VAL_USMARC; static int sent_close = 0; -static ODR_MEM session_mem; /* memory handle for init-response */ +static NMEM session_mem = NULL; /* memory handle for init-response */ static Z_InitResponse *session = 0; /* session parameters */ static char last_scan[512] = "0"; static char last_cmd[100] = "?"; @@ -319,6 +344,8 @@ static void send_initRequest() ODR_MASK_SET(req->options, Z_Options_triggerResourceCtrl); ODR_MASK_SET(req->options, Z_Options_scan); ODR_MASK_SET(req->options, Z_Options_sort); + ODR_MASK_SET(req->options, Z_Options_extendedServices); + ODR_MASK_SET(req->options, Z_Options_delSet); ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_1); ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_2); @@ -362,26 +389,67 @@ static int process_initResponse(Z_InitResponse *res) printf("Guessing visiblestring:\n"); printf("'%s'\n", res->userInformationField->u. octet_aligned->buf); } + odr_reset (print); } return 0; } +static int cmd_base(char *arg) +{ + int i; + char *cp; + + if (!*arg) + { + printf("Usage: base ...\n"); + return 0; + } + for (i = 0; iu.sutrs = (Odr_oct *)rr; /* we don't actually check the type here. */ + r->u.sutrs = (Z_SUTRS *) rr; /* we don't actually check the type here. */ r->which = type->what; } } @@ -638,10 +706,22 @@ 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: + printf (" -- v2 addinfo '%s'\n", r->u.v2Addinfo); + break; + case Z_DefaultDiagFormat_v3Addinfo: + printf (" -- v3 addinfo '%s'\n", r->u.v3Addinfo); + break; + } +#else if (r->addinfo && *r->addinfo) printf(" -- '%s'\n", r->addinfo); else printf("\n"); +#endif } } @@ -661,7 +741,16 @@ static void display_records(Z_Records *p) int i; 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, p->u.multipleNonSurDiagnostics->num_diagRecs); @@ -673,6 +762,26 @@ static void display_records(Z_Records *p) } } +static int send_deleteResultSetRequest(char *arg) +{ + Z_APDU *apdu = zget_APDU(out, Z_APDU_deleteResultSetRequest); + Z_DeleteResultSetRequest *req = apdu->u.deleteResultSetRequest; + + req->referenceId = set_refid (out); + + req->num_resultSetList = 1; + req->resultSetList = (char **) + odr_malloc (out, sizeof(*req->resultSetList)); + *req->resultSetList = arg; + req->deleteFunction = (int *) + odr_malloc (out, sizeof(*req->deleteFunction)); + *req->deleteFunction = Z_DeleteRequest_list; + + send_apdu(apdu); + printf("Sent deleteResultSetRequest.\n"); + return 2; +} + static int send_searchRequest(char *arg) { Z_APDU *apdu = zget_APDU(out, Z_APDU_searchRequest); @@ -680,7 +789,7 @@ static int send_searchRequest(char *arg) Z_Query query; int oid[OID_SIZE]; #if CCL2RPN - struct ccl_rpn_node *rpn; + struct ccl_rpn_node *rpn = NULL; int error, pos; oident bib1; #endif @@ -759,7 +868,8 @@ static int send_searchRequest(char *arg) #if CCL2RPN case QueryType_CCL2RPN: query.which = Z_Query_type_1; - assert((RPNquery = ccl_rpn_query(out, rpn))); + RPNquery = ccl_rpn_query(out, rpn); + assert(RPNquery); bib1.proto = protocol; bib1.oclass = CLASS_ATTSET; bib1.value = VAL_BIB1; @@ -796,13 +906,269 @@ static int process_searchResponse(Z_SearchResponse *res) return 0; } +static void print_level(int iLevel) +{ + int i; + for (i = 0; i < iLevel * 4; i++) + printf(" "); +} + +static void print_int(int iLevel, const char *pTag, int *pInt) +{ + if (pInt != NULL) + { + print_level(iLevel); + printf("%s: %d\n", pTag, *pInt); + } +} + +static void print_string(int iLevel, const char *pTag, const char *pString) +{ + if (pString != NULL) + { + print_level(iLevel); + printf("%s: %s\n", pTag, pString); + } +} + +static void print_oid(int iLevel, const char *pTag, Odr_oid *pOid) +{ + if (pOid != NULL) + { + int *pInt = pOid; + + print_level(iLevel); + printf("%s:", pTag); + for (; *pInt != -1; pInt++) + printf(" %d", *pInt); + printf("\n"); + } +} + +static void print_referenceId(int iLevel, Z_ReferenceId *referenceId) +{ + if (referenceId != NULL) + { + int i; + + print_level(iLevel); + printf("Ref Id (%d, %d): ", referenceId->len, referenceId->size); + for (i = 0; i < referenceId->len; i++) + printf("%c", referenceId->buf[i]); + printf("\n"); + } +} + +static void print_string_or_numeric(int iLevel, const char *pTag, Z_StringOrNumeric *pStringNumeric) +{ + if (pStringNumeric != NULL) + { + 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; + } + } +} + +static void print_universe_report_duplicate(int iLevel, Z_UniverseReportDuplicate *pUniverseReportDuplicate) +{ + if (pUniverseReportDuplicate != NULL) + { + print_level(iLevel); + printf("Universe Report Duplicate: \n"); + iLevel++; + print_string_or_numeric(iLevel, "Hit No", pUniverseReportDuplicate->hitno); + } +} + +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, "Hits", pUniverseReportHits->hits); + } +} + +static void print_universe_report(int iLevel, Z_UniverseReport *pUniverseReport) +{ + if (pUniverseReport != NULL) + { + print_level(iLevel); + printf("Universe Report: \n"); + iLevel++; + 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; + } + } +} + +static void print_external(int iLevel, Z_External *pExternal) +{ + if (pExternal != NULL) + { + print_level(iLevel); + printf("External: \n"); + iLevel++; + print_oid(iLevel, "Direct Reference", pExternal->direct_reference); + print_int(iLevel, "InDirect Reference", pExternal->indirect_reference); + 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; + } + } +} + static int process_resourceControlRequest (Z_ResourceControlRequest *req) { printf ("Received ResourceControlRequest.\n"); - print_refid (req->referenceId); + print_referenceId(1, req->referenceId); + print_int(1, "Suspended Flag", req->suspendedFlag); + print_int(1, "Partial Results Available", req->partialResultsAvailable); + print_int(1, "Response Required", req->responseRequired); + print_int(1, "Triggered Request Flag", req->triggeredRequestFlag); + print_external(1, req->resourceReport); + return 0; +} + +void process_ESResponse(Z_ExtendedServicesResponse *res) +{ + printf("process_ESResponse\n"); +} + +static Z_External *CreateItemOrderExternal(int itemno) +{ + Z_External *r = (Z_External *) odr_malloc(out, sizeof(Z_External)); + oident ItemOrderRequest; + + ItemOrderRequest.proto = PROTO_Z3950; + ItemOrderRequest.oclass = CLASS_EXTSERV; + ItemOrderRequest.value = VAL_ITEMORDER; + + r->direct_reference = odr_oiddup(out,oid_getoidbyent(&ItemOrderRequest)); + r->indirect_reference = (int *) odr_malloc(out,sizeof(int)); + *r->indirect_reference = 0; + + r->descriptor = "Extended services item order"; + + r->which = Z_External_itemOrder; + + 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)); + memset(r->u.itemOrder->u.esRequest, 0, sizeof(Z_IORequest)); + + r->u.itemOrder->u.esRequest->toKeep = (Z_IOOriginPartToKeep *) + odr_malloc(out,sizeof(Z_IOOriginPartToKeep)); + memset(r->u.itemOrder->u.esRequest->toKeep, 0, sizeof(Z_IOOriginPartToKeep)); + r->u.itemOrder->u.esRequest->notToKeep = (Z_IOOriginPartNotToKeep *) + odr_malloc(out,sizeof(Z_IOOriginPartNotToKeep)); + memset(r->u.itemOrder->u.esRequest->notToKeep, 0, sizeof(Z_IOOriginPartNotToKeep)); + + r->u.itemOrder->u.esRequest->toKeep->supplDescription = NULL; + r->u.itemOrder->u.esRequest->toKeep->contact = NULL; + r->u.itemOrder->u.esRequest->toKeep->addlBilling = NULL; + + r->u.itemOrder->u.esRequest->notToKeep->resultSetItem = + (Z_IOResultSetItem *) odr_malloc(out, sizeof(Z_IOResultSetItem)); + memset(r->u.itemOrder->u.esRequest->notToKeep->resultSetItem, 0, sizeof(Z_IOResultSetItem)); + r->u.itemOrder->u.esRequest->notToKeep->resultSetItem->resultSetId = "1"; + + r->u.itemOrder->u.esRequest->notToKeep->resultSetItem->item = + (int *) odr_malloc(out, sizeof(int)); + *r->u.itemOrder->u.esRequest->notToKeep->resultSetItem->item = itemno; + + r->u.itemOrder->u.esRequest->notToKeep->itemRequest = NULL; + return r; +} + +/* II : Added to do DALI Item Order Extended services request */ +static int send_itemorder(char *arg) +{ + int itemno = -1; + Z_APDU *apdu = zget_APDU(out, Z_APDU_extendedServicesRequest ); + Z_ExtendedServicesRequest *req = apdu->u.extendedServicesRequest; + oident ItemOrderRequest; + + if (*arg) + itemno = atoi(arg); + + /* Set up item order request */ + + /* Function being performed by this extended services request */ + req->function = (int *) odr_malloc(out, sizeof(int)); + *req->function = Z_ExtendedServicesRequest_create; + + /* Package type, Using protocol ILL ( But that's not in the oid.h file yet */ + /* create an object of class Extended Service, value Item Order */ + ItemOrderRequest.proto = PROTO_Z3950; + ItemOrderRequest.oclass = CLASS_EXTSERV; + ItemOrderRequest.value = VAL_ITEMORDER; + req->packageType = odr_oiddup(out,oid_getoidbyent(&ItemOrderRequest)); + req->packageName = "1.Extendedserveq"; + + /* ** taskSpecificParameters ** */ + req->taskSpecificParameters = CreateItemOrderExternal(itemno); + + /* waitAction - Create the ILL request and that's it */ + *req->waitAction = Z_ExtendedServicesRequest_wait; + + send_apdu(apdu); return 0; } +/* II : Added to do DALI Item Order Extended services request */ +static int cmd_itemorder(char *arg) +{ + printf("Item order request\n"); + fflush(stdout); + + send_itemorder(arg); + return(1); +} + static int cmd_find(char *arg) { if (!*arg) @@ -820,6 +1186,23 @@ static int cmd_find(char *arg) return 2; } +static int cmd_delete(char *arg) +{ + if (!*arg) + { + printf("Delete what?\n"); + return 0; + } + if (!conn) + { + printf("Not connected yet\n"); + return 0; + } + if (!send_deleteResultSetRequest(arg)) + return 0; + return 2; +} + static int cmd_ssub(char *arg) { if (!(smallSetUpperBound = atoi(arg))) @@ -849,35 +1232,6 @@ static int cmd_status(char *arg) return 1; } -static int cmd_base(char *arg) -{ - int i; - char *cp; - - if (!*arg) - { - printf("Usage: base ...\n"); - return 0; - } - for (i = 0; idiagnosticInformation ? req->diagnosticInformation : "NULL"); if (sent_close) { - printf("Goodbye.\n"); - exit(0); + cs_close (conn); + conn = NULL; + if (session_mem) + { + nmem_destroy (session_mem); + session_mem = NULL; + } + sent_close = 0; + } + else + { + *res->closeReason = Z_Close_finished; + send_apdu(apdu); + printf("Sent response.\n"); + sent_close = 1; } - *res->closeReason = Z_Close_finished; - send_apdu(apdu); - printf("Sent response.\n"); - sent_close = 1; } static int cmd_show(char *arg) { + if (!conn) + { + printf("Not connected yet\n"); + return 0; + } if (!send_presentRequest(arg)) return 0; return 2; @@ -1002,7 +1370,7 @@ int cmd_cancel(char *arg) apdu->u.triggerResourceControlRequest; bool_t rfalse = 0; - if (!session) + if (!conn) { printf("Session not initialized yet\n"); return 0; @@ -1024,12 +1392,16 @@ int send_scanrequest(char *string, int pp, int num) { Z_APDU *apdu = zget_APDU(out, Z_APDU_scanRequest); Z_ScanRequest *req = apdu->u.scanRequest; - + + if (!(req->termListAndStartPoint = + p_query_scan(out, protocol, &req->attributeSet, string))) + { + printf("Prefix query error\n"); + return -1; + } req->referenceId = set_refid (out); req->num_databaseNames = num_databaseNames; req->databaseNames = databaseNames; - req->termListAndStartPoint = p_query_scan(out, protocol, - &req->attributeSet, string); req->numberOfTermsRequested = # req->preferredPositionInResponse = &pp; send_apdu(apdu); @@ -1054,6 +1426,14 @@ 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] = (char *) + odr_malloc (out, strlen(setstring)+1); + strcpy (req->inputResultSetNames[0], setstring); +#else req->inputResultSetNames = (Z_StringList *)odr_malloc (out, sizeof(*req->inputResultSetNames)); req->inputResultSetNames->num_strings = 1; @@ -1062,6 +1442,7 @@ int send_sortrequest(char *arg, int newset) req->inputResultSetNames->strings[0] = (char *)odr_malloc (out, strlen(setstring)+1); strcpy (req->inputResultSetNames->strings[0], setstring); +#endif if (newset && setnumber >= 0) sprintf (setstring, "%d", ++setnumber); @@ -1122,7 +1503,12 @@ int send_sortrequest(char *arg, int newset) sks->caseSensitivity = (int *)odr_malloc (out, sizeof(*sks->caseSensitivity)); *sks->caseSensitivity = Z_SortCase_caseSensitive; +#ifdef ASN_COMPILED + sks->which = Z_SortKeySpec_null; + sks->u.null = odr_nullval (); +#else sks->missingValueAction = NULL; +#endif for (i = 0; sort_flags[i]; i++) { @@ -1131,12 +1517,12 @@ int send_sortrequest(char *arg, int newset) case 'a': case 'A': case '>': - *sks->sortRelation = Z_SortRelation_ascending; + *sks->sortRelation = Z_SortRelation_descending; break; case 'd': case 'D': case '<': - *sks->sortRelation = Z_SortRelation_descending; + *sks->sortRelation = Z_SortRelation_ascending; break; case 'i': case 'I': @@ -1174,6 +1560,8 @@ void display_term(Z_TermInfo *t) void process_scanResponse(Z_ScanResponse *res) { int i; + Z_Entry **entries = NULL; + int num_entries = 0; printf("Received ScanResponse\n"); print_refid (res->referenceId); @@ -1185,22 +1573,33 @@ void process_scanResponse(Z_ScanResponse *res) printf("Scan returned code %d\n", *res->scanStatus); if (!res->entries) return; +#ifdef ASN_COMPILED + if ((entries = res->entries->entries)) + num_entries = res->entries->num_entries; +#else if (res->entries->which == Z_ListEntries_entries) { - Z_Entries *ent = res->entries->u.entries; - - for (i = 0; i < ent->num_entries; i++) - if (ent->entries[i]->which == Z_Entry_termInfo) - { - printf("%c ", i + 1 == *res->positionOfTerm ? '*' : ' '); - display_term(ent->entries[i]->u.termInfo); - } - else - display_diagrecs(&ent->entries[i]->u.surrogateDiagnostic, 1); + entries = res->entries->u.entries->entries; + num_entries = res->entries->u.entries->num_entries; } - else +#endif + for (i = 0; i < num_entries; i++) + if (entries[i]->which == Z_Entry_termInfo) + { + printf("%c ", i + 1 == *res->positionOfTerm ? '*' : ' '); + display_term(entries[i]->u.termInfo); + } + else + display_diagrecs(&entries[i]->u.surrogateDiagnostic, 1); +#ifdef ASN_COMPILED + if (res->entries->nonsurrogateDiagnostics) + display_diagrecs (res->entries->nonsurrogateDiagnostics, + res->entries->num_nonsurrogateDiagnostics); +#else + if (res->entries->which == Z_ListEntries_nonSurrogateDiagnostics) display_diagrecs(&res->entries-> u.nonSurrogateDiagnostics->diagRecs[0], 1); +#endif } void process_sortResponse(Z_SortResponse *res) @@ -1219,14 +1618,20 @@ 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 } int cmd_sort_generic(char *arg, int newset) { - if (!session) + if (!conn) { printf("Session not initialized yet\n"); return 0; @@ -1257,7 +1662,7 @@ int cmd_sort_newset (char *arg) int cmd_scan(char *arg) { - if (!session) + if (!conn) { printf("Session not initialized yet\n"); return 0; @@ -1366,9 +1771,13 @@ int cmd_refid (char *arg) int cmd_close(char *arg) { - Z_APDU *apdu = zget_APDU(out, Z_APDU_close); - Z_Close *req = apdu->u.close; + Z_APDU *apdu; + Z_Close *req; + if (!conn) + return 0; + apdu = zget_APDU(out, Z_APDU_close); + req = apdu->u.close; *req->closeReason = Z_Close_finished; send_apdu(apdu); printf("Sent close request.\n"); @@ -1400,6 +1809,7 @@ static void initialize(void) fclose (inf); } #endif + cmd_base("Default"); } static int client(int wait) @@ -1412,6 +1822,7 @@ static int client(int wait) {"open", cmd_open, "('tcp'|'osi')':'['/'][':']"}, {"quit", cmd_quit, ""}, {"find", cmd_find, ""}, + {"delete", cmd_delete, ""}, {"base", cmd_base, ""}, {"show", cmd_show, "['+'<#recs>['+']]"}, {"scan", cmd_scan, ""}, @@ -1430,6 +1841,7 @@ static int client(int wait) {"attributeset", cmd_attributeset, ""}, {"querytype", cmd_querytype, ""}, {"refid", cmd_refid, ""}, + {"itemorder", cmd_itemorder, ""}, {0,0} }; char *netbuffer= 0; @@ -1551,10 +1963,16 @@ static int client(int wait) 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); @@ -1563,13 +1981,18 @@ static int client(int wait) process_resourceControlRequest (apdu->u.resourceControlRequest); break; + case Z_APDU_deleteResultSetResponse: + printf("Got deleteResultSetResponse status=%d\n", + *apdu->u.deleteResultSetResponse-> + deleteOperationStatus); + break; default: printf("Received unknown APDU type (%d).\n", apdu->which); exit(1); } } - while (cs_more(conn)); + while (conn && cs_more(conn)); printf(C_PROMPT); fflush(stdout); } @@ -1584,16 +2007,17 @@ int main(int argc, char **argv) int ret; int opened = 0; - initialize(); - cmd_base("Default"); - - while ((ret = options("m:", argv, argc, &arg)) != -2) + while ((ret = options("m:v:", argv, argc, &arg)) != -2) { switch (ret) { case 0: - if (cmd_open (arg) == 2) - opened = 1; + if (!opened) + { + initialize (); + if (cmd_open (arg) == 2) + opened = 1; + } break; case 'm': if (!(marcdump = fopen (arg, "a"))) @@ -1602,6 +2026,9 @@ int main(int argc, char **argv) exit (1); } break; + case 'v': + log_init (log_mask_str(arg), "", NULL); + break; default: fprintf (stderr, "Usage: %s [-m ] []\n", prog); @@ -1609,6 +2036,11 @@ int main(int argc, char **argv) } } if (!opened) + { + initialize (); printf (C_PROMPT); + } return client (opened); } + +