From: Adam Dickmeiss Date: Thu, 16 Nov 2000 13:11:07 +0000 (+0000) Subject: Changed because ccl_rpn_query sets attribute set. X-Git-Tag: YAZ.1.8~164 X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=37b3d8433b89248def810d7cfa9b110893519f65;p=yaz-moved-to-github.git Changed because ccl_rpn_query sets attribute set. --- diff --git a/client/client.c b/client/client.c index 6b82f5a..c23dcfe 100644 --- a/client/client.c +++ b/client/client.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: client.c,v $ - * Revision 1.106 2000-11-13 09:44:59 adam + * Revision 1.107 2000-11-16 13:11:07 adam + * Changed because ccl_rpn_query sets attribute set. + * + * Revision 1.106 2000/11/13 09:44:59 adam * Work on SCAN: RPN2CCL conversion and proper "next" scan. * * Revision 1.105 2000/10/02 11:07:44 adam @@ -456,7 +459,7 @@ static void print_refid (Z_ReferenceId *id) { if (id) { - printf ("ReferenceId: '%.*s'\n", id->len, id->buf); + printf ("ReferenceId: '%.*s'\n", id->len, id->buf); } } @@ -464,7 +467,7 @@ static Z_ReferenceId *set_refid (ODR out) { Z_ReferenceId *id; if (!refid) - return 0; + return 0; id = (Z_ReferenceId *) odr_malloc (out, sizeof(*id)); id->size = id->len = strlen(refid); id->buf = (unsigned char *) odr_malloc (out, id->len); @@ -531,7 +534,7 @@ static int process_initResponse(Z_InitResponse *res) printf("Guessing visiblestring:\n"); printf("'%s'\n", res->userInformationField->u. octet_aligned->buf); } - odr_reset (print); + odr_reset (print); } return 0; } @@ -577,21 +580,21 @@ int cmd_open(char *arg) { printf("Already connected.\n"); - cs_close (conn); - conn = NULL; - if (session_mem) - { - nmem_destroy (session_mem); - session_mem = NULL; - } + cs_close (conn); + conn = NULL; + if (session_mem) + { + nmem_destroy (session_mem); + session_mem = NULL; + } } base[0] = '\0'; if (sscanf (arg, "%100[^/]/%100s", type_and_host, base) < 1) - return 0; + return 0; if (strncmp (type_and_host, "tcp:", 4) == 0) - host = type_and_host + 4; + host = type_and_host + 4; else - host = type_and_host; + host = type_and_host; if (*base) cmd_base (base); t = tcpip_type; @@ -604,8 +607,8 @@ int cmd_open(char *arg) } if (!(add = cs_straddr(conn, host))) { - perror(arg); - return 0; + perror(arg); + return 0; } printf("Connecting..."); fflush(stdout); @@ -647,12 +650,12 @@ 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]->zclass, - *v->triples[i]->type); - if (v->triples[i]->which == Z_Triple_internationalString) - printf(",value=%s\n", v->triples[i]->value.internationalString); - else - printf("\n"); + 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); + else + printf("\n"); } } @@ -685,43 +688,43 @@ static void display_grs1(Z_GenericRecord *r, int level) else if (t->content->which == Z_ElementData_string) printf("%s\n", t->content->u.string); else if (t->content->which == Z_ElementData_numeric) - printf("%d\n", *t->content->u.numeric); - else if (t->content->which == Z_ElementData_oid) - { - int *ip = t->content->u.oid; - oident *oent; - - if ((oent = oid_getentbyoid(t->content->u.oid))) - printf("OID: %s\n", oent->desc); - else - { - printf("{"); - while (ip && *ip >= 0) - printf(" %d", *(ip++)); - printf(" }\n"); - } - } - else if (t->content->which == Z_ElementData_noDataRequested) - printf("[No data requested]\n"); - else if (t->content->which == Z_ElementData_elementEmpty) - printf("[Element empty]\n"); - else if (t->content->which == Z_ElementData_elementNotThere) - printf("[Element not there]\n"); - else + printf("%d\n", *t->content->u.numeric); + else if (t->content->which == Z_ElementData_oid) + { + int *ip = t->content->u.oid; + oident *oent; + + if ((oent = oid_getentbyoid(t->content->u.oid))) + printf("OID: %s\n", oent->desc); + else + { + printf("{"); + while (ip && *ip >= 0) + printf(" %d", *(ip++)); + printf(" }\n"); + } + } + else if (t->content->which == Z_ElementData_noDataRequested) + printf("[No data requested]\n"); + else if (t->content->which == Z_ElementData_elementEmpty) + printf("[Element empty]\n"); + else if (t->content->which == Z_ElementData_elementNotThere) + printf("[Element not there]\n"); + else printf("??????\n"); - if (t->appliedVariant) - display_variant(t->appliedVariant, level+1); - if (t->metaData && t->metaData->supportedVariants) - { - int c; + if (t->appliedVariant) + display_variant(t->appliedVariant, level+1); + if (t->metaData && t->metaData->supportedVariants) + { + int c; - printf("%*s---- variant list\n", (level+1)*4, ""); - for (c = 0; c < t->metaData->num_supportedVariants; c++) - { - printf("%*svariant #%d\n", (level+1)*4, "", c); - display_variant(t->metaData->supportedVariants[c], level + 2); - } - } + printf("%*s---- variant list\n", (level+1)*4, ""); + for (c = 0; c < t->metaData->num_supportedVariants; c++) + { + printf("%*svariant #%d\n", (level+1)*4, "", c); + display_variant(t->metaData->supportedVariants[c], level + 2); + } + } } } @@ -761,44 +764,44 @@ static void display_record(Z_DatabaseRecord *p) /* Check if this is a known, ASN.1 type tucked away in an octet string */ if (ent && r->which == Z_External_octet) { - Z_ext_typeent *type = z_ext_getentbyref(ent->value); - void *rr; - - if (type) - { - /* - * Call the given decoder to process the record. - */ - odr_setbuf(in, (char*)p->u.octet_aligned->buf, - p->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); - fprintf(stderr, "---------\n"); - exit(1); - } - /* - * Note: we throw away the original, BER-encoded record here. - * Do something else with it if you want to keep it. - */ - r->u.sutrs = (Z_SUTRS *) rr; /* we don't actually check the type here. */ - r->which = type->what; - } + Z_ext_typeent *type = z_ext_getentbyref(ent->value); + void *rr; + + if (type) + { + /* + * Call the given decoder to process the record. + */ + odr_setbuf(in, (char*)p->u.octet_aligned->buf, + p->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); + fprintf(stderr, "---------\n"); + exit(1); + } + /* + * Note: we throw away the original, BER-encoded record here. + * Do something else with it if you want to keep it. + */ + r->u.sutrs = (Z_SUTRS *) rr; /* we don't actually check the type here. */ + r->which = type->what; + } } 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) { const char *octet_buf = (char*)p->u.octet_aligned->buf; - if (ent->value == VAL_TEXT_XML || ent->value == VAL_APPLICATION_XML || + 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); - else + else { if (marc_display (octet_buf, NULL) <= 0) { @@ -849,33 +852,33 @@ static void display_diagrecs(Z_DiagRec **pp, int num) printf("Diagnostic message(s) from database:\n"); for (i = 0; iwhich != Z_DiagRec_defaultFormat) - { - printf("Diagnostic record not in default format.\n"); - return; - } - else - r = p->u.defaultFormat; - if (!(ent = oid_getentbyoid(r->diagnosticSetId)) || - ent->oclass != CLASS_DIAGSET || ent->value != VAL_BIB1) - printf("Missing or unknown diagset\n"); - printf(" [%d] %s", *r->condition, diagbib1_str(*r->condition)); + Z_DiagRec *p = pp[i]; + if (p->which != Z_DiagRec_defaultFormat) + { + printf("Diagnostic record not in default format.\n"); + return; + } + else + r = p->u.defaultFormat; + if (!(ent = oid_getentbyoid(r->diagnosticSetId)) || + 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; - } + 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"); + if (r->addinfo && *r->addinfo) + printf(" -- '%s'\n", r->addinfo); + else + printf("\n"); #endif } } @@ -898,17 +901,17 @@ 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); + 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); + 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); + display_diagrecs (p->u.multipleNonSurDiagnostics->diagRecs, + p->u.multipleNonSurDiagnostics->num_diagRecs); else { printf("Records: %d\n", p->u.databaseOrSurDiagnostics->num_records); @@ -928,25 +931,25 @@ static int send_deleteResultSetRequest(char *arg) req->referenceId = set_refid (out); req->num_resultSetList = - sscanf (arg, "%30s %30s %30s %30s %30s %30s %30s %30s", - names[0], names[1], names[2], names[3], - names[4], names[5], names[6], names[7]); + sscanf (arg, "%30s %30s %30s %30s %30s %30s %30s %30s", + names[0], names[1], names[2], names[3], + names[4], names[5], names[6], names[7]); req->deleteFunction = (int *) - odr_malloc (out, sizeof(*req->deleteFunction)); + odr_malloc (out, sizeof(*req->deleteFunction)); if (req->num_resultSetList > 0) { - *req->deleteFunction = Z_DeleteRequest_list; - req->resultSetList = (char **) - odr_malloc (out, sizeof(*req->resultSetList)* - req->num_resultSetList); - for (i = 0; inum_resultSetList; i++) - req->resultSetList[i] = names[i]; + *req->deleteFunction = Z_DeleteRequest_list; + req->resultSetList = (char **) + odr_malloc (out, sizeof(*req->resultSetList)* + req->num_resultSetList); + for (i = 0; inum_resultSetList; i++) + req->resultSetList[i] = names[i]; } else { - *req->deleteFunction = Z_DeleteRequest_all; - req->resultSetList = 0; + *req->deleteFunction = Z_DeleteRequest_all; + req->resultSetList = 0; } send_apdu(apdu); @@ -963,7 +966,6 @@ static int send_searchRequest(char *arg) #if CCL2RPN struct ccl_rpn_node *rpn = NULL; int error, pos; - oident bib1; #endif char setstring[100]; Z_RPNQuery *RPNquery; @@ -1041,15 +1043,11 @@ static int send_searchRequest(char *arg) case QueryType_CCL2RPN: query.which = Z_Query_type_1; RPNquery = ccl_rpn_query(out, rpn); - if (!RPNquery) - { - printf ("Couldn't convert from CCL to RPN\n"); - return 0; - } - bib1.proto = protocol; - bib1.oclass = CLASS_ATTSET; - bib1.value = VAL_BIB1; - RPNquery->attributeSetId = oid_ent_to_oid(&bib1, oid); + if (!RPNquery) + { + printf ("Couldn't convert from CCL to RPN\n"); + return 0; + } query.u.type_1 = RPNquery; ccl_rpn_delete (rpn); break; @@ -1248,15 +1246,15 @@ void process_ESResponse(Z_ExtendedServicesResponse *res) switch (*res->operationStatus) { case Z_ExtendedServicesResponse_done: - printf ("done\n"); - break; + printf ("done\n"); + break; case Z_ExtendedServicesResponse_accepted: - printf ("accepted\n"); - break; + printf ("accepted\n"); + break; case Z_ExtendedServicesResponse_failure: - printf ("failure\n"); - display_diagrecs(res->diagnostics, res->num_diagnostics); - break; + printf ("failure\n"); + display_diagrecs(res->diagnostics, res->num_diagnostics); + break; } } @@ -1283,43 +1281,43 @@ static Z_External *create_external_itemRequest() req = ill_get_ItemRequest(&ctl, "ill", 0); if (!req) printf ("ill_get_ItemRequest failed\n"); - + if (!ill_ItemRequest (out, &req, 0, 0)) { - if (apdu_file) - { - ill_ItemRequest(print, &req, 0, 0); - odr_reset(print); - } - item_request_buf = odr_getbuf (out, &item_request_size, 0); - if (item_request_buf) - odr_setbuf (out, item_request_buf, item_request_size, 1); + if (apdu_file) + { + ill_ItemRequest(print, &req, 0, 0); + odr_reset(print); + } + item_request_buf = odr_getbuf (out, &item_request_size, 0); + if (item_request_buf) + odr_setbuf (out, item_request_buf, item_request_size, 1); printf ("Couldn't encode ItemRequest, size %d\n", item_request_size); - return 0; + return 0; } else { - oident oid; - - item_request_buf = odr_getbuf (out, &item_request_size, 0); - oid.proto = PROTO_GENERAL; - oid.oclass = CLASS_GENERAL; - oid.value = VAL_ISO_ILL_1; - - r = (Z_External *) odr_malloc (out, sizeof(*r)); - r->direct_reference = odr_oiddup(out,oid_getoidbyent(&oid)); - r->indirect_reference = 0; - r->descriptor = 0; - r->which = Z_External_single; - - r->u.single_ASN1_type = (Odr_oct *) - odr_malloc (out, sizeof(*r->u.single_ASN1_type)); - r->u.single_ASN1_type->buf = 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, - item_request_size); - printf ("len = %d\n", item_request_size); + oident oid; + + item_request_buf = odr_getbuf (out, &item_request_size, 0); + oid.proto = PROTO_GENERAL; + oid.oclass = CLASS_GENERAL; + oid.value = VAL_ISO_ILL_1; + + r = (Z_External *) odr_malloc (out, sizeof(*r)); + r->direct_reference = odr_oiddup(out,oid_getoidbyent(&oid)); + r->indirect_reference = 0; + r->descriptor = 0; + r->which = Z_External_single; + + r->u.single_ASN1_type = (Odr_oct *) + odr_malloc (out, sizeof(*r->u.single_ASN1_type)); + r->u.single_ASN1_type->buf = 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, + item_request_size); + printf ("len = %d\n", item_request_size); } return r; } @@ -1338,7 +1336,7 @@ static Z_External *create_external_ILLRequest() Z_External *r = 0; int ill_request_size = 0; char *ill_request_buf = 0; - + ctl.odr = out; ctl.clientData = 0; ctl.f = get_ill_element; @@ -1347,41 +1345,41 @@ static Z_External *create_external_ILLRequest() if (!ill_Request (out, &req, 0, 0)) { - if (apdu_file) - { - printf ("-------------------\n"); - ill_Request(print, &req, 0, 0); - odr_reset(print); - printf ("-------------------\n"); - } - ill_request_buf = odr_getbuf (out, &ill_request_size, 0); - if (ill_request_buf) - odr_setbuf (out, ill_request_buf, ill_request_size, 1); + if (apdu_file) + { + printf ("-------------------\n"); + ill_Request(print, &req, 0, 0); + odr_reset(print); + printf ("-------------------\n"); + } + ill_request_buf = odr_getbuf (out, &ill_request_size, 0); + if (ill_request_buf) + odr_setbuf (out, ill_request_buf, ill_request_size, 1); printf ("Couldn't encode ILL-Request, size %d\n", ill_request_size); - return 0; + return 0; } else { - oident oid; - ill_request_buf = odr_getbuf (out, &ill_request_size, 0); - - oid.proto = PROTO_GENERAL; - oid.oclass = CLASS_GENERAL; - oid.value = VAL_ISO_ILL_1; - - r = (Z_External *) odr_malloc (out, sizeof(*r)); - r->direct_reference = odr_oiddup(out,oid_getoidbyent(&oid)); - r->indirect_reference = 0; - r->descriptor = 0; - r->which = Z_External_single; - - r->u.single_ASN1_type = (Odr_oct *) - odr_malloc (out, sizeof(*r->u.single_ASN1_type)); - r->u.single_ASN1_type->buf = 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); - printf ("len = %d\n", ill_request_size); + oident oid; + ill_request_buf = odr_getbuf (out, &ill_request_size, 0); + + oid.proto = PROTO_GENERAL; + oid.oclass = CLASS_GENERAL; + oid.value = VAL_ISO_ILL_1; + + r = (Z_External *) odr_malloc (out, sizeof(*r)); + r->direct_reference = odr_oiddup(out,oid_getoidbyent(&oid)); + r->indirect_reference = 0; + r->descriptor = 0; + r->which = Z_External_single; + + r->u.single_ASN1_type = (Odr_oct *) + odr_malloc (out, sizeof(*r->u.single_ASN1_type)); + r->u.single_ASN1_type->buf = 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); + printf ("len = %d\n", ill_request_size); } return r; } @@ -1417,14 +1415,14 @@ static Z_External *create_ItemOrderExternal(const char *type, int itemno) #endif r->u.itemOrder->u.esRequest = (Z_IORequest *) - odr_malloc(out,sizeof(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)); + 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)); + 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; @@ -1432,28 +1430,28 @@ static Z_External *create_ItemOrderExternal(const char *type, int itemno) r->u.itemOrder->u.esRequest->toKeep->addlBilling = NULL; r->u.itemOrder->u.esRequest->notToKeep->resultSetItem = - (Z_IOResultSetItem *) odr_malloc(out, sizeof(Z_IOResultSetItem)); + (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)); + (int *) odr_malloc(out, sizeof(int)); *r->u.itemOrder->u.esRequest->notToKeep->resultSetItem->item = itemno; if (!strcmp (type, "item") || !strcmp(type, "2")) { - printf ("using item-request\n"); - r->u.itemOrder->u.esRequest->notToKeep->itemRequest = - create_external_itemRequest(); + printf ("using item-request\n"); + r->u.itemOrder->u.esRequest->notToKeep->itemRequest = + create_external_itemRequest(); } else if (!strcmp(type, "ill") || !strcmp(type, "1")) { - printf ("using ILL-request\n"); - r->u.itemOrder->u.esRequest->notToKeep->itemRequest = - create_external_ILLRequest(); + printf ("using ILL-request\n"); + r->u.itemOrder->u.esRequest->notToKeep->itemRequest = + create_external_ILLRequest(); } else - r->u.itemOrder->u.esRequest->notToKeep->itemRequest = 0; + r->u.itemOrder->u.esRequest->notToKeep->itemRequest = 0; return r; } @@ -1488,7 +1486,7 @@ static int cmd_update(char *arg) fflush(stdout); if (!record_last) - return 0; + return 0; update_oid.proto = PROTO_Z3950; update_oid.oclass = CLASS_EXTSERV; update_oid.value = VAL_DBUPDATE; @@ -1497,7 +1495,7 @@ static int cmd_update(char *arg) req->packageName = "1.Extendedserveq"; r = req->taskSpecificParameters = (Z_External *) - odr_malloc (out, sizeof(*r)); + odr_malloc (out, sizeof(*r)); r->direct_reference = odr_oiddup(out,oid); r->indirect_reference = 0; r->descriptor = 0; @@ -1505,9 +1503,9 @@ static int cmd_update(char *arg) r->u.update = (Z_IUUpdate *) odr_malloc(out, sizeof(*r->u.update)); r->u.update->which = Z_IUUpdate_esRequest; r->u.update->u.esRequest = (Z_IUUpdateEsRequest *) - odr_malloc(out, sizeof(*r->u.update->u.esRequest)); + odr_malloc(out, sizeof(*r->u.update->u.esRequest)); toKeep = r->u.update->u.esRequest->toKeep = (Z_IUOriginPartToKeep *) - odr_malloc(out, sizeof(*r->u.update->u.esRequest->toKeep)); + odr_malloc(out, sizeof(*r->u.update->u.esRequest->toKeep)); toKeep->databaseName = databaseNames[0]; toKeep->schema = 0; toKeep->elementSetName = 0; @@ -1516,12 +1514,12 @@ static int cmd_update(char *arg) *toKeep->action = Z_IUOriginPartToKeep_recordInsert; notToKeep = r->u.update->u.esRequest->notToKeep = (Z_IUSuppliedRecords *) - odr_malloc(out, sizeof(*r->u.update->u.esRequest->notToKeep)); + odr_malloc(out, sizeof(*r->u.update->u.esRequest->notToKeep)); notToKeep->num = 1; notToKeep->elements = (Z_IUSuppliedRecords_elem **) - odr_malloc(out, sizeof(*notToKeep->elements)); + odr_malloc(out, sizeof(*notToKeep->elements)); notToKeep->elements[0] = (Z_IUSuppliedRecords_elem *) - odr_malloc(out, sizeof(**notToKeep->elements)); + odr_malloc(out, sizeof(**notToKeep->elements)); notToKeep->elements[0]->u.number = 0; notToKeep->elements[0]->supplementalId = 0; notToKeep->elements[0]->correlationInfo = 0; @@ -1539,7 +1537,7 @@ static int cmd_itemorder(char *arg) int itemno; if (sscanf (arg, "%10s %d", type, &itemno) != 2) - return 0; + return 0; printf("Item order request\n"); fflush(stdout); @@ -1654,8 +1652,8 @@ static int send_presentRequest(char *arg) #if 0 if (1) { - static Z_Range range; - static Z_Range *rangep = ⦥ + static Z_Range range; + static Z_Range *rangep = ⦥ req->num_ranges = 1; #endif req->resultSetStartPoint = &setno; @@ -1664,7 +1662,7 @@ static int send_presentRequest(char *arg) prefsyn.oclass = CLASS_RECSYN; prefsyn.value = recordsyntax; req->preferredRecordSyntax = - odr_oiddup (out, oid_ent_to_oid(&prefsyn, oid)); + odr_oiddup (out, oid_ent_to_oid(&prefsyn, oid)); if (schema != VAL_NONE) { @@ -1674,40 +1672,40 @@ static int send_presentRequest(char *arg) prefschema.oclass = CLASS_SCHEMA; prefschema.value = schema; - req->recordComposition = &compo; - compo.which = Z_RecordComp_complex; - compo.u.complex = (Z_CompSpec *) - odr_malloc(out, sizeof(*compo.u.complex)); - compo.u.complex->selectAlternativeSyntax = (bool_t *) - odr_malloc(out, sizeof(bool_t)); - *compo.u.complex->selectAlternativeSyntax = 0; - - compo.u.complex->generic = (Z_Specification *) - odr_malloc(out, sizeof(*compo.u.complex->generic)); - compo.u.complex->generic->schema = (Odr_oid *) - odr_oiddup(out, oid_ent_to_oid(&prefschema, oid)); - if (!compo.u.complex->generic->schema) - { - /* OID wasn't a schema! Try record syntax instead. */ - prefschema.oclass = CLASS_RECSYN; - compo.u.complex->generic->schema = (Odr_oid *) - odr_oiddup(out, oid_ent_to_oid(&prefschema, oid)); - } - if (!elementSetNames) - compo.u.complex->generic->elementSpec = 0; - else - { - compo.u.complex->generic->elementSpec = (Z_ElementSpec *) - odr_malloc(out, sizeof(Z_ElementSpec)); - compo.u.complex->generic->elementSpec->which = - Z_ElementSpec_elementSetName; - compo.u.complex->generic->elementSpec->u.elementSetName = - elementSetNames->u.generic; - } - compo.u.complex->num_dbSpecific = 0; - compo.u.complex->dbSpecific = 0; - compo.u.complex->num_recordSyntax = 0; - compo.u.complex->recordSyntax = 0; + req->recordComposition = &compo; + compo.which = Z_RecordComp_complex; + compo.u.complex = (Z_CompSpec *) + odr_malloc(out, sizeof(*compo.u.complex)); + compo.u.complex->selectAlternativeSyntax = (bool_t *) + odr_malloc(out, sizeof(bool_t)); + *compo.u.complex->selectAlternativeSyntax = 0; + + compo.u.complex->generic = (Z_Specification *) + odr_malloc(out, sizeof(*compo.u.complex->generic)); + compo.u.complex->generic->schema = (Odr_oid *) + odr_oiddup(out, oid_ent_to_oid(&prefschema, oid)); + if (!compo.u.complex->generic->schema) + { + /* OID wasn't a schema! Try record syntax instead. */ + prefschema.oclass = CLASS_RECSYN; + compo.u.complex->generic->schema = (Odr_oid *) + odr_oiddup(out, oid_ent_to_oid(&prefschema, oid)); + } + if (!elementSetNames) + compo.u.complex->generic->elementSpec = 0; + else + { + compo.u.complex->generic->elementSpec = (Z_ElementSpec *) + odr_malloc(out, sizeof(Z_ElementSpec)); + compo.u.complex->generic->elementSpec->which = + Z_ElementSpec_elementSetName; + compo.u.complex->generic->elementSpec->u.elementSetName = + elementSetNames->u.generic; + } + compo.u.complex->num_dbSpecific = 0; + compo.u.complex->dbSpecific = 0; + compo.u.complex->num_recordSyntax = 0; + compo.u.complex->recordSyntax = 0; } else if (elementSetNames) { @@ -1743,21 +1741,21 @@ void process_close(Z_Close *req) 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; + 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; } } @@ -1815,47 +1813,47 @@ int send_scanrequest(const char *query, int pp, int num, const char *term) #if CCL2RPN if (queryType == QueryType_CCL2RPN) { - oident bib1; - int error, pos; - struct ccl_rpn_node *rpn; + oident bib1; + int error, pos; + struct ccl_rpn_node *rpn; - rpn = ccl_find_str (bibset, query, &error, &pos); - if (error) - { + rpn = ccl_find_str (bibset, query, &error, &pos); + if (error) + { printf("CCL ERROR: %s\n", ccl_err_msg(error)); return 0; - } - use_rpn = 0; - bib1.proto = PROTO_Z3950; - bib1.oclass = CLASS_ATTSET; - bib1.value = VAL_BIB1; - req->attributeSet = oid_ent_to_oid (&bib1, oid); - if (!(req->termListAndStartPoint = ccl_scan_query (out, rpn))) - { - printf("Couldn't convert CCL to Scan term\n"); - return 0; - } - ccl_rpn_delete (rpn); + } + use_rpn = 0; + bib1.proto = PROTO_Z3950; + bib1.oclass = CLASS_ATTSET; + bib1.value = VAL_BIB1; + req->attributeSet = oid_ent_to_oid (&bib1, oid); + if (!(req->termListAndStartPoint = ccl_scan_query (out, rpn))) + { + printf("Couldn't convert CCL to Scan term\n"); + return 0; + } + ccl_rpn_delete (rpn); } #endif if (use_rpn && !(req->termListAndStartPoint = - p_query_scan(out, protocol, &req->attributeSet, query))) + p_query_scan(out, protocol, &req->attributeSet, query))) { - printf("Prefix query error\n"); - return -1; + printf("Prefix query error\n"); + return -1; } if (term && *term) { - if (req->termListAndStartPoint->term && - req->termListAndStartPoint->term->which == Z_Term_general && - req->termListAndStartPoint->term->u.general) - { - req->termListAndStartPoint->term->u.general->buf = - odr_strdup(out, term); - req->termListAndStartPoint->term->u.general->len = - req->termListAndStartPoint->term->u.general->size = - strlen(term); - } + if (req->termListAndStartPoint->term && + req->termListAndStartPoint->term->which == Z_Term_general && + req->termListAndStartPoint->term->u.general) + { + req->termListAndStartPoint->term->u.general->buf = + odr_strdup(out, term); + req->termListAndStartPoint->term->u.general->len = + req->termListAndStartPoint->term->u.general->size = + strlen(term); + } } req->referenceId = set_refid (out); req->num_databaseNames = num_databaseNames; @@ -1879,29 +1877,29 @@ int send_sortrequest(char *arg, int newset) oident bib1; if (setnumber >= 0) - sprintf (setstring, "%d", setnumber); + sprintf (setstring, "%d", setnumber); else - sprintf (setstring, "default"); + sprintf (setstring, "default"); req->referenceId = set_refid (out); #ifdef ASN_COMPILED req->num_inputResultSetNames = 1; req->inputResultSetNames = (Z_InternationalString **) - odr_malloc (out, sizeof(*req->inputResultSetNames)); + odr_malloc (out, sizeof(*req->inputResultSetNames)); req->inputResultSetNames[0] = odr_strdup (out, setstring); #else req->inputResultSetNames = - (Z_StringList *)odr_malloc (out, sizeof(*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)); + (char **)odr_malloc (out, sizeof(*req->inputResultSetNames->strings)); req->inputResultSetNames->strings[0] = - odr_strdup (out, setstring); + odr_strdup (out, setstring); #endif if (newset && setnumber >= 0) - sprintf (setstring, "%d", ++setnumber); + sprintf (setstring, "%d", ++setnumber); req->sortedResultSetName = odr_strdup (out, setstring); @@ -1915,84 +1913,84 @@ int send_sortrequest(char *arg, int newset) while ((sscanf (arg, "%31s %31s%n", sort_string, sort_flags, &off)) == 2 && off > 1) { - int i; - char *sort_string_sep; - Z_SortKeySpec *sks = (Z_SortKeySpec *)odr_malloc (out, sizeof(*sks)); - Z_SortKey *sk = (Z_SortKey *)odr_malloc (out, sizeof(*sk)); - - arg += off; - sksl->specs[sksl->num_specs++] = sks; - sks->sortElement = (Z_SortElement *)odr_malloc (out, sizeof(*sks->sortElement)); - sks->sortElement->which = Z_SortElement_generic; - sks->sortElement->u.generic = sk; - - if ((sort_string_sep = strchr (sort_string, '='))) - { - Z_AttributeElement *el = (Z_AttributeElement *)odr_malloc (out, sizeof(*el)); - sk->which = Z_SortKey_sortAttributes; - sk->u.sortAttributes = - (Z_SortAttributes *)odr_malloc (out, sizeof(*sk->u.sortAttributes)); - sk->u.sortAttributes->id = oid_ent_to_oid(&bib1, oid); - sk->u.sortAttributes->list = - (Z_AttributeList *)odr_malloc (out, sizeof(*sk->u.sortAttributes->list)); - sk->u.sortAttributes->list->num_attributes = 1; - sk->u.sortAttributes->list->attributes = - (Z_AttributeElement **)odr_malloc (out, - sizeof(*sk->u.sortAttributes->list->attributes)); - sk->u.sortAttributes->list->attributes[0] = el; - el->attributeSet = 0; - el->attributeType = (int *)odr_malloc (out, sizeof(*el->attributeType)); - *el->attributeType = atoi (sort_string); - el->which = Z_AttributeValue_numeric; - el->value.numeric = (int *)odr_malloc (out, sizeof(*el->value.numeric)); - *el->value.numeric = atoi (sort_string_sep + 1); - } - else - { - sk->which = Z_SortKey_sortField; - sk->u.sortField = odr_strdup (out, sort_string); - } - sks->sortRelation = (int *)odr_malloc (out, sizeof(*sks->sortRelation)); - *sks->sortRelation = Z_SortRelation_ascending; - sks->caseSensitivity = (int *)odr_malloc (out, sizeof(*sks->caseSensitivity)); - *sks->caseSensitivity = Z_SortCase_caseSensitive; + int i; + char *sort_string_sep; + Z_SortKeySpec *sks = (Z_SortKeySpec *)odr_malloc (out, sizeof(*sks)); + Z_SortKey *sk = (Z_SortKey *)odr_malloc (out, sizeof(*sk)); + + arg += off; + sksl->specs[sksl->num_specs++] = sks; + sks->sortElement = (Z_SortElement *)odr_malloc (out, sizeof(*sks->sortElement)); + sks->sortElement->which = Z_SortElement_generic; + sks->sortElement->u.generic = sk; + + if ((sort_string_sep = strchr (sort_string, '='))) + { + Z_AttributeElement *el = (Z_AttributeElement *)odr_malloc (out, sizeof(*el)); + sk->which = Z_SortKey_sortAttributes; + sk->u.sortAttributes = + (Z_SortAttributes *)odr_malloc (out, sizeof(*sk->u.sortAttributes)); + sk->u.sortAttributes->id = oid_ent_to_oid(&bib1, oid); + sk->u.sortAttributes->list = + (Z_AttributeList *)odr_malloc (out, sizeof(*sk->u.sortAttributes->list)); + sk->u.sortAttributes->list->num_attributes = 1; + sk->u.sortAttributes->list->attributes = + (Z_AttributeElement **)odr_malloc (out, + sizeof(*sk->u.sortAttributes->list->attributes)); + sk->u.sortAttributes->list->attributes[0] = el; + el->attributeSet = 0; + el->attributeType = (int *)odr_malloc (out, sizeof(*el->attributeType)); + *el->attributeType = atoi (sort_string); + el->which = Z_AttributeValue_numeric; + el->value.numeric = (int *)odr_malloc (out, sizeof(*el->value.numeric)); + *el->value.numeric = atoi (sort_string_sep + 1); + } + else + { + sk->which = Z_SortKey_sortField; + sk->u.sortField = odr_strdup (out, sort_string); + } + sks->sortRelation = (int *)odr_malloc (out, sizeof(*sks->sortRelation)); + *sks->sortRelation = Z_SortRelation_ascending; + 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 (); + sks->which = Z_SortKeySpec_null; + sks->u.null = odr_nullval (); #else - sks->missingValueAction = NULL; + sks->missingValueAction = NULL; #endif - for (i = 0; sort_flags[i]; i++) - { - switch (sort_flags[i]) - { - case 'a': - case 'A': - case '>': - *sks->sortRelation = Z_SortRelation_descending; - break; - case 'd': - case 'D': - case '<': - *sks->sortRelation = Z_SortRelation_ascending; - break; - case 'i': - case 'I': - *sks->caseSensitivity = Z_SortCase_caseInsensitive; - break; - case 'S': - case 's': - *sks->caseSensitivity = Z_SortCase_caseSensitive; - break; - } - } + for (i = 0; sort_flags[i]; i++) + { + switch (sort_flags[i]) + { + case 'a': + case 'A': + case '>': + *sks->sortRelation = Z_SortRelation_descending; + break; + case 'd': + case 'D': + case '<': + *sks->sortRelation = Z_SortRelation_ascending; + break; + case 'i': + case 'I': + *sks->caseSensitivity = Z_SortCase_caseInsensitive; + break; + case 'S': + case 's': + *sks->caseSensitivity = Z_SortCase_caseSensitive; + break; + } + } } if (!sksl->num_specs) { printf ("Missing sort specifications\n"); - return -1; + return -1; } send_apdu(apdu); return 2; @@ -2009,9 +2007,9 @@ void display_term(Z_TermInfo *t) else printf("Term (not general)"); if (t->globalOccurrences) - printf (" (%d)\n", *t->globalOccurrences); + printf (" (%d)\n", *t->globalOccurrences); else - printf ("\n"); + printf ("\n"); } void process_scanResponse(Z_ScanResponse *res) @@ -2024,28 +2022,28 @@ void process_scanResponse(Z_ScanResponse *res) print_refid (res->referenceId); printf("%d entries", *res->numberOfEntriesReturned); if (res->positionOfTerm) - printf (", position=%d", *res->positionOfTerm); + printf (", position=%d", *res->positionOfTerm); printf ("\n"); if (*res->scanStatus != Z_Scan_success) printf("Scan returned code %d\n", *res->scanStatus); if (!res->entries) return; if ((entries = res->entries->entries)) - num_entries = res->entries->num_entries; + num_entries = res->entries->num_entries; for (i = 0; i < num_entries; i++) { int pos_term = res->positionOfTerm ? *res->positionOfTerm : -1; - if (entries[i]->which == Z_Entry_termInfo) - { - printf("%c ", i + 1 == pos_term ? '*' : ' '); - display_term(entries[i]->u.termInfo); - } - else - display_diagrecs(&entries[i]->u.surrogateDiagnostic, 1); + if (entries[i]->which == Z_Entry_termInfo) + { + printf("%c ", i + 1 == pos_term ? '*' : ' '); + display_term(entries[i]->u.termInfo); + } + else + display_diagrecs(&entries[i]->u.surrogateDiagnostic, 1); } if (res->entries->nonsurrogateDiagnostics) - display_diagrecs (res->entries->nonsurrogateDiagnostics, - res->entries->num_nonsurrogateDiagnostics); + display_diagrecs (res->entries->nonsurrogateDiagnostics, + res->entries->num_nonsurrogateDiagnostics); } void process_sortResponse(Z_SortResponse *res) @@ -2054,39 +2052,39 @@ void process_sortResponse(Z_SortResponse *res) switch (*res->sortStatus) { case Z_SortStatus_success: - printf ("success"); break; + printf ("success"); break; case Z_SortStatus_partial_1: - printf ("partial"); break; + printf ("partial"); break; case Z_SortStatus_failure: - printf ("failure"); break; + printf ("failure"); break; default: - printf ("unknown (%d)", *res->sortStatus); + printf ("unknown (%d)", *res->sortStatus); } printf ("\n"); print_refid (res->referenceId); #ifdef ASN_COMPILED if (res->diagnostics) display_diagrecs(res->diagnostics, - res->num_diagnostics); + res->num_diagnostics); #else if (res->diagnostics) display_diagrecs(res->diagnostics->diagRecs, - res->diagnostics->num_diagRecs); + res->diagnostics->num_diagRecs); #endif } void process_deleteResultSetResponse (Z_DeleteResultSetResponse *res) { printf("Got deleteResultSetResponse status=%d\n", - *res->deleteOperationStatus); + *res->deleteOperationStatus); if (res->deleteListStatuses) { - int i; - for (i = 0; i < res->deleteListStatuses->num; i++) - { - printf ("%s status=%d\n", res->deleteListStatuses->elements[i]->id, - *res->deleteListStatuses->elements[i]->status); - } + int i; + for (i = 0; i < res->deleteListStatuses->num; i++) + { + printf ("%s status=%d\n", res->deleteListStatuses->elements[i]->id, + *res->deleteListStatuses->elements[i]->status); + } } } @@ -2106,7 +2104,7 @@ int cmd_sort_generic(char *arg, int newset) { if (send_sortrequest(arg, newset) < 0) return 0; - return 2; + return 2; } return 0; } @@ -2135,7 +2133,7 @@ int cmd_scan(char *arg) } if (*arg) { - strcpy (last_scan_query, arg); + strcpy (last_scan_query, arg); if (send_scanrequest(arg, 1, 20, 0) < 0) return 0; } @@ -2151,7 +2149,7 @@ int cmd_schema(char *arg) { if (!arg || !*arg) { - schema = VAL_NONE; + schema = VAL_NONE; return 1; } schema = oid_getvalbyname (arg); @@ -2186,7 +2184,7 @@ int cmd_elements(char *arg) if (!arg || !*arg) { - elementSetNames = 0; + elementSetNames = 0; return 1; } strcpy(what, arg); @@ -2202,14 +2200,14 @@ int cmd_attributeset(char *arg) if (!arg || !*arg) { - printf("Usage: attributeset \n"); - return 0; + printf("Usage: attributeset \n"); + return 0; } sscanf(arg, "%s", what); if (p_query_attset (what)) { - printf("Unknown attribute set name\n"); - return 0; + printf("Unknown attribute set name\n"); + return 0; } return 1; } @@ -2243,8 +2241,8 @@ int cmd_refid (char *arg) refid = NULL; if (*arg) { - refid = (char *) xmalloc (strlen(arg)+1); - strcpy (refid, arg); + refid = (char *) xmalloc (strlen(arg)+1); + strcpy (refid, arg); } return 1; } @@ -2254,7 +2252,7 @@ int cmd_close(char *arg) Z_APDU *apdu; Z_Close *req; if (!conn) - return 0; + return 0; apdu = zget_APDU(out, Z_APDU_close); req = apdu->u.close; @@ -2304,12 +2302,12 @@ static int client(int wait) {"open", cmd_open, "('tcp'|'osi')':'['/'][':']"}, {"quit", cmd_quit, ""}, {"find", cmd_find, ""}, - {"delete", cmd_delete, ""}, + {"delete", cmd_delete, ""}, {"base", cmd_base, ""}, {"show", cmd_show, "['+'<#recs>['+']]"}, {"scan", cmd_scan, ""}, - {"sort", cmd_sort, " ..."}, - {"sort+", cmd_sort_newset, " ..."}, + {"sort", cmd_sort, " ..."}, + {"sort+", cmd_sort_newset, " ..."}, {"authentication", cmd_authentication, ""}, {"lslb", cmd_lslb, ""}, {"ssub", cmd_ssub, ""}, @@ -2318,25 +2316,25 @@ static int client(int wait) {"setnames", cmd_setnames, ""}, {"cancel", cmd_cancel, ""}, {"format", cmd_format, ""}, - {"schema", cmd_schema, ""}, + {"schema", cmd_schema, ""}, {"elements", cmd_elements, ""}, {"close", cmd_close, ""}, - {"attributeset", cmd_attributeset, ""}, + {"attributeset", cmd_attributeset, ""}, {"querytype", cmd_querytype, ""}, - {"refid", cmd_refid, ""}, - {"itemorder", cmd_itemorder, "ill|item "}, - {"update", cmd_update, ""}, + {"refid", cmd_refid, ""}, + {"itemorder", cmd_itemorder, "ill|item "}, + {"update", cmd_update, ""}, #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, ""}, + /* 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, ""}, #endif {0,0} }; @@ -2356,7 +2354,7 @@ static int client(int wait) fd_set input; #endif char line[1024], word[1024], arg[1024]; - + #ifdef USE_SELECT FD_ZERO(&input); FD_SET(0, &input); @@ -2371,31 +2369,31 @@ static int client(int wait) continue; if (!wait && FD_ISSET(0, &input)) #else - if (!wait) + if (!wait) #endif - { + { #if HAVE_READLINE_READLINE_H - char* line_in; - line_in=readline(C_PROMPT); + char* line_in; + line_in=readline(C_PROMPT); if (!line_in) break; #if HAVE_READLINE_HISTORY_H if (*line_in) - add_history(line_in); + add_history(line_in); #endif - strcpy(line,line_in); + strcpy(line,line_in); free (line_in); #else - char *end_p; + char *end_p; printf (C_PROMPT); - fflush(stdout); - if (!fgets(line, 1023, stdin)) - break; - if ((end_p = strchr (line, '\n'))) - *end_p = '\0'; + fflush(stdout); + if (!fgets(line, 1023, stdin)) + break; + if ((end_p = strchr (line, '\n'))) + *end_p = '\0'; #endif #if HAVE_GETTIMEOFDAY - gettimeofday (&tv_start, 0); + gettimeofday (&tv_start, 0); #endif if ((res = sscanf(line, "%s %[^;]", word, arg)) <= 0) @@ -2421,16 +2419,16 @@ static int client(int wait) res = 1; } if (res < 2) - { - continue; - } + { + continue; + } } - wait = 0; - if (conn + wait = 0; + if (conn #ifdef USE_SELECT - && FD_ISSET(cs_fileno(conn), &input) + && FD_ISSET(cs_fileno(conn), &input) #endif - ) + ) { do { @@ -2445,17 +2443,17 @@ static int client(int wait) exit(1); } odr_reset(in); /* release APDU from last round */ - record_last = 0; + 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, "[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); + if (apdu_file) + z_APDU(print, &apdu, 0, 0); exit(1); } if (apdu_file && !z_APDU(print, &apdu, 0, 0)) @@ -2466,60 +2464,60 @@ static int client(int wait) } 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: + 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"); + 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; + *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); + 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 / + 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)); - } + ((double) tv_start.tv_usec / 1e6 + tv_start.tv_sec)); + } #endif } } @@ -2539,11 +2537,11 @@ int main(int argc, char **argv) { case 0: if (!opened) - { - initialize (); - if (cmd_open (arg) == 2) - opened = 1; - } + { + initialize (); + if (cmd_open (arg) == 2) + opened = 1; + } break; case 'm': if (!(marcdump = fopen (arg, "a"))) @@ -2558,9 +2556,9 @@ int main(int argc, char **argv) else apdu_file=fopen(arg, "a"); break; - case 'v': - yaz_log_init (yaz_log_mask_str(arg), "", NULL); - break; + case 'v': + yaz_log_init (yaz_log_mask_str(arg), "", NULL); + break; default: fprintf (stderr, "Usage: %s [-m ] [ -a ] " "[]\n", @@ -2569,8 +2567,6 @@ int main(int argc, char **argv) } } if (!opened) - initialize (); + initialize (); return client (opened); } - -