X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=SimpleServer.xs;h=0562cee724cb455f4ccbf057ea3bf1b9c2eb18fc;hb=1e0ea517508c1d4d31401a8c26f158d1fafbbd83;hp=6e2ba0ed5b60caad5d06d80c6bcb21c5e0081fc9;hpb=b76d965f82b76a458000edb32eb55f97b5333caa;p=simpleserver-moved-to-github.git

diff --git a/SimpleServer.xs b/SimpleServer.xs
index 6e2ba0e..0562cee 100644
--- a/SimpleServer.xs
+++ b/SimpleServer.xs
@@ -1,5 +1,5 @@
 /*
- * $Id: SimpleServer.xs,v 1.50 2006-07-24 23:05:22 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,8 +963,15 @@ 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", 8, 1);
-	schema = 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);
@@ -976,10 +984,6 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
 	strcpy(ODR_basename, ptr);
 	rr->basename = ODR_basename;
 
-	ptr = SvPV(schema, length);
-	rr->schema = (char *)odr_malloc(rr->stream, length + 1);
-	strcpy(rr->schema, ptr);
-
 	ptr = SvPV(rep_form, length);
 	ODR_oid_buf = (int *)odr_malloc(rr->stream, (MAX_OID + 1) * sizeof(int));
 	if (dotted2oid(ptr, ODR_oid_buf) == -1)		/* Maximum number of OID elements exceeded */
@@ -1025,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;
@@ -1107,7 +1113,7 @@ int bend_present(void *handle, bend_present_rr *rr)
 		else
 		{
 			rr->errcode = 26;
-			return;
+			return 0;
 		}
 	}
 
@@ -1206,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;