Removing compiler warnings.

[simpleserver-moved-to-github.git] / SimpleServer.xs

diff --git a/SimpleServer.xs b/SimpleServer.xs
index 778042d..d8675e7 100644 (file)
--- a/SimpleServer.xs
+++ b/SimpleServer.xs
@@ -1,5 +1,5 @@
 /*
- * $Id: SimpleServer.xs,v 1.45 2006-06-02 10:06:11 sondberg Exp $ 
+ * $Id: SimpleServer.xs,v 1.54 2006-12-01 10:44:58 sondberg Exp $ 
  * ----------------------------------------------------------------------
  * 
  * Copyright (c) 2000-2004, Index Data.
@@ -35,6 +35,7 @@
 #include <yaz/backend.h>
 #include <yaz/log.h>
 #include <yaz/wrbuf.h>
+#include <yaz/querytowrbuf.h>
 #include <stdio.h>
 #ifdef WIN32
 #else
@@ -64,6 +65,7 @@ typedef struct {
        SV *esrequest_ref;
        SV *delete_ref;
        SV *scan_ref;
+       SV *explain_ref;
        NMEM nmem;
        int stop_flag;  /* is used to stop server prematurely .. */
 } Zfront_handle;
@@ -79,6 +81,7 @@ SV *present_ref = NULL;
 SV *esrequest_ref = NULL;
 SV *delete_ref = NULL;
 SV *scan_ref = NULL;
+SV *explain_ref = NULL;
 PerlInterpreter *root_perl_context;
 int MAX_OID = 15;
 
@@ -696,6 +699,8 @@ int bend_search(void *handle, bend_search_rr *rr)
 #endif
        href = newHV();         
        hv_store(href, "SETNAME", 7, newSVpv(rr->setname, 0), 0);
+       if (rr->srw_sortKeys && *rr->srw_sortKeys) 
+           hv_store(href, "SRW_SORTKEYS", 12, newSVpv(rr->srw_sortKeys, 0), 0);
        hv_store(href, "REPL_SET", 8, newSViv(rr->replace_set), 0);
        hv_store(href, "ERR_CODE", 8, newSViv(0), 0);
        hv_store(href, "ERR_STR", 7, newSVpv("", 0), 0);
@@ -839,6 +844,7 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
        SV *sur_flag;
        SV *point;
        SV *rep_form;
+       SV *schema = 0;
        char *ptr;
        char *ODR_record;
        char *ODR_basename;
@@ -861,6 +867,8 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
        rr->errcode = 0;
        href = newHV();
        hv_store(href, "SETNAME", 7, newSVpv(rr->setname, 0), 0);
+       if (rr->schema)
+               hv_store(href, "SCHEMA", 6, newSVpv(rr->schema, 0), 0);
        temp = hv_store(href, "OFFSET", 6, newSViv(rr->number), 0);
        if (rr->request_format_raw != 0) {
            oid_dotted = oid2dotted(rr->request_format_raw);
@@ -909,14 +917,17 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
                        }
                        else
                        {
+#if 0  /* For now ignore this error, which is ubiquitous in SRU */
+                               fprintf(stderr, "complex is weird\n");
                                rr->errcode = 26;
                                return 0;
+#endif /*0*/
                        }
                }
                else
                {
                        rr->errcode = 26;
-                       return;
+                       return 0;
                }
        }
 
@@ -952,6 +963,16 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
        temp = hv_fetch(href, "REP_FORM", 8, 1);
        rep_form = newSVsv(*temp);
 
+       temp = hv_fetch(href, "SCHEMA", 6, 1);
+       if (temp != 0) {
+               schema = newSVsv(*temp);
+               ptr = SvPV(schema, length);
+               if (length > 0) {
+                       rr->schema = (char *)odr_malloc(rr->stream, length + 1);
+                       strcpy(rr->schema, ptr);
+               }
+       }
+
        temp = hv_fetch(href, "HANDLE", 6, 1);
        point = newSVsv(*temp);
 
@@ -1009,6 +1030,9 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
        sv_free(sur_flag);
        sv_free(rep_form);
 
+       if (schema)
+               sv_free(schema);
+
        PUTBACK;
        FREETMPS;
        LEAVE;
@@ -1089,7 +1113,7 @@ int bend_present(void *handle, bend_present_rr *rr)
                else
                {
                        rr->errcode = 26;
-                       return;
+                       return 0;
                }
        }
 
@@ -1188,7 +1212,7 @@ int bend_scan(void *handle, bend_scan_rr *rr)
        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);
+               hv_store(href, "TERM", 4, newSVpv((char*) rr->term->term->u.general->buf, term_len), 0);
        } else {
                rr->errcode = 229;      /* Unsupported term type */
                return 0;
@@ -1284,6 +1308,48 @@ int bend_scan(void *handle, bend_scan_rr *rr)
         return 0;
 }
 
+int bend_explain(void *handle, bend_explain_rr *q)
+{
+       HV *href;
+       CV *handler_cv = 0;
+       SV **temp;
+       char *explain;
+       SV *explainsv;
+       STRLEN len;
+       Zfront_handle *zhandle = (Zfront_handle *)handle;
+
+       dSP;
+       ENTER;
+       SAVETMPS;
+
+       href = newHV();
+       hv_store(href, "EXPLAIN", 7, newSVpv("", 0), 0);
+       hv_store(href, "DATABASE", 8, newSVpv(q->database, 0), 0);
+       hv_store(href, "HANDLE", 6, zhandle->handle, 0);
+
+       PUSHMARK(sp);
+       XPUSHs(sv_2mortal(newRV((SV*) href)));
+       PUTBACK;
+
+       handler_cv = simpleserver_sv2cv(explain_ref);
+       perl_call_sv((SV*) handler_cv, G_SCALAR | G_DISCARD);
+
+       SPAGAIN;
+
+       temp = hv_fetch(href, "EXPLAIN", 7, 1);
+       explainsv = newSVsv(*temp);
+
+       PUTBACK;
+       FREETMPS;
+       LEAVE;
+
+       explain = SvPV(explainsv, len);
+       q->explain_buf = (char*) odr_malloc(q->stream, len + 1);
+       strcpy(q->explain_buf, explain);
+
+        return 0;
+}
+
 bend_initresult *bend_init(bend_initrequest *q)
 {
        int dummy = simpleserver_clone();
@@ -1328,6 +1394,10 @@ bend_initresult *bend_init(bend_initrequest *q)
        {
                q->bend_scan = bend_scan;
        }
+       if (explain_ref)
+       {
+               q->bend_explain = bend_explain;
+       }
 
                href = newHV(); 
        hv_store(href, "IMP_ID", 6, newSVpv("", 0), 0);
@@ -1520,6 +1590,11 @@ set_scan_handler(arg)
        CODE:
                scan_ref = newSVsv(arg);
 
+void
+set_explain_handler(arg)
+               SV *arg
+       CODE:
+               explain_ref = newSVsv(arg);
 
 int
 start_server(...)