Implemented delete result set service to server API.

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

diff --git a/ztest/ztest.c b/ztest/ztest.c
index 8a16997..6bcf04d 100644 (file)
--- a/ztest/ztest.c
+++ b/ztest/ztest.c
@@ -7,7 +7,16 @@
  *    Chas Woodfield, Fretwell Downing Datasystems.
  *
  * $Log: ztest.c,v $
- * Revision 1.9  1998-03-31 11:07:45  adam
+ * 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
  * Furhter work on UNIverse resource report.
  * Added Extended Services handling in frontend server.
  *
@@ -57,6 +66,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)
 {
@@ -70,6 +80,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;
 }
 
@@ -90,6 +101,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)
 {
@@ -152,7 +172,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;
@@ -191,25 +212,19 @@ bend_fetchresult *bend_fetch(void *handle, bend_fetchrequest *q, int *num)
 {
     bend_fetchresult *r = (bend_fetchresult *)
                        odr_malloc (q->stream, sizeof(*r));
-    static char *bbb = 0;
-
+    char *cp;
     r->errstring = 0;
     r->last_in_set = 0;
     r->basename = "DUMMY";
-    if (bbb)
-    {
-        xfree(bbb);
-       bbb = 0;
-    }
     r->format = q->format;  
     if (q->format == VAL_SUTRS)
     {
        char buf[100];
 
        sprintf(buf, "This is dummy SUTRS record number %d\n", q->number);
-       assert(r->record = bbb = (char*) xmalloc(strlen(buf)+1));
-       strcpy(bbb, buf);
        r->len = strlen(buf);
+       r->record = odr_malloc (q->stream, r->len+1);
+       strcpy(r->record, buf);
     }
     else if (q->format == VAL_GRS1)
     {
@@ -221,23 +236,22 @@ bend_fetchresult *bend_fetch(void *handle, bend_fetchrequest *q, int *num)
            return r;
        }
     }
-    else if (!(r->record = bbb = dummy_database_record(q->number)))
+    else if ((cp = dummy_database_record(q->number)))
     {
-       r->errcode = 13;
+       r->len = strlen(cp);
+       r->record = (char *) odr_malloc (q->stream, 1+r->len);
+       strcpy (r->record, cp);
        r->format = VAL_USMARC;
-       return r;
     }
     else
-       r->len = strlen(r->record);
+    {
+       r->errcode = 13;
+       return r;
+    }
     r->errcode = 0;
     return r;
 }
 
-bend_deleteresult *bend_delete(void *handle, bend_deleterequest *q, int *num)
-{
-    return 0;
-}
-
 /*
  * silly dummy-scan what reads words from a file.
  */