database case insensitive
[yaz-moved-to-github.git] / ztest / ztest.c
index 8ce9c30..7274130 100644 (file)
+/*
+ * Copyright (c) 1995-2003, Index Data.
+ * See the file LICENSE for details.
+ *
+ * $Id: ztest.c,v 1.56 2003-02-28 15:59:02 adam Exp $
+ */
 
-/* little dummy-server */
+/*
+ * Demonstration of simple server
+ */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
-#include <assert.h>
 
-#include <backend.h>
-#include <xmalloc.h>
-#include <proto.h>
+#include <yaz/yaz-util.h>
+#include <yaz/backend.h>
+#include <yaz/ill.h>
 
-/* Specifically for NT Services - Shouldn't cause problems on UNIX */
-#include "service.h"
+Z_GenericRecord *dummy_grs_record (int num, ODR o);
+char *dummy_marc_record (int num, ODR odr);
+char *dummy_xml_record (int num, ODR odr);
 
-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);
+int ztest_delete (void *handle, bend_delete_rr *rr);
 
-bend_initresult *bend_init(bend_initrequest *q)
+int ztest_search (void *handle, bend_search_rr *rr)
 {
-    static bend_initresult r;
-    static char *dummy = "Hej fister";
-
-    r.errcode = 0;
-    r.errstring = 0;
-    r.handle = dummy;
-    return &r;
+    if (rr->num_bases != 1)
+    {
+        rr->errcode = 23;
+        return 0;
+    }
+    if (yaz_matchstr (rr->basenames[0], "Default"))
+    {
+        rr->errcode = 109;
+        rr->errstring = rr->basenames[0];
+        return 0;
+    }
+    rr->hits = rand() % 24;
+    return 0;
 }
 
-bend_searchresult *bend_search(void *handle, bend_searchrequest *q, int *fd)
+
+/* this huge function handles extended services */
+int ztest_esrequest (void *handle, bend_esrequest_rr *rr)
 {
-    static bend_searchresult r;
+    /* user-defined handle - created in bend_init */
+    int *counter = (int*) handle;  
 
-    r.errcode = 0;
-    r.errstring = 0;
-    r.hits = rand() % 22;
-    return &r;
-}
+    yaz_log(LOG_LOG, "ESRequest no %d", *counter);
 
-static int atoin (const char *buf, int n)
-{
-    int val = 0;
-    while (--n >= 0)
+    (*counter)++;
+
+    if (rr->esr->packageName)
+       yaz_log(LOG_LOG, "packagename: %s", rr->esr->packageName);
+    yaz_log(LOG_LOG, "Waitaction: %d", *rr->esr->waitAction);
+
+
+    yaz_log(LOG_LOG, "function: %d", *rr->esr->function);
+
+    if (!rr->esr->taskSpecificParameters)
     {
-        if (isdigit(*buf))
-            val = val*10 + (*buf - '0');
-        buf++;
+        yaz_log (LOG_WARN, "No task specific parameters");
     }
-    return val;
-}
-
-char *marc_read(FILE *inf)
-{
-    char length_str[5];
-    size_t size;
-    char *buf;
-
-    if (fread (length_str, 1, 5, inf) != 5)
-        return NULL;
-    size = atoin (length_str, 5);
-    if (size <= 6)
-        return NULL;
-    if (!(buf = xmalloc (size+1)))
-        return NULL;
-    if (fread (buf+5, 1, size-5, inf) != (size-5))
+    else if (rr->esr->taskSpecificParameters->which == Z_External_itemOrder)
     {
-        xfree (buf);
-        return NULL;
+       Z_ItemOrder *it = rr->esr->taskSpecificParameters->u.itemOrder;
+       yaz_log (LOG_LOG, "Received ItemOrder");
+        if (it->which == Z_IOItemOrder_esRequest)
+       {
+           Z_IORequest *ir = it->u.esRequest;
+           Z_IOOriginPartToKeep *k = ir->toKeep;
+           Z_IOOriginPartNotToKeep *n = ir->notToKeep;
+           
+           if (k && k->contact)
+           {
+               if (k->contact->name)
+                   yaz_log(LOG_LOG, "contact name %s", k->contact->name);
+               if (k->contact->phone)
+                   yaz_log(LOG_LOG, "contact phone %s", k->contact->phone);
+               if (k->contact->email)
+                   yaz_log(LOG_LOG, "contact email %s", k->contact->email);
+           }
+           if (k->addlBilling)
+           {
+               yaz_log(LOG_LOG, "Billing info (not shown)");
+           }
+           
+           if (n->resultSetItem)
+           {
+               yaz_log(LOG_LOG, "resultsetItem");
+               yaz_log(LOG_LOG, "setId: %s", n->resultSetItem->resultSetId);
+               yaz_log(LOG_LOG, "item: %d", *n->resultSetItem->item);
+           }
+           if (n->itemRequest)
+           {
+               Z_External *r = (Z_External*) n->itemRequest;
+               ILL_ItemRequest *item_req = 0;
+               ILL_APDU *ill_apdu = 0;
+               if (r->direct_reference)
+               {
+                   oident *ent = oid_getentbyoid(r->direct_reference);
+                   if (ent)
+                       yaz_log(LOG_LOG, "OID %s", ent->desc);
+                    if (ent && ent->value == VAL_TEXT_XML)
+                    {
+                       yaz_log (LOG_LOG, "ILL XML request");
+                        if (r->which == Z_External_octet)
+                            yaz_log (LOG_LOG, "%.*s", r->u.octet_aligned->len,
+                                     r->u.octet_aligned->buf); 
+                    }
+                   if (ent && ent->value == VAL_ISO_ILL_1)
+                   {
+                       yaz_log (LOG_LOG, "Decode ItemRequest begin");
+                       if (r->which == ODR_EXTERNAL_single)
+                       {
+                           odr_setbuf(rr->decode,
+                                      (char *) r->u.single_ASN1_type->buf,
+                                      r->u.single_ASN1_type->len, 0);
+                           
+                           if (!ill_ItemRequest (rr->decode, &item_req, 0, 0))
+                           {
+                               yaz_log (LOG_LOG,
+                                    "Couldn't decode ItemRequest %s near %d",
+                                       odr_errmsg(odr_geterror(rr->decode)),
+                                       odr_offset(rr->decode));
+                            }
+                           else
+                               yaz_log(LOG_LOG, "Decode ItemRequest OK");
+                           if (rr->print)
+                           {
+                               ill_ItemRequest (rr->print, &item_req, 0,
+                                    "ItemRequest");
+                               odr_reset (rr->print);
+                           }
+                       }
+                       if (!item_req && r->which == ODR_EXTERNAL_single)
+                       {
+                           yaz_log (LOG_LOG, "Decode ILL APDU begin");
+                           odr_setbuf(rr->decode,
+                                      (char*) r->u.single_ASN1_type->buf,
+                                      r->u.single_ASN1_type->len, 0);
+                           
+                           if (!ill_APDU (rr->decode, &ill_apdu, 0, 0))
+                           {
+                               yaz_log (LOG_LOG,
+                                    "Couldn't decode ILL APDU %s near %d",
+                                       odr_errmsg(odr_geterror(rr->decode)),
+                                       odr_offset(rr->decode));
+                                yaz_log(LOG_LOG, "PDU dump:");
+                                odr_dumpBER(yaz_log_file(),
+                                     (char *) r->u.single_ASN1_type->buf,
+                                     r->u.single_ASN1_type->len);
+                            }
+                           else
+                               yaz_log(LOG_LOG, "Decode ILL APDU OK");
+                           if (rr->print)
+                            {
+                               ill_APDU (rr->print, &ill_apdu, 0,
+                                    "ILL APDU");
+                               odr_reset (rr->print);
+                           }
+                       }
+                   }
+               }
+               if (item_req)
+               {
+                   yaz_log (LOG_LOG, "ILL protocol version = %d",
+                            *item_req->protocol_version_num);
+               }
+           }
+            if (k)
+            {
+
+               Z_External *ext = (Z_External *)
+                    odr_malloc (rr->stream, sizeof(*ext));
+               Z_IUOriginPartToKeep *keep = (Z_IUOriginPartToKeep *)
+                    odr_malloc (rr->stream, sizeof(*keep));
+               Z_IOTargetPart *targetPart = (Z_IOTargetPart *)
+                   odr_malloc (rr->stream, sizeof(*targetPart));
+
+               rr->taskPackage = (Z_TaskPackage *)
+                    odr_malloc (rr->stream, sizeof(*rr->taskPackage));
+               rr->taskPackage->packageType =
+                   odr_oiddup (rr->stream, rr->esr->packageType);
+               rr->taskPackage->packageName = 0;
+               rr->taskPackage->userId = 0;
+               rr->taskPackage->retentionTime = 0;
+               rr->taskPackage->permissions = 0;
+               rr->taskPackage->description = 0;
+               rr->taskPackage->targetReference = (Odr_oct *)
+                   odr_malloc (rr->stream, sizeof(Odr_oct));
+               rr->taskPackage->targetReference->buf =
+                   (unsigned char *) odr_strdup (rr->stream, "911");
+               rr->taskPackage->targetReference->len =
+                   rr->taskPackage->targetReference->size =
+                   strlen((char *) (rr->taskPackage->targetReference->buf));
+               rr->taskPackage->creationDateTime = 0;
+               rr->taskPackage->taskStatus = odr_intdup(rr->stream, 0);
+               rr->taskPackage->packageDiagnostics = 0;
+               rr->taskPackage->taskSpecificParameters = ext;
+
+               ext->direct_reference =
+                   odr_oiddup (rr->stream, rr->esr->packageType);
+               ext->indirect_reference = 0;
+               ext->descriptor = 0;
+               ext->which = Z_External_itemOrder;
+               ext->u.itemOrder = (Z_ItemOrder *)
+                   odr_malloc (rr->stream, sizeof(*ext->u.update));
+               ext->u.itemOrder->which = Z_IOItemOrder_taskPackage;
+               ext->u.itemOrder->u.taskPackage =  (Z_IOTaskPackage *)
+                   odr_malloc (rr->stream, sizeof(Z_IOTaskPackage));
+               ext->u.itemOrder->u.taskPackage->originPart = k;
+               ext->u.itemOrder->u.taskPackage->targetPart = targetPart;
+
+                targetPart->itemRequest = 0;
+                targetPart->statusOrErrorReport = 0;
+                targetPart->auxiliaryStatus = 0;
+            }
+       }
     }
-    memcpy (buf, length_str, 5);
-    buf[size] = '\0';
-    return buf;
-}
-
-static char *dummy_database_record (int num)
-{
-    FILE *inf = fopen ("dummy-records", "r");
-    char *buf = 0;
-
-    if (!inf)
-       return NULL;
-    while (--num >= 0)
+    else if (rr->esr->taskSpecificParameters->which == Z_External_update)
     {
-       if (buf)
-          xfree(buf);
-       if (num == 98)
+       Z_IUUpdate *up = rr->esr->taskSpecificParameters->u.update;
+       yaz_log (LOG_LOG, "Received DB Update");
+       if (up->which == Z_IUUpdate_esRequest)
        {
-           assert(buf = xmalloc(2101));
-           memset(buf, 'A', 2100);
-           buf[2100] = '\0';
-           break;
+           Z_IUUpdateEsRequest *esRequest = up->u.esRequest;
+           Z_IUOriginPartToKeep *toKeep = esRequest->toKeep;
+           Z_IUSuppliedRecords *notToKeep = esRequest->notToKeep;
+           
+           yaz_log (LOG_LOG, "action");
+           if (toKeep->action)
+           {
+               switch (*toKeep->action)
+               {
+               case Z_IUOriginPartToKeep_recordInsert:
+                   yaz_log (LOG_LOG, " recordInsert");
+                   break;
+               case Z_IUOriginPartToKeep_recordReplace:
+                   yaz_log (LOG_LOG, " recordReplace");
+                   break;
+               case Z_IUOriginPartToKeep_recordDelete:
+                   yaz_log (LOG_LOG, " recordDelete");
+                   break;
+               case Z_IUOriginPartToKeep_elementUpdate:
+                   yaz_log (LOG_LOG, " elementUpdate");
+                   break;
+               case Z_IUOriginPartToKeep_specialUpdate:
+                   yaz_log (LOG_LOG, " specialUpdate");
+                   break;
+               default:
+                   yaz_log (LOG_LOG, " unknown (%d)", *toKeep->action);
+               }
+           }
+           if (toKeep->databaseName)
+           {
+               yaz_log (LOG_LOG, "database: %s", toKeep->databaseName);
+               if (!strcmp(toKeep->databaseName, "fault"))
+               {
+                   rr->errcode = 109;
+                   rr->errstring = toKeep->databaseName;
+               }
+               if (!strcmp(toKeep->databaseName, "accept"))
+                   rr->errcode = -1;
+           }
+           if (toKeep)
+           {
+               Z_External *ext = (Z_External *)
+                    odr_malloc (rr->stream, sizeof(*ext));
+               Z_IUOriginPartToKeep *keep = (Z_IUOriginPartToKeep *)
+                    odr_malloc (rr->stream, sizeof(*keep));
+               Z_IUTargetPart *targetPart = (Z_IUTargetPart *)
+                   odr_malloc (rr->stream, sizeof(*targetPart));
+
+               rr->taskPackage = (Z_TaskPackage *)
+                    odr_malloc (rr->stream, sizeof(*rr->taskPackage));
+               rr->taskPackage->packageType =
+                   odr_oiddup (rr->stream, rr->esr->packageType);
+               rr->taskPackage->packageName = 0;
+               rr->taskPackage->userId = 0;
+               rr->taskPackage->retentionTime = 0;
+               rr->taskPackage->permissions = 0;
+               rr->taskPackage->description = 0;
+               rr->taskPackage->targetReference = (Odr_oct *)
+                   odr_malloc (rr->stream, sizeof(Odr_oct));
+               rr->taskPackage->targetReference->buf =
+                   (unsigned char *) odr_strdup (rr->stream, "123");
+               rr->taskPackage->targetReference->len =
+                   rr->taskPackage->targetReference->size =
+                   strlen((char *) (rr->taskPackage->targetReference->buf));
+               rr->taskPackage->creationDateTime = 0;
+               rr->taskPackage->taskStatus = odr_intdup(rr->stream, 0);
+               rr->taskPackage->packageDiagnostics = 0;
+               rr->taskPackage->taskSpecificParameters = ext;
+
+               ext->direct_reference =
+                   odr_oiddup (rr->stream, rr->esr->packageType);
+               ext->indirect_reference = 0;
+               ext->descriptor = 0;
+               ext->which = Z_External_update;
+               ext->u.update = (Z_IUUpdate *)
+                   odr_malloc (rr->stream, sizeof(*ext->u.update));
+               ext->u.update->which = Z_IUUpdate_taskPackage;
+               ext->u.update->u.taskPackage =  (Z_IUUpdateTaskPackage *)
+                   odr_malloc (rr->stream, sizeof(Z_IUUpdateTaskPackage));
+               ext->u.update->u.taskPackage->originPart = keep;
+               ext->u.update->u.taskPackage->targetPart = targetPart;
+
+               keep->action = (int *) odr_malloc (rr->stream, sizeof(int));
+               *keep->action = *toKeep->action;
+               keep->databaseName =
+                   odr_strdup (rr->stream, toKeep->databaseName);
+               keep->schema = 0;
+               keep->elementSetName = 0;
+               keep->actionQualifier = 0;
+
+               targetPart->updateStatus = odr_intdup (rr->stream, 1);
+               targetPart->num_globalDiagnostics = 0;
+               targetPart->globalDiagnostics = (Z_DiagRec **) odr_nullval();
+               targetPart->num_taskPackageRecords = 1;
+               targetPart->taskPackageRecords = 
+                    (Z_IUTaskPackageRecordStructure **)
+                    odr_malloc (rr->stream,
+                                sizeof(Z_IUTaskPackageRecordStructure *));
+               targetPart->taskPackageRecords[0] =
+                    (Z_IUTaskPackageRecordStructure *)
+                    odr_malloc (rr->stream,
+                                sizeof(Z_IUTaskPackageRecordStructure));
+                
+               targetPart->taskPackageRecords[0]->which =
+                    Z_IUTaskPackageRecordStructure_record;
+               targetPart->taskPackageRecords[0]->u.record = 
+                    z_ext_record (rr->stream, VAL_SUTRS, "test", 4);
+               targetPart->taskPackageRecords[0]->correlationInfo = 0; 
+               targetPart->taskPackageRecords[0]->recordStatus =
+                    odr_intdup (rr->stream,
+                                Z_IUTaskPackageRecordStructure_success);  
+               targetPart->taskPackageRecords[0]->num_supplementalDiagnostics
+                    = 0;
+
+               targetPart->taskPackageRecords[0]->supplementalDiagnostics = 0;
+            }
+           if (notToKeep)
+           {
+               int i;
+               for (i = 0; i < notToKeep->num; i++)
+               {
+                   Z_External *rec = notToKeep->elements[i]->record;
+
+                   if (rec->direct_reference)
+                   {
+                       struct oident *oident;
+                       oident = oid_getentbyoid(rec->direct_reference);
+                       if (oident)
+                           yaz_log (LOG_LOG, "record %d type %s", i,
+                                    oident->desc);
+                   }
+                   switch (rec->which)
+                   {
+                   case Z_External_sutrs:
+                       if (rec->u.octet_aligned->len > 170)
+                           yaz_log (LOG_LOG, "%d bytes:\n%.168s ...",
+                                    rec->u.sutrs->len,
+                                    rec->u.sutrs->buf);
+                       else
+                           yaz_log (LOG_LOG, "%d bytes:\n%s",
+                                    rec->u.sutrs->len,
+                                    rec->u.sutrs->buf);
+                        break;
+                   case Z_External_octet        :
+                       if (rec->u.octet_aligned->len > 170)
+                           yaz_log (LOG_LOG, "%d bytes:\n%.168s ...",
+                                    rec->u.octet_aligned->len,
+                                    rec->u.octet_aligned->buf);
+                       else
+                           yaz_log (LOG_LOG, "%d bytes\n%s",
+                                    rec->u.octet_aligned->len,
+                                    rec->u.octet_aligned->buf);
+                   }
+               }
+           }
        }
-       else
-           buf = marc_read (inf);
-       if (!num || !buf)
-           break;
     }
-    fclose(inf);
-    if (num < 0)
-       return 0;
-    return buf;
+    else
+    {
+        yaz_log (LOG_WARN, "Unknown Extended Service(%d)",
+                rr->esr->taskSpecificParameters->which);
+       
+    }
+    return 0;
 }
 
-static Z_GenericRecord *dummy_grs_record (int num, ODR o)
+/* result set delete */
+int ztest_delete (void *handle, bend_delete_rr *rr)
 {
-    FILE *f = fopen("dummy-grs", "r");
-    char line[512];
-    Z_GenericRecord *r = 0;
-    int n;
+    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;
+}
 
-    if (!f)
-       return 0;
-    while (fgets(line, 512, f))
-       if (*line == '#' && sscanf(line, "#%d", &n) == 1 && n == num)
-       {
-           r = read_grs1(f, o);
-           break;
-       }
-    fclose(f);
-    return r;
+/* 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;
 }
 
-bend_fetchresult *bend_fetch(void *handle, bend_fetchrequest *q, int *num)
+
+/* present request handler */
+int ztest_present (void *handle, bend_present_rr *rr)
 {
-    static bend_fetchresult r;
-    static char *bbb = 0;
+    return 0;
+}
 
-    r.errstring = 0;
-    r.last_in_set = 0;
-    r.basename = "DUMMY";
-    if (bbb)
-    {
-    xfree(bbb);
-       bbb = 0;
-    }
-    
-    if (q->format == VAL_SUTRS)
+/* retrieval of a single record (present, and piggy back search) */
+int ztest_fetch(void *handle, bend_fetch_rr *r)
+{
+    char *cp;
+    r->errstring = 0;
+    r->last_in_set = 0;
+    r->basename = "Default";
+    r->output_format = r->request_format;  
+    if (r->request_format == VAL_SUTRS)
     {
+        /* this section returns a small record */
        char buf[100];
+        
+       sprintf(buf, "This is dummy SUTRS record number %d\n", r->number);
 
-       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->len = strlen(buf);
+       r->record = (char *) odr_malloc (r->stream, r->len+1);
+       strcpy(r->record, buf);
     }
-#if 0
-    else if (q->format == VAL_GRS1)
+    else if (r->request_format == VAL_GRS1)
     {
-       Z_GenericRecord *rec = odr_malloc(q->stream, sizeof(*rec));
-       Z_TaggedElement *t1 = odr_malloc(q->stream, sizeof(*t1));
-       Z_StringOrNumeric *s1 = odr_malloc(q->stream, sizeof(*s1));
-       Z_ElementData *c1 = odr_malloc(q->stream, sizeof(*c1));
-
-       rec->elements = odr_malloc(q->stream, sizeof(Z_TaggedElement*)*10);
-       rec->num_elements = 1;
-       rec->elements[0] = t1 ;
-       t1->tagType = odr_malloc(q->stream, sizeof(int));
-       *t1->tagType = 3;
-       t1->tagValue = s1;
-       s1->which = Z_StringOrNumeric_string;
-       s1->u.string = "title";
-       t1->tagOccurrence = 0;
-       t1->content = c1;
-       c1->which = Z_ElementData_string;
-       c1->u.string = "The Bad Seed and The Ugly Duckling";
-       t1->metaData = 0;
-       t1->appliedVariant = 0;
-       r.record = (char*) rec;
-       r.len = -1;
+       r->len = -1;
+       r->record = (char*) dummy_grs_record(r->number, r->stream);
+       if (!r->record)
+       {
+           r->errcode = 13;
+           return 0;
+       }
     }
-#endif
-    else if (q->format == VAL_GRS1)
+    else if (r->request_format == VAL_POSTSCRIPT)
     {
-       r.len = -1;
-       r.record = (char*) dummy_grs_record(q->number, q->stream);
-       if (!r.record)
+        char fname[20];
+        FILE *f;
+        long size;
+
+        sprintf (fname, "part.%d.ps", r->number);
+        f = fopen(fname, "rb");
+        if (!f)
        {
-           r.errcode = 13;
-           return &r;
-       }
+            r->errcode = 13;
+            return 0;
+        }
+        fseek (f, 0L, SEEK_END);
+        size = ftell (f);
+        if (size <= 0 || size >= 5000000)
+        {
+            r->errcode = 14;
+            return 0;
+        }
+        fseek (f, 0L, SEEK_SET);
+        r->record = (char*) odr_malloc (r->stream, size);
+        r->len = size;
+        r->output_format = VAL_POSTSCRIPT;
+        fread (r->record, size, 1, f);
+        fclose (f);
+    }
+    else if (r->request_format == VAL_TEXT_XML &&
+             (cp = dummy_xml_record (r->number, r->stream)))
+    {
+        r->len = strlen(cp);
+        r->record = cp;
+        r->output_format = VAL_TEXT_XML;
     }
-    else if (!(r.record = bbb = dummy_database_record(q->number)))
+    else if ((cp = dummy_marc_record(r->number, r->stream)))
     {
-       r.errcode = 13;
-       return &r;
+       r->len = strlen(cp);
+       r->record = cp;
+       r->output_format = VAL_USMARC;
     }
     else
-       r.len = strlen(r.record);
-    r.format = q->format;
-    r.errcode = 0;
-    return &r;
-}
-
-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 = 13;
+       return 0;
     }
-    r.errcode = 0;
-    r.errstring = 0;
-    return &r;
+    r->errcode = 0;
+    return 0;
 }
-#else
+
 /*
  * silly dummy-scan what reads words from a file.
  */
-bend_scanresult *bend_scan(void *handle, bend_scanrequest *q, int *num)
+int ztest_scan(void *handle, bend_scan_rr *q)
 {
-    static bend_scanresult r;
     static FILE *f = 0;
     static struct scan_entry list[200];
     static char entries[200][80];
     int hits[200];
     char term[80], *p;
     int i, pos;
+    int term_position_req = q->term_position;
+    int num_entries_req = q->num_entries;
 
-    r.errstring = 0;
-    r.entries = list;
-    r.status = BEND_SCAN_SUCCESS;
+    q->errcode = 0;
+    q->errstring = 0;
+    q->entries = list;
+    q->status = BEND_SCAN_SUCCESS;
     if (!f && !(f = fopen("dummy-words", "r")))
     {
        perror("dummy-words");
@@ -240,18 +523,23 @@ bend_scanresult *bend_scan(void *handle, bend_scanrequest *q, int *num)
     }
     if (q->term->term->which != Z_Term_general)
     {
-       r.errcode = 229; /* unsupported term type */
-       return &r;
+       q->errcode = 229; /* unsupported term type */
+       return 0;
+    }
+    if (*q->step_size != 0)
+    {
+       q->errcode = 205; /*Only zero step size supported for Scan */
+       return 0;
     }
     if (q->term->term->u.general->len >= 80)
     {
-       r.errcode = 11; /* term too long */
-       return &r;
+       q->errcode = 11; /* term too long */
+       return 0;
     }
     if (q->num_entries > 200)
     {
-       r.errcode = 31;
-       return &r;
+       q->errcode = 31;
+       return 0;
     }
     memcpy(term, q->term->term->u.general->buf, q->term->term->u.general->len);
     term[q->term->term->u.general->len] = '\0';
@@ -259,111 +547,82 @@ bend_scanresult *bend_scan(void *handle, bend_scanrequest *q, int *num)
        if (islower(*p))
            *p = toupper(*p);
 
-    fseek(f, 0, 0);
-    r.num_entries = 0;
+    fseek(f, 0, SEEK_SET);
+    q->num_entries = 0;
+
     for (i = 0, pos = 0; fscanf(f, " %79[^:]:%d", entries[pos], &hits[pos]) == 2;
        i++, pos < 199 ? pos++ : (pos = 0))
     {
-       if (!r.num_entries && strcmp(entries[pos], term) >= 0) /* s-point fnd */
+       if (!q->num_entries && strcmp(entries[pos], term) >= 0) /* s-point fnd */
        {
-           if ((r.term_position = q->term_position) > i + 1)
+           if ((q->term_position = term_position_req) > i + 1)
            {
-               r.term_position = i + 1;
-               r.status = BEND_SCAN_PARTIAL;
+               q->term_position = i + 1;
+               q->status = BEND_SCAN_PARTIAL;
            }
-           for (; r.num_entries < r.term_position; r.num_entries++)
+           for (; q->num_entries < q->term_position; q->num_entries++)
            {
                int po;
 
-               po = pos - r.term_position + r.num_entries + 1; /* find pos */
+               po = pos - q->term_position + q->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") && q->num_entries == 2)
+               {
+                   list[q->num_entries].term = entries[pos];
+                   list[q->num_entries].occurrences = -1;
+                   list[q->num_entries].errcode = 233;
+                   list[q->num_entries].errstring = "SD for Scan Term";
+               }
+               else
+               {
+                   list[q->num_entries].term = entries[po];
+                   list[q->num_entries].occurrences = hits[po];
+               }
            }
        }
-       else if (r.num_entries)
+       else if (q->num_entries)
        {
-           list[r.num_entries].term = entries[pos];
-           list[r.num_entries].occurrences = hits[pos];
-           r.num_entries++;
+           list[q->num_entries].term = entries[pos];
+           list[q->num_entries].occurrences = hits[pos];
+           q->num_entries++;
        }
-       if (r.num_entries >= q->num_entries)
+       if (q->num_entries >= num_entries_req)
            break;
     }
     if (feof(f))
-       r.status = BEND_SCAN_PARTIAL;
-    return &r;
+       q->status = BEND_SCAN_PARTIAL;
+    return 0;
 }
 
-#endif
+bend_initresult *bend_init(bend_initrequest *q)
+{
+    bend_initresult *r = (bend_initresult *)
+        odr_malloc (q->stream, sizeof(*r));
+    int *counter = (int *) xmalloc (sizeof(int));
+
+    *counter = 0;
+    r->errcode = 0;
+    r->errstring = 0;
+    r->handle = counter;         /* user handle, in this case a simple int */
+    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;
+    q->bend_delete = ztest_delete;
+    q->bend_fetch = ztest_fetch;
+    q->bend_scan = ztest_scan;
+    return r;
+}
 
 void bend_close(void *handle)
 {
+    xfree (handle);              /* release our user-defined handle */
     return;
 }
 
-typedef struct _Args
-{
-    char **argv;
-    int argc;
-} Args; 
-
-static Args ArgDetails;
-
-/* name of the executable */
-#define SZAPPNAME            "server"
-
-/* internal name of the service */
-#define SZSERVICENAME        "Z3950 Test Server"
-
-/* displayed name of the service */
-#define SZSERVICEDISPLAYNAME "Z3950 Test Server"
-
-/* list of service dependencies - "dep1\0dep2\0\0" */
-#define SZDEPENDENCIES       ""
-
 int main(int argc, char **argv)
 {
-    /* Lets setup the Arg structure */
-    ArgDetails.argc = argc;
-    ArgDetails.argv = argv;
-
-#ifdef WIN32
-
-    /* Now setup the service with the service controller */
-    SetupService(argc, argv, &ArgDetails, SZAPPNAME, SZSERVICENAME, SZSERVICEDISPLAYNAME, SZDEPENDENCIES);
-
-#else /* WIN32 */
-
-    /* The service controller does the following for us under windows */
-    if (StartAppService(NULL, argc, argv))
-        RunAppService(NULL);
-
-    /* Ensure the service has been stopped */
-    StopAppService(NULL);
-
-#endif /* WIN32 */
-
-    return(0);
-}
-
-int StartAppService(void *pHandle, int argc, char **argv)
-{
-    /* Initializes the App */
-    return 1;
-}
-
-void RunAppService(void *pHandle)
-{
-    Args *pArgs = (Args *)pHandle;
-
-    /* Starts the app running */
-    statserv_main(pArgs->argc, pArgs->argv);
-}
-
-void StopAppService(void *pHandle)
-{
-    /* Stops the app */
-    statserv_closedown();
+    return statserv_main(argc, argv, bend_init, bend_close);
 }