Added a modified version of ztest.pl called grs_test.pl, which shows how to
[simpleserver-moved-to-github.git] / SimpleServer.c
index fd43968..8114689 100644 (file)
  * OF THIS SOFTWARE.
  */
 
+/*$Log: SimpleServer.c,v $
+/*Revision 1.8  2001-03-13 14:19:28  sondberg
+/*Added a modified version of ztest.pl called grs_test.pl, which shows how to
+/*implement support of GRS-1 record syntax.
+/*
+/*Revision 1.7  2001/03/13 14:17:15  sondberg
+/*Added support for GRS-1.
+/**/
+
 
 #include "EXTERN.h"
 #include "perl.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 50
 #ifdef ASN_COMPILED
 #include <yaz/ill.h>
 #endif
@@ -75,6 +86,95 @@ 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;
+               }
+               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++) {
@@ -278,6 +378,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)
        {
@@ -418,13 +519,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;
@@ -444,6 +545,7 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
        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;
@@ -519,11 +621,19 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
        rr->output_format_raw = ODR_oid_buf;    
        
        ptr = SvPV(record, length);
-       ODR_record = (char *)odr_malloc(rr->stream, length + 1);
-       strcpy(ODR_record, ptr);
-       rr->record = ODR_record;
-       rr->len = length;
-
+       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);
@@ -584,6 +694,7 @@ int bend_present(void *handle, bend_present_rr *rr)
        /*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;
@@ -717,6 +828,7 @@ bend_initresult *bend_init(bend_initrequest *q)
        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);   
 
@@ -800,7 +912,7 @@ void bend_close(void *handle)
 }
 
 
-#line 804 "SimpleServer.c"
+#line 912 "SimpleServer.c"
 XS(XS_Net__Z3950__SimpleServer_set_init_handler)
 {
     dXSARGS;
@@ -808,9 +920,9 @@ XS(XS_Net__Z3950__SimpleServer_set_init_handler)
        Perl_croak(aTHX_ "Usage: Net::Z3950::SimpleServer::set_init_handler(arg)");
     {
        SV *    arg = ST(0);
-#line 800 "SimpleServer.xs"
+#line 908 "SimpleServer.xs"
                init_ref = newSVsv(arg);
-#line 814 "SimpleServer.c"
+#line 922 "SimpleServer.c"
     }
     XSRETURN_EMPTY;
 }
@@ -822,9 +934,9 @@ XS(XS_Net__Z3950__SimpleServer_set_close_handler)
        Perl_croak(aTHX_ "Usage: Net::Z3950::SimpleServer::set_close_handler(arg)");
     {
        SV *    arg = ST(0);
-#line 807 "SimpleServer.xs"
+#line 915 "SimpleServer.xs"
                close_ref = newSVsv(arg);
-#line 828 "SimpleServer.c"
+#line 936 "SimpleServer.c"
     }
     XSRETURN_EMPTY;
 }
@@ -836,9 +948,9 @@ XS(XS_Net__Z3950__SimpleServer_set_sort_handler)
        Perl_croak(aTHX_ "Usage: Net::Z3950::SimpleServer::set_sort_handler(arg)");
     {
        SV *    arg = ST(0);
-#line 814 "SimpleServer.xs"
+#line 922 "SimpleServer.xs"
                sort_ref = newSVsv(arg);
-#line 842 "SimpleServer.c"
+#line 950 "SimpleServer.c"
     }
     XSRETURN_EMPTY;
 }
@@ -850,9 +962,9 @@ XS(XS_Net__Z3950__SimpleServer_set_search_handler)
        Perl_croak(aTHX_ "Usage: Net::Z3950::SimpleServer::set_search_handler(arg)");
     {
        SV *    arg = ST(0);
-#line 820 "SimpleServer.xs"
+#line 928 "SimpleServer.xs"
                search_ref = newSVsv(arg);
-#line 856 "SimpleServer.c"
+#line 964 "SimpleServer.c"
     }
     XSRETURN_EMPTY;
 }
@@ -864,9 +976,9 @@ XS(XS_Net__Z3950__SimpleServer_set_fetch_handler)
        Perl_croak(aTHX_ "Usage: Net::Z3950::SimpleServer::set_fetch_handler(arg)");
     {
        SV *    arg = ST(0);
-#line 827 "SimpleServer.xs"
+#line 935 "SimpleServer.xs"
                fetch_ref = newSVsv(arg);
-#line 870 "SimpleServer.c"
+#line 978 "SimpleServer.c"
     }
     XSRETURN_EMPTY;
 }
@@ -878,9 +990,9 @@ XS(XS_Net__Z3950__SimpleServer_set_present_handler)
        Perl_croak(aTHX_ "Usage: Net::Z3950::SimpleServer::set_present_handler(arg)");
     {
        SV *    arg = ST(0);
-#line 834 "SimpleServer.xs"
+#line 942 "SimpleServer.xs"
                present_ref = newSVsv(arg);
-#line 884 "SimpleServer.c"
+#line 992 "SimpleServer.c"
     }
     XSRETURN_EMPTY;
 }
@@ -892,9 +1004,9 @@ XS(XS_Net__Z3950__SimpleServer_set_esrequest_handler)
        Perl_croak(aTHX_ "Usage: Net::Z3950::SimpleServer::set_esrequest_handler(arg)");
     {
        SV *    arg = ST(0);
-#line 841 "SimpleServer.xs"
+#line 949 "SimpleServer.xs"
                esrequest_ref = newSVsv(arg);
-#line 898 "SimpleServer.c"
+#line 1006 "SimpleServer.c"
     }
     XSRETURN_EMPTY;
 }
@@ -906,9 +1018,9 @@ XS(XS_Net__Z3950__SimpleServer_set_delete_handler)
        Perl_croak(aTHX_ "Usage: Net::Z3950::SimpleServer::set_delete_handler(arg)");
     {
        SV *    arg = ST(0);
-#line 848 "SimpleServer.xs"
+#line 956 "SimpleServer.xs"
                delete_ref = newSVsv(arg);
-#line 912 "SimpleServer.c"
+#line 1020 "SimpleServer.c"
     }
     XSRETURN_EMPTY;
 }
@@ -920,9 +1032,9 @@ XS(XS_Net__Z3950__SimpleServer_set_scan_handler)
        Perl_croak(aTHX_ "Usage: Net::Z3950::SimpleServer::set_scan_handler(arg)");
     {
        SV *    arg = ST(0);
-#line 855 "SimpleServer.xs"
+#line 963 "SimpleServer.xs"
                scan_ref = newSVsv(arg);
-#line 926 "SimpleServer.c"
+#line 1034 "SimpleServer.c"
     }
     XSRETURN_EMPTY;
 }
@@ -931,16 +1043,16 @@ XS(XS_Net__Z3950__SimpleServer_start_server)
 {
     dXSARGS;
     {
-#line 861 "SimpleServer.xs"
+#line 969 "SimpleServer.xs"
                char **argv;
                char **argv_buf;
                char *ptr;
                int i;
                STRLEN len;
-#line 941 "SimpleServer.c"
+#line 1049 "SimpleServer.c"
        int     RETVAL;
        dXSTARG;
-#line 867 "SimpleServer.xs"
+#line 975 "SimpleServer.xs"
                argv_buf = (char **)xmalloc((items + 1) * sizeof(char *));
                argv = argv_buf;
                for (i = 0; i < items; i++)
@@ -952,7 +1064,7 @@ XS(XS_Net__Z3950__SimpleServer_start_server)
                *argv_buf = NULL;
 
                RETVAL = statserv_main(items, argv, bend_init, bend_close);
-#line 956 "SimpleServer.c"
+#line 1064 "SimpleServer.c"
        XSprePUSH; PUSHi((IV)RETVAL);
     }
     XSRETURN(1);