X-Git-Url: http://git.indexdata.com/?p=simpleserver-moved-to-github.git;a=blobdiff_plain;f=SimpleServer.xs;h=4c9f8a44b8d5719398f51baa4bffb12f660fe142;hp=7280768cbe925d6898371a982d6a488d5a3e3944;hb=dce047d22f3830ef79f4f94695c84c5fca8594c9;hpb=8aaa9b6ef2b98a5ac710343e826d469d926371d0

diff --git a/SimpleServer.xs b/SimpleServer.xs
index 7280768..4c9f8a4 100644
--- a/SimpleServer.xs
+++ b/SimpleServer.xs
@@ -1,3 +1,30 @@
+/*
+ * Copyright (c) 2000, Index Data.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation, in whole or in part, for any purpose, is hereby granted,
+ * provided that:
+ *
+ * 1. This copyright and permission notice appear in all copies of the
+ * software and its documentation. Notices of copyright or attribution
+ * which appear at the beginning of any file must remain unchanged.
+ *
+ * 2. The name of Index Data or the individual authors may not be used to
+ * endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
+ * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+
 #include "EXTERN.h"
 #include "perl.h"
 #include "XSUB.h"
@@ -10,7 +37,9 @@
 #ifdef ASN_COMPILED
 #include <yaz/ill.h>
 #endif
-
+#ifndef sv_undef		/* To fix the problem with Perl 5.6.0 */
+#define sv_undef PL_sv_undef
+#endif
 
 typedef struct {
 	SV *handle;
@@ -131,8 +160,75 @@ WRBUF zquery2pquery(Z_Query *q)
 
 int bend_sort(void *handle, bend_sort_rr *rr)
 {
-	perl_call_sv(sort_ref, G_VOID | G_DISCARD | G_NOARGS);
-	return;
+	HV *href;
+	AV *aref;
+	SV **temp;
+	SV *err_code;
+	SV *err_str;
+	SV *status;
+	STRLEN len;
+	char *ptr;
+	char *ODR_err_str;
+	char **input_setnames;
+	Zfront_handle *zhandle = (Zfront_handle *)handle;
+	int i;
+	
+	dSP;
+	ENTER;
+	SAVETMPS;
+	
+	aref = newAV();
+	input_setnames = rr->input_setnames;
+	for (i = 0; i < rr->num_input_setnames; i++)
+	{
+		av_push(aref, newSVpv(*input_setnames++, 0));
+	}
+	href = newHV();
+	hv_store(href, "INPUT", 5, newRV( (SV*) aref), 0);
+	hv_store(href, "OUTPUT", 6, newSVpv(rr->output_setname, 0), 0);
+	hv_store(href, "HANDLE", 6, zhandle->handle, 0);
+	hv_store(href, "STATUS", 6, newSViv(0), 0);
+
+	PUSHMARK(sp);
+
+	XPUSHs(sv_2mortal(newRV( (SV*) href)));
+
+	PUTBACK;
+
+	perl_call_sv(sort_ref, G_SCALAR | G_DISCARD);
+
+	SPAGAIN;
+
+	temp = hv_fetch(href, "ERR_CODE", 8, 1);
+	err_code = newSVsv(*temp);
+
+	temp = hv_fetch(href, "ERR_STR", 7, 1);
+	err_str = newSVsv(*temp);
+
+	temp = hv_fetch(href, "STATUS", 6, 1);
+	status = newSVsv(*temp);
+
+
+	
+
+	PUTBACK;
+	FREETMPS;
+	LEAVE;
+
+	hv_undef(href),
+	av_undef(aref);
+	rr->errcode = SvIV(err_code);
+	rr->sort_status = SvIV(status);
+	ptr = SvPV(err_str, len);
+	ODR_err_str = (char *)odr_malloc(rr->stream, len + 1);
+	strcpy(ODR_err_str, ptr);
+	rr->errstring = ODR_err_str;
+
+	sv_free(err_code);
+	sv_free(err_str);
+	sv_free(status);
+	
+	return 0;
 }
 
 
@@ -301,7 +397,6 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
 	HV *href;
 	SV **temp;
 	SV *basename;
-	SV *len;
 	SV *record;
 	SV *last;
 	SV *err_code;
@@ -334,7 +429,6 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
 	hv_store(href, "REQ_FORM", 8, newSVpv((char *)oid_dotted->buf, oid_dotted->pos), 0);
 	hv_store(href, "REP_FORM", 8, newSVpv((char *)oid_dotted->buf, oid_dotted->pos), 0);
 	hv_store(href, "BASENAME", 8, newSVpv("", 0), 0);
-	hv_store(href, "LEN", 3, newSViv(0), 0);
 	hv_store(href, "RECORD", 6, newSVpv("", 0), 0);
 	hv_store(href, "LAST", 4, newSViv(0), 0);
 	hv_store(href, "ERR_CODE", 8, newSViv(0), 0);
@@ -344,10 +438,10 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
 	if (rr->comp)
 	{
 		composition = rr->comp;
-		if (composition->which == 1)
+		if (composition->which == Z_RecordComp_simple)
 		{
 			simple = composition->u.simple;
-			if (simple->which == 1)
+			if (simple->which == Z_ElementSetNames_generic)
 			{
 				hv_store(href, "COMP", 4, newSVpv(simple->u.generic, 0), 0);
 			} 
@@ -375,9 +469,6 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
 	temp = hv_fetch(href, "BASENAME", 8, 1);
 	basename = newSVsv(*temp);
 
-	temp = hv_fetch(href, "LEN", 3, 1);
-	len = newSVsv(*temp);
-
 	temp = hv_fetch(href, "RECORD", 6, 1);
 	record = newSVsv(*temp);
 
@@ -418,12 +509,11 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
 	}
 	rr->output_format_raw = ODR_oid_buf;	
 	
-	rr->len = SvIV(len);
-
 	ptr = SvPV(record, length);
 	ODR_record = (char *)odr_malloc(rr->stream, length + 1);
 	strcpy(ODR_record, ptr);
 	rr->record = ODR_record;
+	rr->len = length;
 
 	zhandle->handle = point;
 	handle = zhandle;
@@ -439,11 +529,9 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
 	}
 	rr->surrogate_flag = SvIV(sur_flag);
 
-	/*sv_free(point);*/
 	wrbuf_free(oid_dotted, 1);
 	sv_free((SV*) href);
 	sv_free(basename);
-	sv_free(len);
 	sv_free(record);
 	sv_free(last);
 	sv_free(err_string);
@@ -458,34 +546,42 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
 int bend_present(void *handle, bend_present_rr *rr)
 {
 
-	int n;
 	HV *href;
 	SV **temp;
 	SV *err_code;
 	SV *err_string;
+	SV *hits;
+	SV *point;
 	STRLEN len;
 	Z_RecordComposition *composition;
 	Z_ElementSetNames *simple;
 	char *ODR_errstr;
 	char *ptr;
+	Zfront_handle *zhandle = (Zfront_handle *)handle;
+
+/*	WRBUF oid_dotted; */
 
 	dSP;
 	ENTER;
 	SAVETMPS;
 
 	href = newHV();
+        hv_store(href, "HANDLE", 6, zhandle->handle, 0);
 	hv_store(href, "ERR_CODE", 8, newSViv(0), 0);
 	hv_store(href, "ERR_STR", 7, newSVpv("", 0), 0);
 	hv_store(href, "START", 5, newSViv(rr->start), 0);
 	hv_store(href, "SETNAME", 7, newSVpv(rr->setname, 0), 0);
 	hv_store(href, "NUMBER", 6, newSViv(rr->number), 0);
+	/*oid_dotted = oid2dotted(rr->request_format_raw);
+        hv_store(href, "REQ_FORM", 8, newSVpv((char *)oid_dotted->buf, oid_dotted->pos), 0);*/
+	hv_store(href, "HITS", 4, newSViv(0), 0);
 	if (rr->comp)
 	{
 		composition = rr->comp;
-		if (composition->which == 1)
+		if (composition->which == Z_RecordComp_simple)
 		{
 			simple = composition->u.simple;
-			if (simple->which == 1)
+			if (simple->which == Z_ElementSetNames_generic)
 			{
 				hv_store(href, "COMP", 4, newSVpv(simple->u.generic, 0), 0);
 			} 
@@ -508,7 +604,7 @@ int bend_present(void *handle, bend_present_rr *rr)
 	
 	PUTBACK;
 	
-	n = perl_call_sv(present_ref, G_SCALAR | G_DISCARD);
+	perl_call_sv(present_ref, G_SCALAR | G_DISCARD);
 	
 	SPAGAIN;
 
@@ -518,20 +614,30 @@ int bend_present(void *handle, bend_present_rr *rr)
 	temp = hv_fetch(href, "ERR_STR", 7, 1);
 	err_string = newSVsv(*temp);
 
+	temp = hv_fetch(href, "HITS", 4, 1);
+	hits = newSVsv(*temp);
+
+	temp = hv_fetch(href, "HANDLE", 6, 1);
+	point = newSVsv(*temp);
+
 	PUTBACK;
 	FREETMPS;
 	LEAVE;
 	
 	hv_undef(href);
 	rr->errcode = SvIV(err_code);
+	rr->hits = SvIV(hits);
 
 	ptr = SvPV(err_string, len);
 	ODR_errstr = (char *)odr_malloc(rr->stream, len + 1);
 	strcpy(ODR_errstr, ptr);
 	rr->errstring = ODR_errstr;
-
+/*	wrbuf_free(oid_dotted, 1);*/
+	zhandle->handle = point;
+	handle = zhandle;
 	sv_free(err_code);
 	sv_free(err_string);
+	sv_free(hits);
 	sv_free( (SV*) href);
 
 	return 0;
@@ -585,7 +691,10 @@ bend_initresult *bend_init(bend_initrequest *q)
 	{
 		q->bend_search = bend_search;
 	}
-	/*q->bend_present = present;*/
+	if (present_ref)
+	{
+		q->bend_present = bend_present;
+	}
 	/*q->bend_esrequest = bend_esrequest;*/
 	/*q->bend_delete = bend_delete;*/
 	if (fetch_ref)
@@ -597,6 +706,7 @@ bend_initresult *bend_init(bend_initrequest *q)
 	hv_store(href, "IMP_NAME", 8, newSVpv("", 0), 0);
 	hv_store(href, "IMP_VER", 7, newSVpv("", 0), 0);
 	hv_store(href, "ERR_CODE", 8, newSViv(0), 0);
+	hv_store(href, "PEER_NAME", 9, newSVpv(q->peer_name, 0), 0);
 	hv_store(href, "HANDLE", 6, newSVsv(&sv_undef), 0);
 
 	PUSHMARK(sp);