Releasing 1.05.

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

diff --git a/SimpleServer.xs b/SimpleServer.xs
index f5fe402..0562cee 100644 (file)
--- a/SimpleServer.xs
+++ b/SimpleServer.xs
@@ -1,5 +1,5 @@
 /*
- * $Id: SimpleServer.xs,v 1.51 2006-07-25 23:14:49 mike Exp $ 
+ * $Id: SimpleServer.xs,v 1.55 2006-12-22 12:27:19 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
@@ -194,7 +195,7 @@ Z_GenericRecord *read_grs1(char *str, ODR o)
                }
                len = ptr - str;
                if (len > GRS_BUF_SIZE) {
-                   yaz_log(LOG_WARN, "GRS string too long - truncating (%d > %d)", len, GRS_BUF_SIZE);
+                   yaz_log(YLOG_WARN, "GRS string too long - truncating (%d > %d)", len, GRS_BUF_SIZE);
                    len = GRS_BUF_SIZE;
                }
                strncpy(line, str, len);
@@ -209,7 +210,7 @@ Z_GenericRecord *read_grs1(char *str, ODR o)
                }
                if (sscanf(buf, "(%d,%[^)])", &type, value) != 2)
                {
-                       yaz_log(LOG_WARN, "Bad data in '%s'", buf);
+                       yaz_log(YLOG_WARN, "Bad data in '%s'", buf);
                        return r;
                }
                if (!type && *value == '0')
@@ -221,7 +222,7 @@ Z_GenericRecord *read_grs1(char *str, ODR o)
                        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);
+                       yaz_log(YLOG_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));
@@ -843,7 +844,7 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
        SV *sur_flag;
        SV *point;
        SV *rep_form;
-       SV *schema;
+       SV *schema = 0;
        char *ptr;
        char *ODR_record;
        char *ODR_basename;
@@ -926,7 +927,7 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
                else
                {
                        rr->errcode = 26;
-                       return;
+                       return 0;
                }
        }
 
@@ -962,16 +963,14 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
        temp = hv_fetch(href, "REP_FORM", 8, 1);
        rep_form = newSVsv(*temp);
 
-       fprintf(stderr, "about to get SCHEMA\n");
        temp = hv_fetch(href, "SCHEMA", 6, 1);
        if (temp != 0) {
                schema = newSVsv(*temp);
-               fprintf(stderr, "got schema = %0p\n", schema);
                ptr = SvPV(schema, length);
-               fprintf(stderr, "got ptr=%0p, length=%d\n", ptr, length);
-               rr->schema = (char *)odr_malloc(rr->stream, length + 1);
-               strcpy(rr->schema, ptr);
-               fprintf(stderr, "copied schema len %d = '%.*s'\n", length, length+5, ptr);
+               if (length > 0) {
+                       rr->schema = (char *)odr_malloc(rr->stream, length + 1);
+                       strcpy(rr->schema, ptr);
+               }
        }
 
        temp = hv_fetch(href, "HANDLE", 6, 1);
@@ -1030,7 +1029,9 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
        sv_free(err_code),
        sv_free(sur_flag);
        sv_free(rep_form);
-       sv_free(schema);
+
+       if (schema)
+               sv_free(schema);
 
        PUTBACK;
        FREETMPS;
@@ -1112,7 +1113,7 @@ int bend_present(void *handle, bend_present_rr *rr)
                else
                {
                        rr->errcode = 26;
-                       return;
+                       return 0;
                }
        }