X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=ztest%2Fztest.c;h=07bc6949c2bc1b0ba3656bc905942af30dd5cfd4;hp=e6ce6a25fea056ce70db7f566704ca41b18d6659;hb=f69d4aa4609ff3daa71733da1ea0fcd8322ab954;hpb=63ce3b67bdea2b7cd0531f3f11ccbc8c94753455

diff --git a/ztest/ztest.c b/ztest/ztest.c
index e6ce6a2..07bc694 100644
--- a/ztest/ztest.c
+++ b/ztest/ztest.c
@@ -7,7 +7,22 @@
  *    Chas Woodfield, Fretwell Downing Datasystems.
  *
  * $Log: ztest.c,v $
- * Revision 1.14  1998-10-13 16:12:25  adam
+ * 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
+ * Added type cast to make C++ happy.
+ *
+ * Revision 1.15  1998/10/13 20:05:57  adam
+ * Minor change.
+ *
+ * Revision 1.14  1998/10/13 16:12:25  adam
  * Added support for Surrogate Diagnostics for Scan Term entries.
  *
  * Revision 1.13  1998/08/19 16:10:09  adam
@@ -103,6 +118,58 @@ int ztest_present (void *handle, bend_present_rr *rr)
 
 int ztest_esrequest (void *handle, bend_esrequest_rr *rr)
 {
+    logf(LOG_LOG, "function: %d", *rr->esr->function);
+    if (rr->esr->packageName)
+    	logf(LOG_LOG, "packagename: %s", rr->esr->packageName);
+    logf(LOG_LOG, "Waitaction: %d", *rr->esr->waitAction);
+
+    if (!rr->esr->taskSpecificParameters)
+    {
+        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
+    {
+    	Z_ItemOrder *it = rr->esr->taskSpecificParameters->u.itemOrder;
+	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)
+		    logf(LOG_LOG, "contact name %s", k->contact->name);
+		if (k->contact->phone)
+		    logf(LOG_LOG, "contact phone %s", k->contact->phone);
+		if (k->contact->email)
+		    logf(LOG_LOG, "contact email %s", k->contact->email);
+	    }
+	    if (k->addlBilling)
+	    {
+	        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;
+	}
+    }
     rr->errcode = 0;
     return 0;
 }
@@ -229,7 +296,7 @@ bend_fetchresult *bend_fetch(void *handle, bend_fetchrequest *q, int *fd)
 
 	sprintf(buf, "This is dummy SUTRS record number %d\n", q->number);
 	r->len = strlen(buf);
-	r->record = odr_malloc (q->stream, r->len+1);
+	r->record = (char *) odr_malloc (q->stream, r->len+1);
 	strcpy(r->record, buf);
     }
     else if (q->format == VAL_GRS1)
@@ -322,7 +389,7 @@ bend_scanresult *bend_scan(void *handle, bend_scanrequest *q, int *fd)
 		if (po < 0)
 		    po += 200;
 
-		if (!strcmp (term, "sd") && r->num_entries == 2)
+		if (!strcmp (term, "SD") && r->num_entries == 2)
 		{
 		    list[r->num_entries].term = entries[pos];
 		    list[r->num_entries].occurrences = -1;