X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=client%2Fclient.c;h=13cb16c9fb7bec9dbef29e3c0d36f894e39b7aca;hb=d205d4870b1d64af05e9d6f6a2223086af4cce9e;hp=90029872d7516c252acde1092624af61afe029db;hpb=379059e41e165d18f177bacba85212018f451e57;p=yaz-moved-to-github.git

diff --git a/client/client.c b/client/client.c
index 9002987..13cb16c 100644
--- a/client/client.c
+++ b/client/client.c
@@ -4,7 +4,17 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: client.c,v $
- * Revision 1.88  1999-10-11 10:00:29  adam
+ * Revision 1.91  1999-12-16 23:36:19  adam
+ * Implemented ILL protocol. Minor updates ASN.1 compiler.
+ *
+ * Revision 1.90  1999/11/30 13:47:11  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.89  1999/11/04 14:58:44  adam
+ * Added status elements for backend delete result set handler.
+ * Updated delete result result set command for client.
+ *
+ * Revision 1.88  1999/10/11 10:00:29  adam
  * Modified printing of records.
  *
  * Revision 1.87  1999/08/27 09:40:32  adam
@@ -294,21 +304,25 @@
 #include <time.h>
 #include <assert.h>
 
-#include <yaz-util.h>
+#include <yaz/yaz-util.h>
 
-#include <tcpip.h>
+#include <yaz/tcpip.h>
 #ifdef USE_XTIMOSI
-#include <xmosi.h>
+#include <yaz/xmosi.h>
 #endif
 
-#include <proto.h>
-#include <marcdisp.h>
-#include <diagbib1.h>
+#include <yaz/proto.h>
+#include <yaz/marcdisp.h>
+#include <yaz/diagbib1.h>
 
-#include <pquery.h>
+#include <yaz/pquery.h>
+
+#ifdef ASN_COMPILED
+#include <yaz/ill.h>
+#endif
 
 #if CCL2RPN
-#include <yaz-ccl.h>
+#include <yaz/yaz-ccl.h>
 #endif
 
 #if HAVE_READLINE_READLINE_H
@@ -852,18 +866,35 @@ static void display_records(Z_Records *p)
 
 static int send_deleteResultSetRequest(char *arg)
 {
+    char names[8][32];
+    int i;
+
     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->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]);
+
     req->deleteFunction = (int *)
 	odr_malloc (out, sizeof(*req->deleteFunction));
-    *req->deleteFunction = Z_DeleteRequest_list;
+    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; i<req->num_resultSetList; i++)
+	    req->resultSetList[i] = names[i];
+    }
+    else
+    {
+	*req->deleteFunction = Z_DeleteRequest_all;
+	req->resultSetList = 0;
+    }
     
     send_apdu(apdu);
     printf("Sent deleteResultSetRequest.\n");
@@ -1172,6 +1203,46 @@ void process_ESResponse(Z_ExtendedServicesResponse *res)
     }
 }
 
+#ifdef ASN_COMPILED
+static Z_External *create_external_itemRequest()
+{
+    ILL_ItemRequest *req = ill_get_ItemRequest(out);
+    Z_External *r = 0;
+
+    if (!ill_ItemRequest (out, &req, 0, 0))
+	return 0;
+    else
+    {
+	oident oid;
+	int itemRequest_size = 0;
+	char *itemRequest_buf = odr_getbuf (out, &itemRequest_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, itemRequest_size);
+	r->u.single_ASN1_type->len = itemRequest_size;
+	r->u.single_ASN1_type->size = itemRequest_size;
+	memcpy (r->u.single_ASN1_type->buf, itemRequest_buf, itemRequest_size);
+	printf ("len = %d\n", itemRequest_size);
+    }
+    return r;
+}
+#else
+static Z_External *create_external_itemRequest()
+{
+    return 0;
+}
+#endif
 static Z_External *CreateItemOrderExternal(int itemno)
 {
     Z_External *r = (Z_External *) odr_malloc(out, sizeof(Z_External));
@@ -1219,7 +1290,8 @@ static Z_External *CreateItemOrderExternal(int itemno)
 	(int *) odr_malloc(out, sizeof(int));
     *r->u.itemOrder->u.esRequest->notToKeep->resultSetItem->item = itemno;
 
-    r->u.itemOrder->u.esRequest->notToKeep->itemRequest = NULL;
+    r->u.itemOrder->u.esRequest->notToKeep->itemRequest = 
+       create_external_itemRequest();
     return r;
 }
 
@@ -1337,11 +1409,6 @@ static int cmd_find(char *arg)
 
 static int cmd_delete(char *arg)
 {
-    if (!*arg)
-    {
-        printf("Delete what?\n");
-        return 0;
-    }
     if (!conn)
     {
         printf("Not connected yet\n");
@@ -1807,6 +1874,21 @@ void process_sortResponse(Z_SortResponse *res)
 #endif
 }
 
+void process_deleteResultSetResponse (Z_DeleteResultSetResponse *res)
+{
+    printf("Got deleteResultSetResponse status=%d\n",
+	   *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 cmd_sort_generic(char *arg, int newset)
 {
     if (!conn)
@@ -2192,9 +2274,8 @@ static int client(int wait)
 			(apdu->u.resourceControlRequest);
 		    break;
 		case Z_APDU_deleteResultSetResponse:
-		    printf("Got deleteResultSetResponse status=%d\n",
-			   *apdu->u.deleteResultSetResponse->
-			   deleteOperationStatus);
+		    process_deleteResultSetResponse(apdu->u.
+						    deleteResultSetResponse);
 		    break;
 		default:
 		    printf("Received unknown APDU type (%d).\n",