X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=client%2Fclient.c;h=653ab4138f599ecfe00b9dbe9979c4f31ae4d81a;hp=ad12a29d5b5f267a7fb831615bed768b28ac507f;hb=b23f8886419f5fa9f4a46ba15812ad02d1ca8e55;hpb=f4fb653200d8de7ea39f89afba3a1c6a946fb167 diff --git a/client/client.c b/client/client.c index ad12a29..653ab41 100644 --- a/client/client.c +++ b/client/client.c @@ -1,10 +1,41 @@ /* - * Copyright (c) 1995-1998, Index Data. + * Copyright (c) 1995-1999, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: client.c,v $ - * Revision 1.72 1998-10-20 13:23:15 quinn + * Revision 1.82 1999-05-26 13:49:12 adam + * DB Update implemented in client (very basic). + * + * Revision 1.81 1999/04/20 09:56:48 adam + * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun). + * Modified all encoders/decoders to reflect this change. + * + * Revision 1.80 1999/03/31 11:18:24 adam + * Implemented odr_strdup. Added Reference ID to backend server API. + * + * Revision 1.79 1999/03/23 14:14:25 adam + * Yet another fix. + * + * Revision 1.78 1999/03/18 12:57:18 adam + * Minor fix. + * + * Revision 1.77 1999/03/11 15:26:51 adam + * Fixed bug (introduced by previous commit). + * + * Revision 1.76 1999/03/11 11:12:07 adam + * Added GNU readline support. HTML display in client. + * + * Revision 1.75 1999/02/01 15:37:32 adam + * Fixed minor bug introduced by previous commit. + * + * Revision 1.74 1999/02/01 15:35:21 adam + * Added XML display. + * + * Revision 1.73 1998/10/20 13:55:43 quinn + * Fixed Scan bug in asn and client + * + * Revision 1.72 1998/10/20 13:23:15 quinn * changed preferred pos to 1 * * Revision 1.71 1998/10/20 13:21:43 adam @@ -263,12 +294,20 @@ #include #endif +#if HAVE_READLINE_READLINE_H +#include +#endif +#if HAVE_READLINE_HISTORY_H +#include +#endif + #define C_PROMPT "Z> " 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 *databaseNames[128]; +static Z_External *record_last = 0; static int num_databaseNames = 0; static int setnumber = 0; /* current result set number */ static int smallSetUpperBound = 0; @@ -303,7 +342,7 @@ static void send_apdu(Z_APDU *a) char *buf; int len; - if (!z_APDU(out, &a, 0)) + if (!z_APDU(out, &a, 0, 0)) { odr_perror(out, "Encoding APDU"); exit(1); @@ -385,7 +424,7 @@ static int process_initResponse(Z_InitResponse *res) { printf("UserInformationfield:\n"); if (!z_External(print, (Z_External**)&res-> userInformationField, - 0)) + 0, 0)) { odr_perror(print, "Printing userinfo\n"); odr_reset(print); @@ -607,6 +646,7 @@ static void display_record(Z_DatabaseRecord *p) Z_External *r = (Z_External*) p; oident *ent = oid_getentbyoid(r->direct_reference); + record_last = r; /* * Tell the user what we got. */ @@ -615,7 +655,7 @@ static void display_record(Z_DatabaseRecord *p) printf("Record type: "); if (ent) printf("%s\n", ent->desc); - else if (!odr_oid(print, &r->direct_reference, 0)) + else if (!odr_oid(print, &r->direct_reference, 0, 0)) { odr_perror(print, "print oid"); odr_reset(print); @@ -634,7 +674,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, (char **)&rr, 0)) + if (!(*type->fun)(in, (char **)&rr, 0, 0)) { odr_perror(in, "Decoding constructed record."); fprintf(stderr, "[Near %d]\n", odr_offset(in)); @@ -656,10 +696,22 @@ static void display_record(Z_DatabaseRecord *p) 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); + const char *octet_buf = (char*)p->u.octet_aligned->buf; + if (ent->value == VAL_TEXT_XML || ent->value == VAL_APPLICATION_XML || + ent->value == VAL_HTML) + { + int i; + for (i = 0; iu.octet_aligned->len; i++) + if (octet_buf[i] > 126 || octet_buf[i] < 7) + printf ("<%02X>", octet_buf[i]); + else + fputc (octet_buf[i], stdout); + printf ("\n"); + } + else + marc_display (octet_buf, NULL); if (marcdump) - fwrite (marc_buf, strlen (marc_buf), 1, marcdump); + fwrite (octet_buf, 1, p->u.octet_aligned->len, marcdump); } else if (ent && ent->value == VAL_SUTRS) { @@ -682,7 +734,7 @@ static void display_record(Z_DatabaseRecord *p) else { printf("Unknown record representation.\n"); - if (!z_External(print, &r, 0)) + if (!z_External(print, &r, 0, 0)) { odr_perror(print, "Printing external"); odr_reset(print); @@ -738,7 +790,7 @@ static void display_nameplusrecord(Z_NamePlusRecord *p) printf("[%s]", p->databaseName); if (p->which == Z_NamePlusRecord_surrogateDiagnostic) display_diagrecs(&p->u.surrogateDiagnostic, 1); - else + else if (p->which == Z_NamePlusRecord_databaseRecord) display_record(p->u.databaseRecord); } @@ -1143,10 +1195,6 @@ static int send_itemorder(char *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; @@ -1158,13 +1206,62 @@ static int send_itemorder(char *arg) /* ** taskSpecificParameters ** */ req->taskSpecificParameters = CreateItemOrderExternal(itemno); - /* waitAction - Create the ILL request and that's it */ - *req->waitAction = Z_ExtendedServicesRequest_wait; - send_apdu(apdu); return 0; } +static int cmd_update(char *arg) +{ + Z_APDU *apdu = zget_APDU(out, Z_APDU_extendedServicesRequest ); + Z_ExtendedServicesRequest *req = apdu->u.extendedServicesRequest; + Z_External *r; + int oid[OID_SIZE]; + Z_IUOriginPartToKeep *toKeep; + Z_IUSuppliedRecords *notToKeep; + oident update_oid; + printf ("Update request\n"); + fflush(stdout); + + if (!record_last) + return 0; + update_oid.proto = PROTO_Z3950; + update_oid.oclass = CLASS_EXTSERV; + update_oid.value = VAL_DBUPDATE; + oid_ent_to_oid (&update_oid, oid); + req->packageType = odr_oiddup(out,oid); + req->packageName = "1.Extendedserveq"; + + r = req->taskSpecificParameters = (Z_External *) + odr_malloc (out, sizeof(*r)); + r->direct_reference = odr_oiddup(out,oid); + r->which = Z_External_update; + 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)); + toKeep = r->u.update->u.esRequest->toKeep = (Z_IUOriginPartToKeep *) + odr_malloc(out, sizeof(*r->u.update->u.esRequest->toKeep)); + toKeep->databaseName = databaseNames[0]; + toKeep->action = (int *) odr_malloc(out, sizeof(*toKeep->action)); + *toKeep->action = Z_IUOriginPartToKeep_recordInsert; + + notToKeep = r->u.update->u.esRequest->notToKeep = (Z_IUSuppliedRecords *) + odr_malloc(out, sizeof(*r->u.update->u.esRequest->notToKeep)); + notToKeep->num = 1; + notToKeep->elements = (Z_IUSuppliedRecords_elem **) + odr_malloc(out, sizeof(*notToKeep->elements)); + notToKeep->elements[0] = (Z_IUSuppliedRecords_elem *) + odr_malloc(out, sizeof(**notToKeep->elements)); + notToKeep->elements[0]->u.number = 0; + notToKeep->elements[0]->supplementalId = 0; + notToKeep->elements[0]->correlationInfo = 0; + notToKeep->elements[0]->record = record_last; + + send_apdu(apdu); + + return 2; +} + /* II : Added to do DALI Item Order Extended services request */ static int cmd_itemorder(char *arg) { @@ -1418,7 +1515,8 @@ 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 = (Z_SortKeySpecList *)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; @@ -1436,9 +1534,7 @@ int send_sortrequest(char *arg, int newset) 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); + req->inputResultSetNames[0] = odr_strdup (out, setstring); #else req->inputResultSetNames = (Z_StringList *)odr_malloc (out, sizeof(*req->inputResultSetNames)); @@ -1446,15 +1542,13 @@ int send_sortrequest(char *arg, int newset) req->inputResultSetNames->strings = (char **)odr_malloc (out, sizeof(*req->inputResultSetNames->strings)); req->inputResultSetNames->strings[0] = - (char *)odr_malloc (out, strlen(setstring)+1); - strcpy (req->inputResultSetNames->strings[0], setstring); + odr_strdup (out, setstring); #endif if (newset && setnumber >= 0) sprintf (setstring, "%d", ++setnumber); - req->sortedResultSetName = (char *)odr_malloc (out, strlen(setstring)+1); - strcpy (req->sortedResultSetName, setstring); + req->sortedResultSetName = odr_strdup (out, setstring); req->sortSequence = sksl; sksl->num_specs = 0; @@ -1501,8 +1595,7 @@ int send_sortrequest(char *arg, int newset) else { sk->which = Z_SortKey_sortField; - sk->u.sortField = (char *)odr_malloc (out, strlen(sort_string)+1); - strcpy (sk->u.sortField, sort_string); + sk->u.sortField = odr_strdup (out, sort_string); } sks->sortRelation = (int *)odr_malloc (out, sizeof(*sks->sortRelation)); *sks->sortRelation = Z_SortRelation_ascending; @@ -1579,16 +1672,8 @@ 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) - { - entries = res->entries->u.entries->entries; - num_entries = res->entries->u.entries->num_entries; - } -#endif for (i = 0; i < num_entries; i++) { int pos_term = res->positionOfTerm ? *res->positionOfTerm : -1; @@ -1600,15 +1685,9 @@ void process_scanResponse(Z_ScanResponse *res) 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) @@ -1683,7 +1762,7 @@ int cmd_scan(char *arg) } if (*arg) { - if (send_scanrequest(arg, 1 20) < 0) + if (send_scanrequest(arg, 1, 20) < 0) return 0; } else @@ -1851,6 +1930,7 @@ static int client(int wait) {"querytype", cmd_querytype, ""}, {"refid", cmd_refid, ""}, {"itemorder", cmd_itemorder, ""}, + {"update", cmd_update, ""}, {0,0} }; char *netbuffer= 0; @@ -1882,13 +1962,27 @@ static int client(int wait) #else if (!wait) #endif - { - /* quick & dirty way to get a command line. */ - char *end_p; - if (!fgets(line, 1023, stdin)) - break; - if ((end_p = strchr (line, '\n'))) - *end_p = '\0'; + { +#if HAVE_READLINE_READLINE_H + char* line_in; + line_in=readline(C_PROMPT); + if (!line_in) + break; +#if HAVE_READLINE_HISTORY_H + if (*line_in) + add_history(line_in); +#endif + strcpy(line,line_in); + free (line_in); +#else + char *end_p; + printf (C_PROMPT); + fflush(stdout); + if (!fgets(line, 1023, stdin)) + break; + if ((end_p = strchr (line, '\n'))) + *end_p = '\0'; +#endif if ((res = sscanf(line, "%s %[^;]", word, arg)) <= 0) { strcpy(word, last_cmd); @@ -1913,7 +2007,6 @@ static int client(int wait) } if (res < 2) { - printf(C_PROMPT); continue; } } @@ -1935,8 +2028,9 @@ static int client(int wait) exit(1); } odr_reset(in); /* release APDU from last round */ + record_last = 0; odr_setbuf(in, netbuffer, res, 0); - if (!z_APDU(in, &apdu, 0)) + if (!z_APDU(in, &apdu, 0, 0)) { odr_perror(in, "Decoding incoming APDU"); fprintf(stderr, "[Near %d]\n", odr_offset(in)); @@ -2002,8 +2096,6 @@ static int client(int wait) } } while (conn && cs_more(conn)); - printf(C_PROMPT); - fflush(stdout); } } return 0; @@ -2045,10 +2137,7 @@ int main(int argc, char **argv) } } if (!opened) - { initialize (); - printf (C_PROMPT); - } return client (opened); }