X-Git-Url: http://git.indexdata.com/?p=simpleserver-moved-to-github.git;a=blobdiff_plain;f=SimpleServer.xs;h=6e2ba0ed5b60caad5d06d80c6bcb21c5e0081fc9;hp=5be5f73b6b7491d80f7b183437ecaddffe435dc8;hb=b76d965f82b76a458000edb32eb55f97b5333caa;hpb=23d068e423a3d6f5295597226d0e18f2647810c5

diff --git a/SimpleServer.xs b/SimpleServer.xs
index 5be5f73..6e2ba0e 100644
--- a/SimpleServer.xs
+++ b/SimpleServer.xs
@@ -1,5 +1,5 @@
 /*
- * $Id: SimpleServer.xs,v 1.46 2006-06-02 16:03:25 quinn Exp $ 
+ * $Id: SimpleServer.xs,v 1.50 2006-07-24 23:05:22 mike Exp $ 
  * ----------------------------------------------------------------------
  * 
  * Copyright (c) 2000-2004, Index Data.
@@ -698,6 +698,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 +843,7 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
 	SV *sur_flag;
 	SV *point;
 	SV *rep_form;
+	SV *schema;
 	char *ptr;
 	char *ODR_record;
 	char *ODR_basename;
@@ -863,6 +866,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,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
@@ -954,6 +962,9 @@ 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, "HANDLE", 6, 1);
 	point = newSVsv(*temp);
 
@@ -965,6 +976,10 @@ 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 */
@@ -1010,6 +1025,7 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
 	sv_free(err_code),
 	sv_free(sur_flag);
 	sv_free(rep_form);
+	sv_free(schema);
 
 	PUTBACK;
 	FREETMPS;
@@ -1294,6 +1310,7 @@ int bend_explain(void *handle, bend_explain_rr *q)
 	char *explain;
 	SV *explainsv;
 	STRLEN len;
+	Zfront_handle *zhandle = (Zfront_handle *)handle;
 
 	dSP;
 	ENTER;
@@ -1302,6 +1319,7 @@ int bend_explain(void *handle, bend_explain_rr *q)
 	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)));