X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=client%2Fclient.c;h=25c719ce6455e66c10941ef6b23e8c71682ab473;hp=830ac8f08bb784ca557ba340fbe4d6656c9a153c;hb=b436ce38e1e619d2225c7c75c1f0de841aa13bad;hpb=deb4dce69ad5af12594d5712c8b50d8b84f8d9a0 diff --git a/client/client.c b/client/client.c index 830ac8f..25c719c 100644 --- a/client/client.c +++ b/client/client.c @@ -4,7 +4,21 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: client.c,v $ - * Revision 1.60 1998-01-29 14:08:52 adam + * 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 + * Changed code so that it compiles as C++. + * + * Revision 1.61 1998/02/10 11:03:06 adam + * Implemented command refid. Client prints reference-ID's, when present, + * in responses. + * + * Revision 1.60 1998/01/29 14:08:52 adam * Better sort diagnostics. * * Revision 1.59 1998/01/29 13:17:56 adam @@ -243,6 +257,7 @@ static Z_InitResponse *session = 0; /* session parameters */ static char last_scan[512] = "0"; static char last_cmd[100] = "?"; static FILE *marcdump = 0; +static char *refid = NULL; typedef enum { QueryType_Prefix, @@ -267,14 +282,34 @@ static void send_apdu(Z_APDU *a) exit(1); } buf = odr_getbuf(out, &len, 0); - odr_reset(out); /* release the APDU structure */ if (cs_put(conn, buf, len) < 0) { fprintf(stderr, "cs_put: %s", cs_errmsg(cs_errno(conn))); exit(1); } + odr_reset(out); /* release the APDU structure */ } +static void print_refid (Z_ReferenceId *id) +{ + if (id) + { + printf ("ReferenceId: '%.*s'\n", id->len, id->buf); + } +} + +static Z_ReferenceId *set_refid (ODR out) +{ + Z_ReferenceId *id; + if (!refid) + 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); + memcpy (id->buf, refid, id->len); + return id; +} + /* INIT SERVICE ------------------------------- */ static void send_initRequest() @@ -288,6 +323,7 @@ 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->protocolVersion, Z_ProtocolVersion_1); ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_2); @@ -529,7 +565,7 @@ static void display_record(Z_DatabaseRecord *p) */ odr_setbuf(in, (char*)p->u.octet_aligned->buf, p->u.octet_aligned->len, 0); - if (!(*type->fun)(in, &rr, 0)) + if (!(*type->fun)(in, (char **)&rr, 0)) { odr_perror(in, "Decoding constructed record."); fprintf(stderr, "[Near %d]\n", odr_offset(in)); @@ -543,7 +579,7 @@ static void display_record(Z_DatabaseRecord *p) * Note: we throw away the original, BER-encoded record here. * Do something else with it if you want to keep it. */ - r->u.sutrs = rr; /* we don't actually check the type here. */ + r->u.sutrs = (Odr_oct *)rr; /* we don't actually check the type here. */ r->which = type->what; } } @@ -668,7 +704,7 @@ static int send_searchRequest(char *arg) } } #endif - + req->referenceId = set_refid (out); if (!strcmp(arg, "@big")) /* strictly for troublemaking */ { static unsigned char big[2100]; @@ -680,7 +716,7 @@ static int send_searchRequest(char *arg) bigo.buf = big; req->referenceId = &bigo; } - + if (setnumber >= 0) { sprintf(setstring, "%d", ++setnumber); @@ -749,6 +785,8 @@ static int send_searchRequest(char *arg) static int process_searchResponse(Z_SearchResponse *res) { + printf ("Received SearchResponse.\n"); + print_refid (res->referenceId); if (*res->searchStatus) printf("Search was a success.\n"); else @@ -763,6 +801,260 @@ 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_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 = 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 = odr_malloc(out,sizeof(int)); + *r->indirect_reference = 0; + + r->descriptor = "Extended services item order"; + + r->which = Z_External_itemOrder; + + r->u.itemOrder = odr_malloc(out,sizeof(Z_ItemOrder)); + memset(r->u.itemOrder, 0, sizeof(Z_ItemOrder)); + r->u.itemOrder->which=Z_ItemOrder_esRequest; + + r->u.itemOrder->u.esRequest = odr_malloc(out,sizeof(Z_IORequest)); + memset(r->u.itemOrder->u.esRequest, 0, sizeof(Z_IORequest)); + + r->u.itemOrder->u.esRequest->toKeep = odr_malloc(out,sizeof(Z_IOOriginPartToKeep)); + memset(r->u.itemOrder->u.esRequest->toKeep, 0, sizeof(Z_IOOriginPartToKeep)); + r->u.itemOrder->u.esRequest->notToKeep = 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 = 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 = 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 = 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) @@ -828,7 +1120,7 @@ static int cmd_base(char *arg) cp = arg + strlen(arg); if (cp - arg < 1) break; - databaseNames[num_databaseNames] = xmalloc (1 + cp - arg); + databaseNames[num_databaseNames] = (char *)xmalloc (1 + cp - arg); memcpy (databaseNames[num_databaseNames], arg, cp - arg); databaseNames[num_databaseNames++][cp - arg] = '\0'; if (!*cp) @@ -866,6 +1158,7 @@ static int send_presentRequest(char *arg) char *p; char setstring[100]; + req->referenceId = set_refid (out); if ((p = strchr(arg, '+'))) { nos = atoi(p + 1); @@ -984,6 +1277,7 @@ int send_scanrequest(char *string, int pp, int num) Z_APDU *apdu = zget_APDU(out, Z_APDU_scanRequest); Z_ScanRequest *req = apdu->u.scanRequest; + req->referenceId = set_refid (out); req->num_databaseNames = num_databaseNames; req->databaseNames = databaseNames; req->termListAndStartPoint = p_query_scan(out, protocol, @@ -998,7 +1292,7 @@ int send_sortrequest(char *arg, int newset) { Z_APDU *apdu = zget_APDU(out, Z_APDU_sortRequest); Z_SortRequest *req = apdu->u.sortRequest; - Z_SortKeySpecList *sksl = odr_malloc (out, sizeof(*sksl)); + Z_SortKeySpecList *sksl = (Z_SortKeySpecList *)odr_malloc (out, sizeof(*sksl)); char setstring[32]; char sort_string[32], sort_flags[32]; int off; @@ -1010,24 +1304,26 @@ int send_sortrequest(char *arg, int newset) else sprintf (setstring, "default"); + req->referenceId = set_refid (out); + req->inputResultSetNames = - odr_malloc (out, sizeof(*req->inputResultSetNames)); + (Z_StringList *)odr_malloc (out, sizeof(*req->inputResultSetNames)); req->inputResultSetNames->num_strings = 1; req->inputResultSetNames->strings = - odr_malloc (out, sizeof(*req->inputResultSetNames->strings)); + (char **)odr_malloc (out, sizeof(*req->inputResultSetNames->strings)); req->inputResultSetNames->strings[0] = - odr_malloc (out, strlen(setstring)+1); + (char *)odr_malloc (out, strlen(setstring)+1); strcpy (req->inputResultSetNames->strings[0], setstring); if (newset && setnumber >= 0) sprintf (setstring, "%d", ++setnumber); - req->sortedResultSetName = odr_malloc (out, strlen(setstring)+1); + req->sortedResultSetName = (char *)odr_malloc (out, strlen(setstring)+1); strcpy (req->sortedResultSetName, setstring); req->sortSequence = sksl; sksl->num_specs = 0; - sksl->specs = odr_malloc (out, sizeof(sksl->specs) * 20); + sksl->specs = (Z_SortKeySpec **)odr_malloc (out, sizeof(sksl->specs) * 20); bib1.proto = protocol; bib1.oclass = CLASS_ATTSET; @@ -1037,45 +1333,45 @@ int send_sortrequest(char *arg, int newset) { int i; char *sort_string_sep; - Z_SortKeySpec *sks = odr_malloc (out, sizeof(*sks)); - Z_SortKey *sk = odr_malloc (out, sizeof(*sk)); + 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 = odr_malloc (out, sizeof(*sks->sortElement)); + 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 = odr_malloc (out, sizeof(*el)); + Z_AttributeElement *el = (Z_AttributeElement *)odr_malloc (out, sizeof(*el)); sk->which = Z_SortKey_sortAttributes; sk->u.sortAttributes = - odr_malloc (out, sizeof(*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 = - odr_malloc (out, sizeof(*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 = - odr_malloc (out, + (Z_AttributeElement **)odr_malloc (out, sizeof(*sk->u.sortAttributes->list->attributes)); sk->u.sortAttributes->list->attributes[0] = el; el->attributeSet = 0; - el->attributeType = odr_malloc (out, sizeof(*el->attributeType)); + el->attributeType = (int *)odr_malloc (out, sizeof(*el->attributeType)); *el->attributeType = atoi (sort_string); el->which = Z_AttributeValue_numeric; - el->value.numeric = odr_malloc (out, sizeof(*el->value.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_malloc (out, strlen(sort_string)+1); + sk->u.sortField = (char *)odr_malloc (out, strlen(sort_string)+1); strcpy (sk->u.sortField, sort_string); } - sks->sortRelation = odr_malloc (out, sizeof(*sks->sortRelation)); + sks->sortRelation = (int *)odr_malloc (out, sizeof(*sks->sortRelation)); *sks->sortRelation = Z_SortRelation_ascending; - sks->caseSensitivity = odr_malloc (out, sizeof(*sks->caseSensitivity)); + sks->caseSensitivity = (int *)odr_malloc (out, sizeof(*sks->caseSensitivity)); *sks->caseSensitivity = Z_SortCase_caseSensitive; sks->missingValueAction = NULL; @@ -1130,9 +1426,13 @@ void display_term(Z_TermInfo *t) void process_scanResponse(Z_ScanResponse *res) { int i; - - printf("SCAN: %d entries, position=%d\n", *res->numberOfEntriesReturned, - *res->positionOfTerm); + + printf("Received ScanResponse\n"); + print_refid (res->referenceId); + printf("%d entries", *res->numberOfEntriesReturned); + if (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) @@ -1157,7 +1457,7 @@ void process_scanResponse(Z_ScanResponse *res) void process_sortResponse(Z_SortResponse *res) { - printf("Sort: status="); + printf("Received SortResponse: status="); switch (*res->sortStatus) { case Z_SortStatus_success: @@ -1170,6 +1470,7 @@ void process_sortResponse(Z_SortResponse *res) printf ("unknown (%d)", *res->sortStatus); } printf ("\n"); + print_refid (res->referenceId); if (res->diagnostics) display_diagrecs(res->diagnostics->diagRecs, res->diagnostics->num_diagRecs); @@ -1303,6 +1604,18 @@ int cmd_querytype (char *arg) return 1; } +int cmd_refid (char *arg) +{ + xfree (refid); + refid = NULL; + if (*arg) + { + refid = (char *) xmalloc (strlen(arg)+1); + strcpy (refid, arg); + } + return 1; +} + int cmd_close(char *arg) { Z_APDU *apdu = zget_APDU(out, Z_APDU_close); @@ -1368,6 +1681,8 @@ static int client(int wait) {"close", cmd_close, ""}, {"attributeset", cmd_attributeset, ""}, {"querytype", cmd_querytype, ""}, + {"refid", cmd_refid, ""}, + {"itemorder", cmd_itemorder, ""}, {0,0} }; char *netbuffer= 0; @@ -1434,6 +1749,7 @@ static int client(int wait) continue; } } + wait = 0; #ifdef USE_SELECT if (conn && FD_ISSET(cs_fileno(conn), &input)) #endif @@ -1481,6 +1797,7 @@ static int client(int wait) 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) @@ -1491,21 +1808,28 @@ static int client(int wait) 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; default: printf("Received unknown APDU type (%d).\n", apdu->which); exit(1); } - printf(C_PROMPT); - fflush(stdout); } while (cs_more(conn)); + printf(C_PROMPT); + fflush(stdout); } - wait = 0; } return 0; } @@ -1545,3 +1869,5 @@ int main(int argc, char **argv) printf (C_PROMPT); return client (opened); } + +