X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=ztest%2Fztest.c;h=f6c1e509ec2fbd2fe31ce3bbba8ef3d55c19b880;hb=ec63ca9a4271e2575a417346e67c45e84157ba35;hp=06e2a582a1d48bafaf93991965a2f1223326fb55;hpb=b5bc2a31ad5125dc6d3ed1b6e626f0b9d22618bb;p=yaz-moved-to-github.git

diff --git a/ztest/ztest.c b/ztest/ztest.c
index 06e2a58..f6c1e50 100644
--- a/ztest/ztest.c
+++ b/ztest/ztest.c
@@ -7,7 +7,19 @@
  *    Chas Woodfield, Fretwell Downing Datasystems.
  *
  * $Log: ztest.c,v $
- * Revision 1.13  1998-08-19 16:10:09  adam
+ * 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
  * Changed som member names of DeleteResultSetRequest/Response.
  *
  * Revision 1.12  1998/07/20 12:38:44  adam
@@ -100,6 +112,46 @@ 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 &&
+   	 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
+	{
+	    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);
+	    }
+
+	}
+    }
     rr->errcode = 0;
     return 0;
 }
@@ -226,7 +278,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)
@@ -260,7 +312,8 @@ bend_fetchresult *bend_fetch(void *handle, bend_fetchrequest *q, int *fd)
  */
 bend_scanresult *bend_scan(void *handle, bend_scanrequest *q, int *fd)
 {
-    bend_scanresult *r = (bend_scanresult *) odr_malloc (q->stream, sizeof(*r));
+    bend_scanresult *r = (bend_scanresult *)
+	odr_malloc (q->stream, sizeof(*r));
     static FILE *f = 0;
     static struct scan_entry list[200];
     static char entries[200][80];
@@ -317,8 +370,19 @@ bend_scanresult *bend_scan(void *handle, bend_scanrequest *q, int *fd)
 		po = pos - r->term_position + r->num_entries + 1; /* find pos */
 		if (po < 0)
 		    po += 200;
-		list[r->num_entries].term = entries[po];
-		list[r->num_entries].occurrences = hits[po];
+
+		if (!strcmp (term, "SD") && r->num_entries == 2)
+		{
+		    list[r->num_entries].term = entries[pos];
+		    list[r->num_entries].occurrences = -1;
+		    list[r->num_entries].errcode = 233;
+		    list[r->num_entries].errstring = "SD for Scan Term";
+		}
+		else
+		{
+		    list[r->num_entries].term = entries[po];
+		    list[r->num_entries].occurrences = hits[po];
+		}
 	    }
 	}
 	else if (r->num_entries)