X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=ztest%2Fztest.c;h=c6cfa7f51d5a1784dd71ff77e4cd0471ac568ce1;hb=7d97c14b8f494310d0d866e9e82bb37c8b5a4e63;hp=07bc6949c2bc1b0ba3656bc905942af30dd5cfd4;hpb=8448f144099c16b7ab17b2547cc3a04816dcce07;p=yaz-moved-to-github.git

diff --git a/ztest/ztest.c b/ztest/ztest.c
index 07bc694..c6cfa7f 100644
--- a/ztest/ztest.c
+++ b/ztest/ztest.c
@@ -7,7 +7,25 @@
  *    Chas Woodfield, Fretwell Downing Datasystems.
  *
  * $Log: ztest.c,v $
- * Revision 1.19  1998-10-20 15:16:22  adam
+ * Revision 1.25  1999-06-01 14:29:12  adam
+ * Work on Extended Services.
+ *
+ * Revision 1.24  1999/05/27 13:07:54  adam
+ * Fix.
+ *
+ * Revision 1.23  1999/05/27 13:02:20  adam
+ * Assigned OID for old DB Update (VAL_DBUPDATE0).
+ *
+ * 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
@@ -77,7 +95,6 @@
 #include <assert.h>
 
 #include <backend.h>
-#include <xmalloc.h>
 #include <proto.h>
 #include <log.h>
 
@@ -127,13 +144,10 @@ int ztest_esrequest (void *handle, bend_esrequest_rr *rr)
     {
         logf (LOG_WARN, "No task specific parameters");
     }
-    else if (rr->esr->taskSpecificParameters->which != Z_External_itemOrder)
-    {
-        logf (LOG_WARN, "Not Item Order %d", rr->esr->taskSpecificParameters->which);
-    }
-    else
+    else if (rr->esr->taskSpecificParameters->which == Z_External_itemOrder)
     {
     	Z_ItemOrder *it = rr->esr->taskSpecificParameters->u.itemOrder;
+	logf (LOG_LOG, "Received ItemOrder");
 	switch (it->which)
 	{
 #ifdef ASN_COMPILED
@@ -170,7 +184,98 @@ int ztest_esrequest (void *handle, bend_esrequest_rr *rr)
 	break;
 	}
     }
-    rr->errcode = 0;
+    else if (rr->esr->taskSpecificParameters->which == Z_External_update)
+    {
+    	Z_IUUpdate *up = rr->esr->taskSpecificParameters->u.update;
+	logf (LOG_LOG, "Received DB Update");
+	if (up->which == Z_IUUpdate_esRequest)
+	{
+	    Z_IUUpdateEsRequest *esRequest = up->u.esRequest;
+	    Z_IUOriginPartToKeep *toKeep = esRequest->toKeep;
+	    Z_IUSuppliedRecords *notToKeep = esRequest->notToKeep;
+	    
+	    logf (LOG_LOG, "action");
+	    if (toKeep->action)
+	    {
+		switch (*toKeep->action)
+		{
+		case Z_IUOriginPartToKeep_recordInsert:
+		    logf (LOG_LOG, " recordInsert");
+		    break;
+		case Z_IUOriginPartToKeep_recordReplace:
+		    logf (LOG_LOG, " recordUpdate");
+		    break;
+		case Z_IUOriginPartToKeep_recordDelete:
+		    logf (LOG_LOG, " recordDelete");
+		    break;
+		case Z_IUOriginPartToKeep_elementUpdate:
+		    logf (LOG_LOG, " elementUpdate");
+		    break;
+		case Z_IUOriginPartToKeep_specialUpdate:
+		    logf (LOG_LOG, " specialUpdate");
+		    break;
+		default:
+		    logf (LOG_LOG, " unknown (%d)", *toKeep->action);
+		}
+	    }
+	    if (toKeep->databaseName)
+	    {
+		logf (LOG_LOG, "database: %s", toKeep->databaseName);
+		if (!strcmp(toKeep->databaseName, "fault"))
+		{
+		    rr->errcode = 109;
+		    rr->errstring = toKeep->databaseName;
+		}
+		if (!strcmp(toKeep->databaseName, "accept"))
+		    rr->errcode = -1;
+	    }
+	    if (notToKeep)
+	    {
+		int i;
+		for (i = 0; i < notToKeep->num; i++)
+		{
+		    Z_External *rec = notToKeep->elements[i]->record;
+
+		    if (rec->direct_reference)
+		    {
+			struct oident *oident;
+			oident = oid_getentbyoid(rec->direct_reference);
+			if (oident)
+			    logf (LOG_LOG, "record %d type %s", i,
+				  oident->desc);
+		    }
+		    switch (rec->which)
+		    {
+		    case Z_External_sutrs:
+			if (rec->u.octet_aligned->len > 170)
+			    logf (LOG_LOG, "%d bytes:\n%.168s ...",
+				  rec->u.sutrs->len,
+				  rec->u.sutrs->buf);
+			else
+			    logf (LOG_LOG, "%d bytes:\n%s",
+				  rec->u.sutrs->len,
+				  rec->u.sutrs->buf);
+                        break;
+		    case Z_External_octet        :
+			if (rec->u.octet_aligned->len > 170)
+			    logf (LOG_LOG, "%d bytes:\n%.168s ...",
+				  rec->u.octet_aligned->len,
+				  rec->u.octet_aligned->buf);
+			else
+			    logf (LOG_LOG, "%d bytes\n%s",
+				  rec->u.octet_aligned->len,
+				  rec->u.octet_aligned->buf);
+		    }
+		}
+	    }
+	}
+    }
+    else
+    {
+        logf (LOG_WARN, "Unknown Extended Service(%d)",
+	      rr->esr->taskSpecificParameters->which);
+	
+    }
     return 0;
 }
 
@@ -209,7 +314,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;
@@ -220,7 +325,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))
     {
@@ -232,27 +337,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;
     }
@@ -309,11 +412,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