X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=ztest%2Fztest.c;h=c637b9e9a45078c72a74d9fefafe47267b5c9c41;hb=e1af980ed4466d784db2395ad5bdddadb8a24504;hp=6b21057cb250fcce5cb147adab235103ccd28086;hpb=55c6ac70550af857d80ef233147dbc986e4095e1;p=yaz-moved-to-github.git

diff --git a/ztest/ztest.c b/ztest/ztest.c
index 6b21057..c637b9e 100644
--- a/ztest/ztest.c
+++ b/ztest/ztest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995-1997, Index Data.
+ * Copyright (c) 1995-1998, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
@@ -7,7 +7,16 @@
  *    Chas Woodfield, Fretwell Downing Datasystems.
  *
  * $Log: ztest.c,v $
- * Revision 1.5  1997-11-07 13:31:58  adam
+ * 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
+ * Added dummy sort in test server.
+ *
+ * Revision 1.5  1997/11/07 13:31:58  adam
  * Added NT Service name part of statserv_options_block. Moved NT
  * service utility to server library.
  *
@@ -36,29 +45,51 @@
 #include <backend.h>
 #include <xmalloc.h>
 #include <proto.h>
+#include <log.h>
 
 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);
+
 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;
     r->errstring = 0;
     r->handle = dummy;
+    q->bend_sort = ztest_sort;       /* register sort handler */
+    q->bend_search = ztest_search;   /* register search handler */
+    q->bend_present = ztest_present; /* register present handle */
     return r;
 }
 
-bend_searchresult *bend_search(void *handle, bend_searchrequest *q, int *fd)
+int ztest_search (void *handle, bend_search_rr *rr)
 {
-    bend_searchresult *r = odr_malloc (q->stream, sizeof(*r));
+    rr->hits = rand() % 22;
+    return 0;
+}
 
-    r->errcode = 0;
-    r->errstring = 0;
-    r->hits = rand() % 22;
+int ztest_present (void *handle, bend_present_rr *rr)
+{
+    return 0;
+}
 
-    return r;
+/* Obsolete bend_search, never called because handler is registered */
+bend_searchresult *bend_search(void *handle, bend_searchrequest *q, int *fd)
+{
+    return 0;
+}
+
+/* Our sort handler really doesn't sort... */
+int ztest_sort (void *handle, bend_sort_rr *rr)
+{
+    rr->errcode = 0;
+    rr->sort_status = Z_SortStatus_success;
+    return 0;
 }
 
 static int atoin (const char *buf, int n)
@@ -84,7 +115,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))
     {
@@ -109,7 +140,7 @@ static char *dummy_database_record (int num)
 	   xfree(buf);
 	if (num == 98)
 	{
-	    assert(buf = xmalloc(2101));
+	    assert(buf = (char*) xmalloc(2101));
 	    memset(buf, 'A', 2100);
 	    buf[2100] = '\0';
 	    break;
@@ -146,7 +177,8 @@ 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));
+    bend_fetchresult *r = (bend_fetchresult *)
+			odr_malloc (q->stream, sizeof(*r));
     static char *bbb = 0;
 
     r->errstring = 0;
@@ -163,7 +195,7 @@ bend_fetchresult *bend_fetch(void *handle, bend_fetchrequest *q, int *num)
     	char buf[100];
 
 	sprintf(buf, "This is dummy SUTRS record number %d\n", q->number);
-	assert(r->record = bbb = xmalloc(strlen(buf)+1));
+	assert(r->record = bbb = (char*) xmalloc(strlen(buf)+1));
 	strcpy(bbb, buf);
 	r->len = strlen(buf);
     }
@@ -221,7 +253,7 @@ bend_scanresult *bend_scan(void *handle, bend_scanrequest *q, int *num)
  */
 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];
@@ -229,6 +261,7 @@ bend_scanresult *bend_scan(void *handle, bend_scanrequest *q, int *num)
     char term[80], *p;
     int i, pos;
 
+    r->errcode = 0;
     r->errstring = 0;
     r->entries = list;
     r->status = BEND_SCAN_SUCCESS;
@@ -258,7 +291,7 @@ bend_scanresult *bend_scan(void *handle, bend_scanrequest *q, int *num)
     	if (islower(*p))
 	    *p = toupper(*p);
 
-    fseek(f, 0, 0);
+    fseek(f, 0, SEEK_SET);
     r->num_entries = 0;
     for (i = 0, pos = 0; fscanf(f, " %79[^:]:%d", entries[pos], &hits[pos]) == 2;
 	i++, pos < 199 ? pos++ : (pos = 0))