X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=client%2Fclient.c;h=e06ad37ef5990ae1f3bab9916cd0a9fa16035b53;hp=46368143247af8c19c29312821714d549b751308;hb=9e1a8a0a598aef894f59fa8abe3ccb144a5294a8;hpb=11fc1fa1b5e4b75942018efe466dbfdb41454077

diff --git a/client/client.c b/client/client.c
index 4636814..e06ad37 100644
--- a/client/client.c
+++ b/client/client.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: client.c,v $
- * Revision 1.17  1995-08-17 12:45:02  quinn
+ * Revision 1.20  1995-08-29 14:24:13  quinn
+ * Added second half of close-handshake
+ *
+ * Revision 1.19  1995/08/29  11:17:28  quinn
+ * Added code to receive close
+ *
+ * Revision 1.18  1995/08/28  12:21:27  quinn
+ * Client can now ask for simple element set names.
+ *
+ * Revision 1.17  1995/08/17  12:45:02  quinn
  * Fixed minor problems with GRS-1. Added support in c&s.
  *
  * Revision 1.16  1995/08/15  12:00:04  quinn
@@ -99,9 +108,11 @@ static int setnumber = 0;               /* current result set number */
 static int smallSetUpperBound = 0;
 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 int sent_close = 0;
 static ODR_MEM session_mem;                /* memory handle for init-response */
 static Z_InitResponse *session = 0;        /* session parameters */
 static char last_scan[512] = "0";
@@ -146,6 +157,7 @@ static void send_initRequest()
 
     ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_1);
     ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_2);
+    ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_3);
 
     req->idAuthentication = auth;
 
@@ -178,7 +190,7 @@ static int process_initResponse(Z_InitResponse *res)
 	    odr_perror(print, "Printing userinfo\n");
 	    odr_reset(print);
 	}
-	if (res->userInformationField->which == ODR_EXTERNAL_octet)
+	if (res->userInformationField->which == Z_External_octet)
 	{
 	    printf("Guessing visiblestring:\n");
 	    printf("'%s'\n", res->userInformationField->u. octet_aligned->buf);
@@ -319,7 +331,7 @@ void display_record(Z_DatabaseRecord *p)
 	    odr_reset(print);
 	}
     }
-    if (r->which == ODR_EXTERNAL_octet && p->u.octet_aligned->len)
+    if (r->which == Z_External_octet && p->u.octet_aligned->len)
 	marc_display ((char*)p->u.octet_aligned->buf, stdout);
     else if (ent->value == VAL_SUTRS)
     {
@@ -463,6 +475,8 @@ static int send_searchRequest(char *arg)
 	prefsyn.class = CLASS_RECSYN;
 	prefsyn.value = recordsyntax;
 	req->preferredRecordSyntax = odr_oiddup(out, oid_getoidbyent(&prefsyn));
+	req->smallSetElementSetNames =
+	    req->mediumSetElementSetNames = elementSetNames;
     }
     req->num_databaseNames = 1;
     req->databaseNames = &databaseNames;
@@ -594,6 +608,7 @@ static int send_presentRequest(char *arg)
 {
     Z_APDU *apdu = zget_APDU(out, Z_APDU_presentRequest);
     Z_PresentRequest *req = apdu->u.presentRequest;
+    Z_RecordComposition compo;
     oident prefsyn;
     int nos = 1;
     char *p;
@@ -618,11 +633,49 @@ static int send_presentRequest(char *arg)
     prefsyn.class = CLASS_RECSYN;
     prefsyn.value = recordsyntax;
     req->preferredRecordSyntax = oid_getoidbyent(&prefsyn);
+    if (elementSetNames)
+    {
+    	req->recordComposition = &compo;
+	compo.which = Z_RecordComp_simple;
+	compo.u.simple = elementSetNames;
+    }
     send_apdu(apdu);
     printf("Sent presentRequest (%d+%d).\n", setno, nos);
     return 2;
 }
 
+void process_close(Z_Close *req)
+{
+    Z_APDU *apdu = zget_APDU(out, Z_APDU_close);
+    Z_Close *res = apdu->u.close;
+
+    static char *reasons[] =
+    {
+	"finished",
+	"shutdown",
+	"systemProblem",
+	"costLimit",
+	"resources",
+	"securityViolation",
+	"protocolError",
+	"lackOfActivity",
+	"peerAbort",
+	"unspecified"
+    };
+
+    printf("Reason: %s, message: %s\n", reasons[*req->closeReason],
+    	req->diagnosticInformation ? req->diagnosticInformation : "NULL");
+    if (sent_close)
+    {
+    	printf("Goodbye.\n");
+    	exit(0);
+    }
+    *res->closeReason = Z_Close_finished;
+    send_apdu(apdu);
+    printf("Sent response.\n");
+    sent_close = 1;
+}
+
 static int cmd_show(char *arg)
 {
     if (!send_presentRequest(arg))
@@ -782,6 +835,35 @@ int cmd_format(char *arg)
     }
 }
 
+int cmd_elements(char *arg)
+{
+    static Z_ElementSetNames esn;
+    static char what[100];
+
+    if (!arg || !*arg)
+    {
+    	printf("Usage: elements <esn>\n");
+	return 0;
+    }
+    strcpy(what, arg);
+    esn.which = Z_ElementSetNames_generic;
+    esn.u.generic = what;
+    elementSetNames = &esn;
+    return 1;
+}
+
+int cmd_close(char *arg)
+{
+    Z_APDU *apdu = zget_APDU(out, Z_APDU_close);
+    Z_Close *req = apdu->u.close;
+
+    *req->closeReason = Z_Close_finished;
+    send_apdu(apdu);
+    printf("Sent close request.\n");
+    sent_close = 1;
+    return 2;
+}
+
 static void initialize(void)
 {
 #ifdef RPN_QUERY
@@ -833,6 +915,8 @@ static int client(void)
 	{"setnames", cmd_setnames, ""},
 	{"cancel", cmd_cancel, ""},
 	{"format", cmd_format, "<recordsyntax>"},
+	{"elements", cmd_elements, "<elementSetName>"},
+	{"close", cmd_close, ""},
     	{0,0}
     };
     char *netbuffer= 0;
@@ -939,6 +1023,10 @@ static int client(void)
 			else
 			    printf("No records.\n");
 			break;
+		    case Z_APDU_close:
+		    	printf("Target has closed the association.\n");
+			process_close(apdu->u.close);
+			break;
 		    default:
 		    	printf("Received unknown APDU type (%d).\n", 
 			    apdu->which);