Return diagnostics on Init failure
[simpleserver-moved-to-github.git] / SimpleServer.xs
index 7280768..230cd26 100644 (file)
@@ -1,3 +1,77 @@
+/*
+ * 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.xs,v $
+/*Revision 1.20  2003-09-09 20:12:38  mike
+/*Return diagnostics on Init failure
+/*
+/*Revision 1.19  2003/09/09 11:40:10  mike
+/*(Finally!) support implementation-ID
+/*
+/*Revision 1.18  2003/01/03 09:05:41  sondberg
+/*Applied Dave's GRS-1 patch - actually this was already done in revision 1.17.
+/*
+/*Revision 1.16  2002/11/26 17:09:18  mike
+/*basic support for idPass authentication
+/*
+/*Revision 1.15  2002/09/16 13:55:53  sondberg
+/*Added support for authentication into SimpleServer.
+/*
+/*Revision 1.14  2002/03/05 00:34:13  mike
+/*Support for implementation_id (commented out until it's
+/*in mainstream Yaz)
+/*
+/*Revision 1.13  2002/02/28 11:21:57  mike
+/*Add RPN structure to search-handler argument hash.
+/*
+/*Revision 1.12  2001/08/30 14:02:10  sondberg
+/*Small changes.
+/*
+/*Revision 1.11  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;
@@ -37,6 +115,100 @@ SV *delete_ref = NULL;
 SV *scan_ref = NULL;
 int MAX_OID = 15;
 
+#define GRS_BUF_SIZE 512
+
+Z_GenericRecord *read_grs1(char *str, ODR o)
+{
+       int type, ivalue;
+       char line[GRS_BUF_SIZE+1], *buf, *ptr, *original;
+       char value[GRS_BUF_SIZE+1];
+       Z_GenericRecord *r = 0;
+
+       original = str;
+       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;
+       
+       for (;;)
+       {
+               Z_TaggedElement *t;
+               Z_ElementData *c;
+               int len;
+       
+               ptr = strchr(str, '\n');
+               if (!ptr) {
+                       return r;
+               }
+               len = ptr - str;
+               if (len > GRS_BUF_SIZE) {
+                   yaz_log(LOG_WARN, "GRS string too long - truncating (%d > %d)", len, GRS_BUF_SIZE);
+                   len = GRS_BUF_SIZE;
+               }
+               strncpy(line, str, len);
+               line[len] = 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 r;
+               }
+               if (!type && *value == '0')
+                       return r;
+               if (!(buf = strchr(buf, ')')))
+                       return r;
+               buf++;
+               while (*buf && isspace(*buf))
+                       buf++;
+               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;
+                       c->u.string = odr_strdup(o, buf);
+               }
+               r->num_elements++;
+       }
+}
+
+
+
+
 static void oid2str(Odr_oid *o, WRBUF buf)
 {
     for (; *o >= 0; o++) {
@@ -129,10 +301,241 @@ WRBUF zquery2pquery(Z_Query *q)
 }
 
 
+/* Lifted verbatim from Net::Z3950 yazwrap/util.c */
+#include <stdarg.h>
+void fatal(char *fmt, ...)
+{
+    va_list ap;
+
+    fprintf(stderr, "FATAL (yazwrap): ");
+    va_start(ap, fmt);
+    vfprintf(stderr, fmt, ap);
+    va_end(ap);
+    fprintf(stderr, "\n");
+    abort();
+}
+
+
+/* Lifted verbatim from Net::Z3950 yazwrap/receive.c */
+/*
+ * Creates a new Perl object of type `class'; the newly-created scalar
+ * that is a reference to the blessed thingy `referent' is returned.
+ */
+static SV *newObject(char *class, SV *referent)
+{
+    HV *stash;
+    SV *sv;
+
+    sv = newRV_noinc((SV*) referent);
+    stash = gv_stashpv(class, 0);
+    if (stash == 0)
+       fatal("attempt to create object of undefined class '%s'", class);
+    /*assert(stash != 0);*/
+    sv_bless(sv, stash);
+    return sv;
+}
+
+
+/* Lifted verbatim from Net::Z3950 yazwrap/receive.c */
+static void setMember(HV *hv, char *name, SV *val)
+{
+    /* We don't increment `val's reference count -- I think this is
+     * right because it's created with a refcount of 1, and in fact
+     * the reference via this hash is the only reference to it in
+     * general.
+     */
+    if (!hv_store(hv, name, (U32) strlen(name), val, (U32) 0))
+       fatal("couldn't store member in hash");
+}
+
+
+/* Lifted verbatim from Net::Z3950 yazwrap/receive.c */
+static SV *translateOID(Odr_oid *x)
+{
+    /* Yaz represents an OID by an int array terminated by a negative
+     * value, typically -1; we represent it as a reference to a
+     * blessed scalar string of "."-separated elements.
+     */
+    char buf[1000];
+    int i;
+
+    *buf = '\0';
+    for (i = 0; x[i] >= 0; i++) {
+       sprintf(buf + strlen(buf), "%d", (int) x[i]);
+       if (x[i+1] >- 0)
+           strcat(buf, ".");
+    }
+
+    /*
+     * ### We'd like to return a blessed scalar (string) here, but of
+     * course you can't do that in Perl: only references can be
+     * blessed, so we'd have to return a _reference_ to a string, and
+     * bless _that_.  Better to do without the blessing, I think.
+     */
+    if (1) {
+       return newSVpv(buf, 0);
+    } else {
+       return newObject("Net::Z3950::APDU::OID", newSVpv(buf, 0));
+    }
+}
+
+
+static SV *rpn2perl(Z_RPNStructure *s)
+{
+    SV *sv;
+    HV *hv;
+    AV *av;
+
+    switch (s->which) {
+    case Z_RPNStructure_simple: {
+       Z_Operand *o = s->u.simple;
+       Z_AttributesPlusTerm *at;
+       if (o->which != Z_Operand_APT)
+           fatal("can't handle RPN simples other than APT");
+       at = o->u.attributesPlusTerm;
+       if (at->term->which != Z_Term_general)
+           fatal("can't handle RPN terms other than general");
+
+       sv = newObject("Net::Z3950::RPN::Term", (SV*) (hv = newHV()));
+       if (at->attributes) {
+           int i;
+           SV *attrs = newObject("Net::Z3950::RPN::Attributes",
+                                 (SV*) (av = newAV()));
+           for (i = 0; i < at->attributes->num_attributes; i++) {
+               Z_AttributeElement *elem = at->attributes->attributes[i];
+               HV *hv2;
+               SV *tmp = newObject("Net::Z3950::RPN::Attribute",
+                                   (SV*) (hv2 = newHV()));
+               if (elem->attributeSet)
+                   setMember(hv2, "attributeSet",
+                             translateOID(elem->attributeSet));
+               setMember(hv2, "attributeType",
+                         newSViv(*elem->attributeType));
+               assert(elem->which == Z_AttributeValue_numeric);
+               setMember(hv2, "attributeValue",
+                         newSViv(*elem->value.numeric));
+               av_push(av, tmp);
+           }
+           setMember(hv, "attributes", attrs);
+       }
+       setMember(hv, "term", newSVpv((char*) at->term->u.general->buf,
+                                     at->term->u.general->len));
+       return sv;
+    }
+    case Z_RPNStructure_complex: {
+       SV *tmp;
+       Z_Complex *c = s->u.complex;
+       char *type = 0;         /* vacuous assignment satisfies gcc -Wall */
+       switch (c->roperator->which) {
+       case Z_Operator_and:     type = "Net::Z3950::RPN::And"; break;
+       case Z_Operator_or:      type = "Net::Z3950::RPN::Or"; break;
+       case Z_Operator_and_not: type = "Net::Z3950::RPN::AndNot"; break;
+       case Z_Operator_prox:    fatal("proximity not yet supported");
+       default: fatal("unknown RPN operator %d", (int) c->roperator->which);
+       }
+       sv = newObject(type, (SV*) (av = newAV()));
+       if ((tmp = rpn2perl(c->s1)) == 0)
+           return 0;
+       av_push(av, tmp);
+       if ((tmp = rpn2perl(c->s2)) == 0)
+           return 0;
+       av_push(av, tmp);
+       return sv;
+    }
+    default: fatal("unknown RPN node type %d", (int) s->which);
+    }
+
+    return 0;
+}
+
+
+static SV *zquery2perl(Z_Query *q)
+{
+    SV *sv;
+    HV *hv;
+
+    if (q->which != Z_Query_type_1 && q->which != Z_Query_type_101) 
+       return 0;
+    sv = newObject("Net::Z3950::APDU::Query", (SV*) (hv = newHV()));
+    if (q->u.type_1->attributeSetId)
+       setMember(hv, "attributeSet",
+                 translateOID(q->u.type_1->attributeSetId));
+    setMember(hv, "query", rpn2perl(q->u.type_1->RPNStructure));
+    return sv;
+}
+
+
 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;
 }
 
 
@@ -173,6 +576,8 @@ 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);
+       hv_store(href, "RPN", 3, zquery2perl(rr->query), 0);
        query = zquery2pquery(rr->query);
        if (query)
        {
@@ -232,6 +637,7 @@ int bend_search(void *handle, bend_search_rr *rr)
 }
 
 
+/* ### this is worryingly similar to oid2str() */
 WRBUF oid2dotted(int *oid)
 {
 
@@ -301,7 +707,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;
@@ -314,13 +719,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;
@@ -334,20 +739,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);
                        } 
@@ -375,9 +780,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);
 
@@ -418,13 +820,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);
@@ -439,11 +848,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);
@@ -458,34 +865,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);
                        } 
@@ -508,7 +924,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;
 
@@ -518,20 +934,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;
@@ -554,8 +980,132 @@ 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;
+       SV *entries_ref;
+       
+       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_ref = 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;
+       entries = (AV *)SvRV(entries_ref);
+       for (i = 0; i < rr->num_entries; i++)
+       {
+               scan_item = (HV *)SvRV(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);
+       }
+       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);*/
+       sv_free(entries_ref);
+
+        return 0;
 }
 
 
@@ -564,6 +1114,7 @@ bend_initresult *bend_init(bend_initrequest *q)
        bend_initresult *r = (bend_initresult *) odr_malloc (q->stream, sizeof(*r));
        HV *href;
        SV **temp;
+       SV *id;
        SV *name;
        SV *ver;
        SV *err_str;
@@ -575,6 +1126,8 @@ bend_initresult *bend_init(bend_initrequest *q)
        /*char *name_ptr;
        char *ver_ptr;*/
        char *ptr;
+       char *user = NULL;
+       char *passwd = NULL;
 
        dSP;
        ENTER;
@@ -585,19 +1138,47 @@ 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_ID", 6, newSVpv("", 0), 0);
        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, "ERR_STR", 7, 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);
+       if (q->auth) {
+           if (q->auth->which == Z_IdAuthentication_open) {
+               char *openpass = xstrdup (q->auth->u.open);
+               char *cp = strchr (openpass, '/');
+               if (cp) {
+                   *cp = '\0';
+                   user = nmem_strdup (odr_getmem (q->stream), openpass);
+                   passwd = nmem_strdup (odr_getmem (q->stream), cp + 1);
+               }
+               xfree(openpass);
+           } else if (q->auth->which == Z_IdAuthentication_idPass) {
+               user = q->auth->u.idPass->userId;
+               passwd = q->auth->u.idPass->password;
+           }
+           /* ### some code paths have user/password unassigned here */
+           hv_store(href, "USER", 4, newSVpv(user, 0), 0);
+           hv_store(href, "PASS", 4, newSVpv(passwd, 0), 0);
+       }
 
        PUSHMARK(sp);   
 
@@ -612,6 +1193,9 @@ bend_initresult *bend_init(bend_initrequest *q)
 
        SPAGAIN;
 
+       temp = hv_fetch(href, "IMP_ID", 6, 1);
+       id = newSVsv(*temp);
+
        temp = hv_fetch(href, "IMP_NAME", 8, 1);
        name = newSVsv(*temp);
 
@@ -621,6 +1205,9 @@ bend_initresult *bend_init(bend_initrequest *q)
        temp = hv_fetch(href, "ERR_CODE", 8, 1);
        status = newSVsv(*temp);
 
+       temp = hv_fetch(href, "ERR_STR", 7, 1);
+       err_str = newSVsv(*temp);
+
        temp = hv_fetch(href, "HANDLE", 6, 1);
        handle= newSVsv(*temp);
 
@@ -630,7 +1217,14 @@ bend_initresult *bend_init(bend_initrequest *q)
        LEAVE;
        zhandle->handle = handle;
        r->errcode = SvIV(status);
+       ptr = SvPV(err_str, len);
+       r->errstring = (char *)odr_malloc(q->stream, len + 1);
+       strcpy(r->errstring, ptr);
+       sv_free(err_str);
        r->handle = zhandle;
+       ptr = SvPV(id, len);
+       q->implementation_id = (char *)xmalloc(len + 1);
+       strcpy(q->implementation_id, ptr);
        ptr = SvPV(name, len);
        q->implementation_name = (char *)xmalloc(len + 1);
        strcpy(q->implementation_name, ptr);
@@ -766,4 +1360,21 @@ start_server(...)
                
                RETVAL = statserv_main(items, argv, bend_init, bend_close);
        OUTPUT:
-               RETVAL 
+               RETVAL
+
+
+int
+ScanSuccess()
+       CODE:
+               RETVAL = BEND_SCAN_SUCCESS;
+       OUTPUT:
+               RETVAL
+
+int
+ScanPartial()
+       CODE:
+               RETVAL = BEND_SCAN_PARTIAL;
+       OUTPUT:
+               RETVAL
+