X-Git-Url: http://git.indexdata.com/?p=simpleserver-moved-to-github.git;a=blobdiff_plain;f=SimpleServer.xs;h=d8675e77d8397fa0ca2155d8dc60512f5c220144;hp=aab88a9446a963b29d1db26d048ef09b0a042071;hb=d4f91dc53b5680d033b5b5895430fc8fb8e38cce;hpb=d3c8279feaf771c739ee6507c261114729a901bb

diff --git a/SimpleServer.xs b/SimpleServer.xs
index aab88a9..d8675e7 100644
--- a/SimpleServer.xs
+++ b/SimpleServer.xs
@@ -1,5 +1,5 @@
 /*
- * $Id: SimpleServer.xs,v 1.47 2006-06-05 18:01:25 quinn 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
@@ -698,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);
@@ -841,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;
@@ -863,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);
@@ -911,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;
 		}
 	}
 
@@ -954,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);
 
@@ -1011,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;
@@ -1091,7 +1113,7 @@ int bend_present(void *handle, bend_present_rr *rr)
 		else
 		{
 			rr->errcode = 26;
-			return;
+			return 0;
 		}
 	}
 
@@ -1190,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;