X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=ztest%2Fztest.c;h=614df28c1918d857d86caa4e4e3c8dbab22c2fa6;hp=01f046b635ff2293ac1e504b91b311bd40ff22b0;hb=ec29e37cd269b330eb493157dedf9aacf5c6ca46;hpb=ee1eaa955f545d57c0ff8ce4ce210db95a4d817c

diff --git a/ztest/ztest.c b/ztest/ztest.c
index 01f046b..614df28 100644
--- a/ztest/ztest.c
+++ b/ztest/ztest.c
@@ -7,7 +7,20 @@
  *    Chas Woodfield, Fretwell Downing Datasystems.
  *
  * $Log: ztest.c,v $
- * Revision 1.7  1998-02-10 11:03:57  adam
+ * 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.
+ *
+ * Revision 1.8  1998/02/11 11:53:36  adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.7  1998/02/10 11:03:57  adam
  * Added support for extended handlers in backend server interface.
  *
  * Revision 1.6  1998/01/29 13:16:02  adam
@@ -49,10 +62,11 @@ Z_GenericRecord *read_grs1(FILE *f, ODR o);
 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);
 
 bend_initresult *bend_init(bend_initrequest *q)
 {
-    bend_initresult *r = odr_malloc (q->stream, sizeof(*r));
+    bend_initresult *r = (bend_initresult *) odr_malloc (q->stream, sizeof(*r));
     static char *dummy = "Hej fister";
 
     r->errcode = 0;
@@ -61,6 +75,7 @@ bend_initresult *bend_init(bend_initrequest *q)
     q->bend_sort = ztest_sort;       /* register sort handler */
     q->bend_search = ztest_search;   /* register search handler */
     q->bend_present = ztest_present; /* register present handle */
+    q->bend_esrequest = ztest_esrequest;
     return r;
 }
 
@@ -75,6 +90,12 @@ int ztest_present (void *handle, bend_present_rr *rr)
     return 0;
 }
 
+int ztest_esrequest (void *handle, bend_esrequest_rr *rr)
+{
+    rr->errcode = 0;
+    return 0;
+}
+
 /* Obsolete bend_search, never called because handler is registered */
 bend_searchresult *bend_search(void *handle, bend_searchrequest *q, int *fd)
 {
@@ -112,7 +133,7 @@ char *marc_read(FILE *inf)
     size = atoin (length_str, 5);
     if (size <= 6)
         return NULL;
-    if (!(buf = xmalloc (size+1)))
+    if (!(buf = (char*) xmalloc (size+1)))
         return NULL;
     if (fread (buf+5, 1, size-5, inf) != (size-5))
     {
@@ -137,7 +158,8 @@ static char *dummy_database_record (int num)
 	   xfree(buf);
 	if (num == 98)
 	{
-	    assert(buf = xmalloc(2101));
+	    buf = (char*) xmalloc(2101);
+	    assert(buf);
 	    memset(buf, 'A', 2100);
 	    buf[2100] = '\0';
 	    break;
@@ -174,26 +196,21 @@ static Z_GenericRecord *dummy_grs_record (int num, ODR o)
 
 bend_fetchresult *bend_fetch(void *handle, bend_fetchrequest *q, int *num)
 {
-    bend_fetchresult *r = odr_malloc (q->stream, sizeof(*r));
-    static char *bbb = 0;
-
+    bend_fetchresult *r = (bend_fetchresult *)
+			odr_malloc (q->stream, sizeof(*r));
+    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 = 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)
     {
@@ -205,14 +222,18 @@ 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;
 }
@@ -222,34 +243,12 @@ bend_deleteresult *bend_delete(void *handle, bend_deleterequest *q, int *num)
     return 0;
 }
 
-#if 0
-bend_scanresult *bend_scan(void *handle, bend_scanrequest *q, int *num)
-{
-    static struct scan_entry list[200];
-    static char buf[200][200];
-    static bend_scanresult r;
-    int i;
-
-    r.term_position = q->term_position;
-    r.num_entries = q->num_entries;
-    r.entries = list;
-    for (i = 0; i < r.num_entries; i++)
-    {
-    	list[i].term = buf[i];
-	sprintf(list[i].term, "term-%d", i+1);
-	list[i].occurrences = rand() % 100000;
-    }
-    r.errcode = 0;
-    r.errstring = 0;
-    return &r;
-}
-#else
 /*
  * silly dummy-scan what reads words from a file.
  */
 bend_scanresult *bend_scan(void *handle, bend_scanrequest *q, int *num)
 {
-    bend_scanresult *r = 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];
@@ -324,8 +323,6 @@ bend_scanresult *bend_scan(void *handle, bend_scanrequest *q, int *num)
     return r;
 }
 
-#endif
-
 void bend_close(void *handle)
 {
     return;