Added type cast to make C++ happy.

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

diff --git a/ztest/ztest.c b/ztest/ztest.c
index 76d846e..1eb2aa3 100644 (file)
--- a/ztest/ztest.c
+++ b/ztest/ztest.c
@@ -7,7 +7,25 @@
  *    Chas Woodfield, Fretwell Downing Datasystems.
  *
  * $Log: ztest.c,v $
- * Revision 1.10  1998-05-27 16:55:54  adam
+ * 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
+ * Implemented delete result set service to server API.
+ *
+ * Revision 1.11  1998/06/09 13:55:08  adam
+ * Minor changes.
+ *
+ * Revision 1.10  1998/05/27 16:55:54  adam
  * Minor changes.
  *
  * Revision 1.9  1998/03/31 11:07:45  adam
@@ -60,6 +78,7 @@ int ztest_search (void *handle, bend_search_rr *rr);
 int ztest_sort (void *handle, bend_sort_rr *rr);
 int ztest_present (void *handle, bend_present_rr *rr);
 int ztest_esrequest (void *handle, bend_esrequest_rr *rr);
+int ztest_delete (void *handle, bend_delete_rr *rr);
 
 bend_initresult *bend_init(bend_initrequest *q)
 {
@@ -73,6 +92,7 @@ bend_initresult *bend_init(bend_initrequest *q)
     q->bend_search = ztest_search;   /* register search handler */
     q->bend_present = ztest_present; /* register present handle */
     q->bend_esrequest = ztest_esrequest;
+    q->bend_delete = ztest_delete;
     return r;
 }
 
@@ -93,6 +113,15 @@ int ztest_esrequest (void *handle, bend_esrequest_rr *rr)
     return 0;
 }
 
+int ztest_delete (void *handle, bend_delete_rr *rr)
+{
+    if (rr->num_setnames == 1 && !strcmp (rr->setnames[0], "1"))
+       rr->delete_status = Z_DeleteStatus_success;
+    else
+        rr->delete_status = Z_DeleteStatus_resultSetDidNotExist;
+    return 0;
+}
+
 /* Obsolete bend_search, never called because handler is registered */
 bend_searchresult *bend_search(void *handle, bend_searchrequest *q, int *fd)
 {
@@ -155,7 +184,8 @@ static char *dummy_database_record (int num)
           xfree(buf);
        if (num == 98)
        {
-           assert(buf = (char*) xmalloc(2101));
+           buf = (char*) xmalloc(2101);
+           assert(buf);
            memset(buf, 'A', 2100);
            buf[2100] = '\0';
            break;
@@ -190,7 +220,7 @@ static Z_GenericRecord *dummy_grs_record (int num, ODR o)
     return r;
 }
 
-bend_fetchresult *bend_fetch(void *handle, bend_fetchrequest *q, int *num)
+bend_fetchresult *bend_fetch(void *handle, bend_fetchrequest *q, int *fd)
 {
     bend_fetchresult *r = (bend_fetchresult *)
                        odr_malloc (q->stream, sizeof(*r));
@@ -205,7 +235,7 @@ bend_fetchresult *bend_fetch(void *handle, bend_fetchrequest *q, int *num)
 
        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)
@@ -234,17 +264,13 @@ bend_fetchresult *bend_fetch(void *handle, bend_fetchrequest *q, int *num)
     return r;
 }
 
-bend_deleteresult *bend_delete(void *handle, bend_deleterequest *q, int *num)
-{
-    return 0;
-}
-
 /*
  * silly dummy-scan what reads words from a file.
  */
-bend_scanresult *bend_scan(void *handle, bend_scanrequest *q, int *num)
+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];
@@ -301,8 +327,19 @@ bend_scanresult *bend_scan(void *handle, bend_scanrequest *q, int *num)
                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)