X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=SimpleServer.xs;h=93dbc4cdebc89c301a6872c2715b6344a69407cd;hb=28bca99ecd8a78278d8b3e27873d9ee0d1959507;hp=c2fc4ecb0435faa11a44096a601548dd25a0107d;hpb=3253ded6f7e5fbd840152247ecc54f6e591feb6c;p=simpleserver-moved-to-github.git

diff --git a/SimpleServer.xs b/SimpleServer.xs
index c2fc4ec..93dbc4c 100644
--- a/SimpleServer.xs
+++ b/SimpleServer.xs
@@ -1,5 +1,5 @@
 /*
- * $Id: SimpleServer.xs,v 1.49 2006-07-21 22:14:12 mike Exp $ 
+ * $Id: SimpleServer.xs,v 1.53 2006-07-26 11:09:14 mike Exp $ 
  * ----------------------------------------------------------------------
  * 
  * Copyright (c) 2000-2004, Index Data.
@@ -916,8 +916,11 @@ 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
@@ -959,8 +962,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);
@@ -973,10 +983,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 */
@@ -1203,7 +1209,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;