Corrected a memory leak, one more to go.
[simpleserver-moved-to-github.git] / SimpleServer.c
index 80dd5c7..9756c54 100644 (file)
@@ -7,6 +7,55 @@
  */
 
 #line 1 "SimpleServer.xs"
+/*
+ * Copyright (c) 2000, Index Data.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation, in whole or in part, for any purpose, is hereby granted,
+ * provided that:
+ *
+ * 1. This copyright and permission notice appear in all copies of the
+ * software and its documentation. Notices of copyright or attribution
+ * which appear at the beginning of any file must remain unchanged.
+ *
+ * 2. The name of Index Data or the individual authors may not be used to
+ * endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
+ * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+/*$Log: SimpleServer.c,v $
+/*Revision 1.13  2001-08-30 13:15:11  sondberg
+/*Corrected a memory leak, one more to go.
+/*
+/*Revision 1.10  2001/08/29 11:48:36  sondberg
+/*Added routines
+/*
+/*     Net::Z3950::SimpleServer::ScanSuccess
+/*     Net::Z3950::SimpleServer::ScanPartial
+/*
+/*and a bit of documentation.
+/*
+/*Revision 1.9  2001/08/24 14:00:20  sondberg
+/*Added support for scan.
+/*
+/*Revision 1.8  2001/05/21 11:07:02  sondberg
+/*Extended maximum numbers of GRS-1 elements. Should be done dynamically.
+/*
+/*Revision 1.7  2001/03/13 14:17:15  sondberg
+/*Added support for GRS-1.
+/**/
+
+
 #include "EXTERN.h"
 #include "perl.h"
 #include "XSUB.h"
 #include <yaz/log.h>
 #include <yaz/wrbuf.h>
 #include <stdio.h>
+#include <unistd.h>
 #include <stdlib.h>
 #include <ctype.h>
+#define GRS_MAX_FIELDS 500 
 #ifdef ASN_COMPILED
 #include <yaz/ill.h>
 #endif
-
+#ifndef sv_undef               /* To fix the problem with Perl 5.6.0 */
+#define sv_undef PL_sv_undef
+#endif
 
 typedef struct {
        SV *handle;
@@ -46,6 +99,100 @@ SV *delete_ref = NULL;
 SV *scan_ref = NULL;
 int MAX_OID = 15;
 
+
+Z_GenericRecord *read_grs1(char *str, ODR o)
+{
+       int type, ivalue;
+       char line[512], *buf, *ptr, *original;
+       char value[512];
+       Z_GenericRecord *r = 0;
+
+       original = str;
+       for (;;)
+       {
+               Z_TaggedElement *t;
+               Z_ElementData *c;
+       
+               ptr = strchr(str, '\n');
+               if (!ptr) {
+                       return r;
+               }
+               strncpy(line, str, ptr - str);
+               line[ptr - str] = 0;
+               buf = line;
+               str = ptr + 1;
+               while (*buf && isspace(*buf))
+                       buf++;
+               if (*buf == '}') {
+                       memmove(original, str, strlen(str));
+                       return r;
+               }
+               if (sscanf(buf, "(%d,%[^)])", &type, value) != 2)
+               {
+                       yaz_log(LOG_WARN, "Bad data in '%s'", buf);
+                       return 0;
+               }
+               if (!type && *value == '0')
+                       return r;
+               if (!(buf = strchr(buf, ')')))
+                       return 0;
+               buf++;
+               while (*buf && isspace(*buf))
+                       buf++;
+               if (!*buf)
+                       return 0;
+               if (!r)
+               {
+                       r = (Z_GenericRecord *)odr_malloc(o, sizeof(*r));
+                       r->elements = (Z_TaggedElement **)
+                       odr_malloc(o, sizeof(Z_TaggedElement*) * GRS_MAX_FIELDS);
+                       r->num_elements = 0;
+               }
+               if (r->num_elements > GRS_MAX_FIELDS)
+               {
+                       yaz_log(LOG_WARN, "Max number of GRS-1 elements exceeded [GRS_MAX_FIELDS=%d]", GRS_MAX_FIELDS);
+                       exit(0);
+               }
+               r->elements[r->num_elements] = t = (Z_TaggedElement *) odr_malloc(o, sizeof(Z_TaggedElement));
+               t->tagType = (int *)odr_malloc(o, sizeof(int));
+               *t->tagType = type;
+               t->tagValue = (Z_StringOrNumeric *)
+                       odr_malloc(o, sizeof(Z_StringOrNumeric));
+               if ((ivalue = atoi(value)))
+               {
+                       t->tagValue->which = Z_StringOrNumeric_numeric;
+                       t->tagValue->u.numeric = (int *)odr_malloc(o, sizeof(int));
+                       *t->tagValue->u.numeric = ivalue;
+               }
+               else
+               {
+                       t->tagValue->which = Z_StringOrNumeric_string;
+                       t->tagValue->u.string = (char *)odr_malloc(o, strlen(value)+1);
+                       strcpy(t->tagValue->u.string, value);
+               }
+               t->tagOccurrence = 0;
+               t->metaData = 0;
+               t->appliedVariant = 0;
+               t->content = c = (Z_ElementData *)odr_malloc(o, sizeof(Z_ElementData));
+               if (*buf == '{')
+               {
+                       c->which = Z_ElementData_subtree;
+                       c->u.subtree = read_grs1(str, o);
+               }
+               else
+               {
+                       c->which = Z_ElementData_string;
+/*                     buf[strlen(buf)-1] = '\0';*/
+                       buf[strlen(buf)] = '\0';
+                       c->u.string = odr_strdup(o, buf);
+               }
+               r->num_elements++;
+       }
+}
+
+
+
+
 static void oid2str(Odr_oid *o, WRBUF buf)
 {
     for (; *o >= 0; o++) {
@@ -140,8 +287,75 @@ WRBUF zquery2pquery(Z_Query *q)
 
 int bend_sort(void *handle, bend_sort_rr *rr)
 {
-       perl_call_sv(sort_ref, G_VOID | G_DISCARD | G_NOARGS);
-       return;
+       HV *href;
+       AV *aref;
+       SV **temp;
+       SV *err_code;
+       SV *err_str;
+       SV *status;
+       STRLEN len;
+       char *ptr;
+       char *ODR_err_str;
+       char **input_setnames;
+       Zfront_handle *zhandle = (Zfront_handle *)handle;
+       int i;
+       
+       dSP;
+       ENTER;
+       SAVETMPS;
+       
+       aref = newAV();
+       input_setnames = rr->input_setnames;
+       for (i = 0; i < rr->num_input_setnames; i++)
+       {
+               av_push(aref, newSVpv(*input_setnames++, 0));
+       }
+       href = newHV();
+       hv_store(href, "INPUT", 5, newRV( (SV*) aref), 0);
+       hv_store(href, "OUTPUT", 6, newSVpv(rr->output_setname, 0), 0);
+       hv_store(href, "HANDLE", 6, zhandle->handle, 0);
+       hv_store(href, "STATUS", 6, newSViv(0), 0);
+
+       PUSHMARK(sp);
+
+       XPUSHs(sv_2mortal(newRV( (SV*) href)));
+
+       PUTBACK;
+
+       perl_call_sv(sort_ref, G_SCALAR | G_DISCARD);
+
+       SPAGAIN;
+
+       temp = hv_fetch(href, "ERR_CODE", 8, 1);
+       err_code = newSVsv(*temp);
+
+       temp = hv_fetch(href, "ERR_STR", 7, 1);
+       err_str = newSVsv(*temp);
+
+       temp = hv_fetch(href, "STATUS", 6, 1);
+       status = newSVsv(*temp);
+
+
+       
+
+       PUTBACK;
+       FREETMPS;
+       LEAVE;
+
+       hv_undef(href),
+       av_undef(aref);
+       rr->errcode = SvIV(err_code);
+       rr->sort_status = SvIV(status);
+       ptr = SvPV(err_str, len);
+       ODR_err_str = (char *)odr_malloc(rr->stream, len + 1);
+       strcpy(ODR_err_str, ptr);
+       rr->errstring = ODR_err_str;
+
+       sv_free(err_code);
+       sv_free(err_str);
+       sv_free(status);
+       
+       return 0;
 }
 
 
@@ -182,6 +396,7 @@ int bend_search(void *handle, bend_search_rr *rr)
        hv_store(href, "HITS", 4, newSViv(0), 0);
        hv_store(href, "DATABASES", 9, newRV( (SV*) aref), 0);
        hv_store(href, "HANDLE", 6, zhandle->handle, 0);
+       hv_store(href, "PID", 3, newSViv(getpid()), 0);
        query = zquery2pquery(rr->query);
        if (query)
        {
@@ -310,7 +525,6 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
        HV *href;
        SV **temp;
        SV *basename;
-       SV *len;
        SV *record;
        SV *last;
        SV *err_code;
@@ -323,13 +537,13 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
        char *ODR_basename;
        char *ODR_errstr;
        int *ODR_oid_buf;
+       oident *oid;
        WRBUF oid_dotted;
        Zfront_handle *zhandle = (Zfront_handle *)handle;
 
        Z_RecordComposition *composition;
        Z_ElementSetNames *simple;
        STRLEN length;
-       int oid;
 
        dSP;
        ENTER;
@@ -343,20 +557,20 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
        hv_store(href, "REQ_FORM", 8, newSVpv((char *)oid_dotted->buf, oid_dotted->pos), 0);
        hv_store(href, "REP_FORM", 8, newSVpv((char *)oid_dotted->buf, oid_dotted->pos), 0);
        hv_store(href, "BASENAME", 8, newSVpv("", 0), 0);
-       hv_store(href, "LEN", 3, newSViv(0), 0);
        hv_store(href, "RECORD", 6, newSVpv("", 0), 0);
        hv_store(href, "LAST", 4, newSViv(0), 0);
        hv_store(href, "ERR_CODE", 8, newSViv(0), 0);
        hv_store(href, "ERR_STR", 7, newSVpv("", 0), 0);
        hv_store(href, "SUR_FLAG", 8, newSViv(0), 0);
        hv_store(href, "HANDLE", 6, zhandle->handle, 0);
+       hv_store(href, "PID", 3, newSViv(getpid()), 0);
        if (rr->comp)
        {
                composition = rr->comp;
-               if (composition->which == 1)
+               if (composition->which == Z_RecordComp_simple)
                {
                        simple = composition->u.simple;
-                       if (simple->which == 1)
+                       if (simple->which == Z_ElementSetNames_generic)
                        {
                                hv_store(href, "COMP", 4, newSVpv(simple->u.generic, 0), 0);
                        } 
@@ -384,9 +598,6 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
        temp = hv_fetch(href, "BASENAME", 8, 1);
        basename = newSVsv(*temp);
 
-       temp = hv_fetch(href, "LEN", 3, 1);
-       len = newSVsv(*temp);
-
        temp = hv_fetch(href, "RECORD", 6, 1);
        record = newSVsv(*temp);
 
@@ -427,13 +638,20 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
        }
        rr->output_format_raw = ODR_oid_buf;    
        
-       rr->len = SvIV(len);
-
        ptr = SvPV(record, length);
-       ODR_record = (char *)odr_malloc(rr->stream, length + 1);
-       strcpy(ODR_record, ptr);
-       rr->record = ODR_record;
-
+       oid = oid_getentbyoid(ODR_oid_buf);
+       if (oid->value == VAL_GRS1)             /* Treat GRS-1 records separately */
+       {
+               rr->record = (char *) read_grs1(ptr, rr->stream);
+               rr->len = -1;
+       }
+       else
+       {
+               ODR_record = (char *)odr_malloc(rr->stream, length + 1);
+               strcpy(ODR_record, ptr);
+               rr->record = ODR_record;
+               rr->len = length;
+       }
        zhandle->handle = point;
        handle = zhandle;
        rr->last_in_set = SvIV(last);
@@ -448,11 +666,9 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
        }
        rr->surrogate_flag = SvIV(sur_flag);
 
-       /*sv_free(point);*/
        wrbuf_free(oid_dotted, 1);
        sv_free((SV*) href);
        sv_free(basename);
-       sv_free(len);
        sv_free(record);
        sv_free(last);
        sv_free(err_string);
@@ -467,34 +683,43 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
 int bend_present(void *handle, bend_present_rr *rr)
 {
 
-       int n;
        HV *href;
        SV **temp;
        SV *err_code;
        SV *err_string;
+       SV *hits;
+       SV *point;
        STRLEN len;
        Z_RecordComposition *composition;
        Z_ElementSetNames *simple;
        char *ODR_errstr;
        char *ptr;
+       Zfront_handle *zhandle = (Zfront_handle *)handle;
+
+/*     WRBUF oid_dotted; */
 
        dSP;
        ENTER;
        SAVETMPS;
 
        href = newHV();
+        hv_store(href, "HANDLE", 6, zhandle->handle, 0);
        hv_store(href, "ERR_CODE", 8, newSViv(0), 0);
        hv_store(href, "ERR_STR", 7, newSVpv("", 0), 0);
        hv_store(href, "START", 5, newSViv(rr->start), 0);
        hv_store(href, "SETNAME", 7, newSVpv(rr->setname, 0), 0);
        hv_store(href, "NUMBER", 6, newSViv(rr->number), 0);
+       /*oid_dotted = oid2dotted(rr->request_format_raw);
+        hv_store(href, "REQ_FORM", 8, newSVpv((char *)oid_dotted->buf, oid_dotted->pos), 0);*/
+       hv_store(href, "HITS", 4, newSViv(0), 0);
+       hv_store(href, "PID", 3, newSViv(getpid()), 0);
        if (rr->comp)
        {
                composition = rr->comp;
-               if (composition->which == 1)
+               if (composition->which == Z_RecordComp_simple)
                {
                        simple = composition->u.simple;
-                       if (simple->which == 1)
+                       if (simple->which == Z_ElementSetNames_generic)
                        {
                                hv_store(href, "COMP", 4, newSVpv(simple->u.generic, 0), 0);
                        } 
@@ -517,7 +742,7 @@ int bend_present(void *handle, bend_present_rr *rr)
        
        PUTBACK;
        
-       n = perl_call_sv(present_ref, G_SCALAR | G_DISCARD);
+       perl_call_sv(present_ref, G_SCALAR | G_DISCARD);
        
        SPAGAIN;
 
@@ -527,20 +752,30 @@ int bend_present(void *handle, bend_present_rr *rr)
        temp = hv_fetch(href, "ERR_STR", 7, 1);
        err_string = newSVsv(*temp);
 
+       temp = hv_fetch(href, "HITS", 4, 1);
+       hits = newSVsv(*temp);
+
+       temp = hv_fetch(href, "HANDLE", 6, 1);
+       point = newSVsv(*temp);
+
        PUTBACK;
        FREETMPS;
        LEAVE;
        
        hv_undef(href);
        rr->errcode = SvIV(err_code);
+       rr->hits = SvIV(hits);
 
        ptr = SvPV(err_string, len);
        ODR_errstr = (char *)odr_malloc(rr->stream, len + 1);
        strcpy(ODR_errstr, ptr);
        rr->errstring = ODR_errstr;
-
+/*     wrbuf_free(oid_dotted, 1);*/
+       zhandle->handle = point;
+       handle = zhandle;
        sv_free(err_code);
        sv_free(err_string);
+       sv_free(hits);
        sv_free( (SV*) href);
 
        return 0;
@@ -563,8 +798,130 @@ int bend_delete(void *handle, bend_delete_rr *rr)
 
 int bend_scan(void *handle, bend_scan_rr *rr)
 {
-       perl_call_sv(scan_ref, G_VOID | G_DISCARD | G_NOARGS);
-       return 0;
+        HV *href;
+       AV *aref;
+       AV *list;
+       AV *entries;
+       HV *scan_item;
+       struct scan_entry *scan_list;
+       struct scan_entry *buffer;
+       int *step_size = rr->step_size;
+       int i;
+       char **basenames;
+       SV **temp;
+       SV *err_code = sv_newmortal();
+       SV *err_str = sv_newmortal();
+       SV *point = sv_newmortal();
+       SV *status = sv_newmortal();
+       SV *number = sv_newmortal();
+       char *ptr;
+       char *ODR_errstr;
+       STRLEN len;
+       int term_len;
+       SV *term_tmp;
+       
+       Zfront_handle *zhandle = (Zfront_handle *)handle;
+
+       dSP;
+       ENTER;
+       SAVETMPS;
+       href = newHV();
+       list = newAV();
+       if (rr->term->term->which == Z_Term_general)
+       {
+               term_len = rr->term->term->u.general->len;
+               hv_store(href, "TERM", 4, newSVpv(rr->term->term->u.general->buf, term_len), 0);
+       } else {
+               rr->errcode = 229;      /* Unsupported term type */
+               return 0;
+       }
+       hv_store(href, "STEP", 4, newSViv(*step_size), 0);
+       hv_store(href, "NUMBER", 6, newSViv(rr->num_entries), 0);
+       hv_store(href, "POS", 3, newSViv(rr->term_position), 0);
+       hv_store(href, "ERR_CODE", 8, newSViv(0), 0);
+       hv_store(href, "ERR_STR", 7, newSVpv("", 0), 0);
+       hv_store(href, "HANDLE", 6, zhandle->handle, 0);
+       hv_store(href, "STATUS", 6, newSViv(BEND_SCAN_SUCCESS), 0);
+       hv_store(href, "ENTRIES", 7, newRV((SV *) list), 0);
+        aref = newAV();
+        basenames = rr->basenames;
+        for (i = 0; i < rr->num_bases; i++)
+        {
+                av_push(aref, newSVpv(*basenames++, 0));
+        }
+       hv_store(href, "DATABASES", 9, newRV( (SV*) aref), 0);
+
+       PUSHMARK(sp);
+
+       XPUSHs(sv_2mortal(newRV( (SV*) href)));
+
+       PUTBACK;
+
+       perl_call_sv(scan_ref, G_SCALAR | G_DISCARD);
+
+       SPAGAIN;
+
+       temp = hv_fetch(href, "ERR_CODE", 8, 1);
+       err_code = newSVsv(*temp);
+
+       temp = hv_fetch(href, "ERR_STR", 7, 1);
+       err_str = newSVsv(*temp);
+
+       temp = hv_fetch(href, "HANDLE", 6, 1);
+       point = newSVsv(*temp);
+
+       temp = hv_fetch(href, "STATUS", 6, 1);
+       status = newSVsv(*temp);
+       
+       temp = hv_fetch(href, "NUMBER", 6, 1);
+       number = newSVsv(*temp);
+
+       temp = hv_fetch(href, "ENTRIES", 7, 1);
+       entries = (AV *)SvRV(newSVsv(*temp));
+
+       PUTBACK;
+       FREETMPS;
+       LEAVE;
+
+       ptr = SvPV(err_str, len);
+       ODR_errstr = (char *)odr_malloc(rr->stream, len + 1);
+       strcpy(ODR_errstr, ptr);
+       rr->errstring = ODR_errstr;
+       rr->errcode = SvIV(err_code);
+       rr->num_entries = SvIV(number);
+       rr->status = SvIV(status);
+        scan_list = (struct scan_entry *) odr_malloc (rr->stream, rr->num_entries * sizeof(*scan_list));
+       buffer = scan_list;
+       for (i = 0; i < rr->num_entries; i++)
+       {
+               scan_item = (HV *)SvRV_noinc(sv_2mortal(av_shift(entries)));
+               temp = hv_fetch(scan_item, "TERM", 4, 1);
+               ptr = SvPV(*temp, len);
+               buffer->term = (char *) odr_malloc (rr->stream, len + 1); 
+               strcpy(buffer->term, ptr);
+               temp = hv_fetch(scan_item, "OCCURRENCE", 10, 1); 
+               buffer->occurrences = SvIV(*temp);
+               buffer++;
+               hv_undef(scan_item);
+               /*sv_free((SV *)scan_item);*/
+       }
+       rr->entries = scan_list;
+       zhandle->handle = point;
+       handle = zhandle;
+       sv_free(err_code);
+       sv_free(err_str);
+       sv_free(status);
+       sv_free(number);
+       hv_undef(href);
+       sv_free((SV *)href);
+       av_undef(aref);
+       sv_free((SV *)aref);
+       av_undef(list);
+       sv_free((SV *)list);
+       av_undef(entries);
+       sv_free((SV *)entries);
+
+        return 0;
 }
 
 
@@ -594,19 +951,27 @@ bend_initresult *bend_init(bend_initrequest *q)
        {
                q->bend_search = bend_search;
        }
-       /*q->bend_present = present;*/
+       if (present_ref)
+       {
+               q->bend_present = bend_present;
+       }
        /*q->bend_esrequest = bend_esrequest;*/
        /*q->bend_delete = bend_delete;*/
        if (fetch_ref)
        {
                q->bend_fetch = bend_fetch;
        }
-       /*q->bend_scan = bend_scan;*/
+       if (scan_ref)
+       {
+               q->bend_scan = bend_scan;
+       }
                href = newHV(); 
        hv_store(href, "IMP_NAME", 8, newSVpv("", 0), 0);
        hv_store(href, "IMP_VER", 7, newSVpv("", 0), 0);
        hv_store(href, "ERR_CODE", 8, newSViv(0), 0);
+       hv_store(href, "PEER_NAME", 9, newSVpv(q->peer_name, 0), 0);
        hv_store(href, "HANDLE", 6, newSVsv(&sv_undef), 0);
+       hv_store(href, "PID", 3, newSViv(getpid()), 0);
 
        PUSHMARK(sp);   
 
@@ -690,7 +1055,7 @@ void bend_close(void *handle)
 }
 
 
-#line 694 "SimpleServer.c"
+#line 1056 "SimpleServer.c"
 XS(XS_Net__Z3950__SimpleServer_set_init_handler)
 {
     dXSARGS;
@@ -698,9 +1063,9 @@ XS(XS_Net__Z3950__SimpleServer_set_init_handler)
        croak("Usage: Net::Z3950::SimpleServer::set_init_handler(arg)");
     {
        SV *    arg = ST(0);
-#line 690 "SimpleServer.xs"
+#line 1052 "SimpleServer.xs"
                init_ref = newSVsv(arg);
-#line 704 "SimpleServer.c"
+#line 1066 "SimpleServer.c"
     }
     XSRETURN_EMPTY;
 }
@@ -712,9 +1077,9 @@ XS(XS_Net__Z3950__SimpleServer_set_close_handler)
        croak("Usage: Net::Z3950::SimpleServer::set_close_handler(arg)");
     {
        SV *    arg = ST(0);
-#line 697 "SimpleServer.xs"
+#line 1059 "SimpleServer.xs"
                close_ref = newSVsv(arg);
-#line 718 "SimpleServer.c"
+#line 1080 "SimpleServer.c"
     }
     XSRETURN_EMPTY;
 }
@@ -726,9 +1091,9 @@ XS(XS_Net__Z3950__SimpleServer_set_sort_handler)
        croak("Usage: Net::Z3950::SimpleServer::set_sort_handler(arg)");
     {
        SV *    arg = ST(0);
-#line 704 "SimpleServer.xs"
+#line 1066 "SimpleServer.xs"
                sort_ref = newSVsv(arg);
-#line 732 "SimpleServer.c"
+#line 1094 "SimpleServer.c"
     }
     XSRETURN_EMPTY;
 }
@@ -740,9 +1105,9 @@ XS(XS_Net__Z3950__SimpleServer_set_search_handler)
        croak("Usage: Net::Z3950::SimpleServer::set_search_handler(arg)");
     {
        SV *    arg = ST(0);
-#line 710 "SimpleServer.xs"
+#line 1072 "SimpleServer.xs"
                search_ref = newSVsv(arg);
-#line 746 "SimpleServer.c"
+#line 1108 "SimpleServer.c"
     }
     XSRETURN_EMPTY;
 }
@@ -754,9 +1119,9 @@ XS(XS_Net__Z3950__SimpleServer_set_fetch_handler)
        croak("Usage: Net::Z3950::SimpleServer::set_fetch_handler(arg)");
     {
        SV *    arg = ST(0);
-#line 717 "SimpleServer.xs"
+#line 1079 "SimpleServer.xs"
                fetch_ref = newSVsv(arg);
-#line 760 "SimpleServer.c"
+#line 1122 "SimpleServer.c"
     }
     XSRETURN_EMPTY;
 }
@@ -768,9 +1133,9 @@ XS(XS_Net__Z3950__SimpleServer_set_present_handler)
        croak("Usage: Net::Z3950::SimpleServer::set_present_handler(arg)");
     {
        SV *    arg = ST(0);
-#line 724 "SimpleServer.xs"
+#line 1086 "SimpleServer.xs"
                present_ref = newSVsv(arg);
-#line 774 "SimpleServer.c"
+#line 1136 "SimpleServer.c"
     }
     XSRETURN_EMPTY;
 }
@@ -782,9 +1147,9 @@ XS(XS_Net__Z3950__SimpleServer_set_esrequest_handler)
        croak("Usage: Net::Z3950::SimpleServer::set_esrequest_handler(arg)");
     {
        SV *    arg = ST(0);
-#line 731 "SimpleServer.xs"
+#line 1093 "SimpleServer.xs"
                esrequest_ref = newSVsv(arg);
-#line 788 "SimpleServer.c"
+#line 1150 "SimpleServer.c"
     }
     XSRETURN_EMPTY;
 }
@@ -796,9 +1161,9 @@ XS(XS_Net__Z3950__SimpleServer_set_delete_handler)
        croak("Usage: Net::Z3950::SimpleServer::set_delete_handler(arg)");
     {
        SV *    arg = ST(0);
-#line 738 "SimpleServer.xs"
+#line 1100 "SimpleServer.xs"
                delete_ref = newSVsv(arg);
-#line 802 "SimpleServer.c"
+#line 1164 "SimpleServer.c"
     }
     XSRETURN_EMPTY;
 }
@@ -810,9 +1175,9 @@ XS(XS_Net__Z3950__SimpleServer_set_scan_handler)
        croak("Usage: Net::Z3950::SimpleServer::set_scan_handler(arg)");
     {
        SV *    arg = ST(0);
-#line 745 "SimpleServer.xs"
+#line 1107 "SimpleServer.xs"
                scan_ref = newSVsv(arg);
-#line 816 "SimpleServer.c"
+#line 1178 "SimpleServer.c"
     }
     XSRETURN_EMPTY;
 }
@@ -821,15 +1186,15 @@ XS(XS_Net__Z3950__SimpleServer_start_server)
 {
     dXSARGS;
     {
-#line 751 "SimpleServer.xs"
+#line 1113 "SimpleServer.xs"
                char **argv;
                char **argv_buf;
                char *ptr;
                int i;
                STRLEN len;
-#line 831 "SimpleServer.c"
+#line 1193 "SimpleServer.c"
        int     RETVAL;
-#line 757 "SimpleServer.xs"
+#line 1119 "SimpleServer.xs"
                argv_buf = (char **)xmalloc((items + 1) * sizeof(char *));
                argv = argv_buf;
                for (i = 0; i < items; i++)
@@ -841,7 +1206,39 @@ XS(XS_Net__Z3950__SimpleServer_start_server)
                *argv_buf = NULL;
 
                RETVAL = statserv_main(items, argv, bend_init, bend_close);
-#line 845 "SimpleServer.c"
+#line 1207 "SimpleServer.c"
+       ST(0) = sv_newmortal();
+       sv_setiv(ST(0), (IV)RETVAL);
+    }
+    XSRETURN(1);
+}
+
+XS(XS_Net__Z3950__SimpleServer_ScanSuccess)
+{
+    dXSARGS;
+    if (items != 0)
+       croak("Usage: Net::Z3950::SimpleServer::ScanSuccess()");
+    {
+       int     RETVAL;
+#line 1137 "SimpleServer.xs"
+               RETVAL = BEND_SCAN_SUCCESS;
+#line 1223 "SimpleServer.c"
+       ST(0) = sv_newmortal();
+       sv_setiv(ST(0), (IV)RETVAL);
+    }
+    XSRETURN(1);
+}
+
+XS(XS_Net__Z3950__SimpleServer_ScanPartial)
+{
+    dXSARGS;
+    if (items != 0)
+       croak("Usage: Net::Z3950::SimpleServer::ScanPartial()");
+    {
+       int     RETVAL;
+#line 1144 "SimpleServer.xs"
+               RETVAL = BEND_SCAN_PARTIAL;
+#line 1239 "SimpleServer.c"
        ST(0) = sv_newmortal();
        sv_setiv(ST(0), (IV)RETVAL);
     }
@@ -868,6 +1265,8 @@ XS(boot_Net__Z3950__SimpleServer)
         newXS("Net::Z3950::SimpleServer::set_delete_handler", XS_Net__Z3950__SimpleServer_set_delete_handler, file);
         newXS("Net::Z3950::SimpleServer::set_scan_handler", XS_Net__Z3950__SimpleServer_set_scan_handler, file);
         newXS("Net::Z3950::SimpleServer::start_server", XS_Net__Z3950__SimpleServer_start_server, file);
+        newXS("Net::Z3950::SimpleServer::ScanSuccess", XS_Net__Z3950__SimpleServer_ScanSuccess, file);
+        newXS("Net::Z3950::SimpleServer::ScanPartial", XS_Net__Z3950__SimpleServer_ScanPartial, file);
     XSRETURN_YES;
 }