DB Update implemented in client (very basic).

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

diff --git a/ztest/ztest.c b/ztest/ztest.c
index f6c1e50..ee4ce6d 100644 (file)
--- a/ztest/ztest.c
+++ b/ztest/ztest.c
@@ -7,7 +7,22 @@
  *    Chas Woodfield, Fretwell Downing Datasystems.
  *
  * $Log: ztest.c,v $
- * Revision 1.17  1998-10-18 22:33:35  quinn
+ * Revision 1.22  1999-05-26 13:49:12  adam
+ * DB Update implemented in client (very basic).
+ *
+ * Revision 1.21  1998/12/15 12:45:42  adam
+ * Minor change.
+ *
+ * Revision 1.20  1998/12/14 14:48:05  adam
+ * Fixed memory leak - happened when fetching MARC records.
+ *
+ * Revision 1.19  1998/10/20 15:16:22  adam
+ * Minor change to prevent warning.
+ *
+ * Revision 1.18  1998/10/20 15:13:45  adam
+ * Minor fix regarding output for Item Order.
+ *
+ * Revision 1.17  1998/10/18 22:33:35  quinn
  * Added diagnostic dump of Item Order Eservice.
  *
  * Revision 1.16  1998/10/15 08:26:23  adam
@@ -71,7 +86,6 @@
 #include <assert.h>
 
 #include <backend.h>
-#include <xmalloc.h>
 #include <proto.h>
 #include <log.h>
 
@@ -117,18 +131,25 @@ int ztest_esrequest (void *handle, bend_esrequest_rr *rr)
        logf(LOG_LOG, "packagename: %s", rr->esr->packageName);
     logf(LOG_LOG, "Waitaction: %d", *rr->esr->waitAction);
 
-    if (rr->esr->taskSpecificParameters &&
-        rr->esr->taskSpecificParameters->which == Z_External_itemOrder)
+    if (!rr->esr->taskSpecificParameters)
+    {
+        logf (LOG_WARN, "No task specific parameters");
+    }
+    else if (rr->esr->taskSpecificParameters->which == Z_External_itemOrder)
     {
        Z_ItemOrder *it = rr->esr->taskSpecificParameters->u.itemOrder;
-       if (it->which != Z_ItemOrder_esRequest)
-           logf(LOG_WARN, "Expected EsRequest");
-       else
+       switch (it->which)
+       {
+#ifdef ASN_COMPILED
+       case Z_IOItemOrder_esRequest:
+#else
+       case Z_ItemOrder_esRequest:
+#endif
        {
            Z_IORequest *ir = it->u.esRequest;
            Z_IOOriginPartToKeep *k = ir->toKeep;
            Z_IOOriginPartNotToKeep *n = ir->notToKeep;
-
+           
            if (k && k->contact)
            {
                if (k->contact->name)
@@ -142,16 +163,22 @@ int ztest_esrequest (void *handle, bend_esrequest_rr *rr)
            {
                logf(LOG_LOG, "Billing info (not shown)");
            }
-
+           
            if (n->resultSetItem)
            {
                logf(LOG_LOG, "resultsetItem");
                logf(LOG_LOG, "setId: %s", n->resultSetItem->resultSetId);
                logf(LOG_LOG, "item: %d", *n->resultSetItem->item);
            }
-
+       }
+       break;
        }
     }
+    else
+    {
+        logf (LOG_WARN, "Unknown Extended Service(%d)",
+             rr->esr->taskSpecificParameters->which);
+    }
     rr->errcode = 0;
     return 0;
 }
@@ -191,7 +218,7 @@ static int atoin (const char *buf, int n)
     return val;
 }
 
-char *marc_read(FILE *inf)
+char *marc_read(FILE *inf, ODR odr)
 {
     char length_str[5];
     size_t size;
@@ -202,7 +229,7 @@ char *marc_read(FILE *inf)
     size = atoin (length_str, 5);
     if (size <= 6)
         return NULL;
-    if (!(buf = (char*) xmalloc (size+1)))
+    if (!(buf = (char*) odr_malloc (odr, size+1)))
         return NULL;
     if (fread (buf+5, 1, size-5, inf) != (size-5))
     {
@@ -214,27 +241,25 @@ char *marc_read(FILE *inf)
     return buf;
 }
 
-static char *dummy_database_record (int num)
+static char *dummy_database_record (int num, ODR odr)
 {
     FILE *inf = fopen ("dummy-records", "r");
-    char *buf = 0;
+    char *buf;
 
     if (!inf)
        return NULL;
     while (--num >= 0)
     {
-       if (buf)
-          xfree(buf);
        if (num == 98)
        {
-           buf = (char*) xmalloc(2101);
+           buf = (char*) odr_malloc(odr, 2101);
            assert(buf);
            memset(buf, 'A', 2100);
            buf[2100] = '\0';
            break;
        }
        else
-           buf = marc_read (inf);
+           buf = marc_read (inf, odr);
        if (!num || !buf)
            break;
     }
@@ -291,11 +316,10 @@ bend_fetchresult *bend_fetch(void *handle, bend_fetchrequest *q, int *fd)
            return r;
        }
     }
-    else if ((cp = dummy_database_record(q->number)))
+    else if ((cp = dummy_database_record(q->number, q->stream)))
     {
        r->len = strlen(cp);
-       r->record = (char *) odr_malloc (q->stream, 1+r->len);
-       strcpy (r->record, cp);
+       r->record = cp;
        r->format = VAL_USMARC;
     }
     else