Improved installation. Moved header files to include/yaz.

[yaz-moved-to-github.git] / client / client.c

diff --git a/client/client.c b/client/client.c
index 4d86eca..4262079 100644 (file)
--- a/client/client.c
+++ b/client/client.c
@@ -4,7 +4,17 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: client.c,v $
- * Revision 1.87  1999-08-27 09:40:32  adam
+ * 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
  * Renamed logf function to yaz_log. Removed VC++ project files.
  *
  * Revision 1.86  1999/07/06 12:13:35  adam
@@ -291,21 +301,21 @@
 #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>
 
 #if CCL2RPN
-#include <yaz-ccl.h>
+#include <yaz/yaz-ccl.h>
 #endif
 
 #if HAVE_READLINE_READLINE_H
@@ -663,6 +673,19 @@ static void display_grs1(Z_GenericRecord *r, int level)
     }
 }
 
+static void print_record(const unsigned char *buf, size_t len)
+{
+   size_t i;
+   for (i = 0; i<len; i++)
+       if ((buf[i] <= 126 && buf[i] >= 32) || strchr ("\n\r\t\f", buf[i]))
+           fputc (buf[i], stdout);
+       else
+           printf ("\\X%02X", buf[i]);
+   /* add newline if not already added ... */
+   if (i <= 0 || buf[i-1] != '\n')
+       fputc ('\n', stdout);
+}
+
 static void display_record(Z_DatabaseRecord *p)
 {
     Z_External *r = (Z_External*) p;
@@ -715,21 +738,13 @@ static void display_record(Z_DatabaseRecord *p)
        }
     }
     if (ent && ent->value == VAL_SOIF)
-        printf("%.*s", r->u.octet_aligned->len, r->u.octet_aligned->buf);
+        print_record(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 ||
             ent->value == VAL_HTML)
-       {
-            int i;
-            for (i = 0; i<p->u.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");
-        }
+            print_record(octet_buf, p->u.octet_aligned->len);
        else
             marc_display (octet_buf, NULL);
         if (marcdump)
@@ -742,7 +757,7 @@ static void display_record(Z_DatabaseRecord *p)
             printf("Expecting single SUTRS type for SUTRS.\n");
             return;
         }
-        printf("%.*s", r->u.sutrs->len, r->u.sutrs->buf);
+        print_record(r->u.sutrs->buf, r->u.sutrs->len);
     }
     else if (ent && ent->value == VAL_GRS1)
     {
@@ -844,18 +859,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");
@@ -1329,11 +1361,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");
@@ -1799,6 +1826,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)
@@ -2184,9 +2226,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",