X-Git-Url: http://git.indexdata.com/?p=simpleserver-moved-to-github.git;a=blobdiff_plain;f=SimpleServer.xs;h=c9eb888b7b2a81bb86f266754644978ec8feff37;hp=eb492e3f30eb104248b6cbee9095f0e2a48d0d32;hb=a48f5eb3db599938e2077b582ade3e1161837d44;hpb=bbae3fcc7f1b9cf30cbfdd1ab3d7784b618ad6cc

diff --git a/SimpleServer.xs b/SimpleServer.xs
index eb492e3..c9eb888 100644
--- a/SimpleServer.xs
+++ b/SimpleServer.xs
@@ -1,5 +1,5 @@
 /* This file is part of simpleserver.
- * Copyright (C) 2000-2013 Index Data.
+ * Copyright (C) 2000-2014 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -40,6 +40,7 @@
 #include <stdio.h>
 #include <yaz/mutex.h>
 #include <yaz/oid_db.h>
+#include <yaz/yaz-version.h>
 #ifdef WIN32
 #else
 #include <unistd.h>
@@ -91,15 +92,13 @@ PerlInterpreter *root_perl_context;
  */
 char *string_or_undef(SV **svp, ODR stream) {
 	STRLEN len;
-	char *ptr, *buf;
+	char *ptr;
 
 	if (!SvOK(*svp))
 		return 0;
 
 	ptr = SvPV(*svp, len);
-	buf = (char*) odr_malloc(stream, len+1);
-	strcpy(buf, ptr);
-	return buf;
+	return odr_strdupn(stream, ptr, len);
 }
 
 
@@ -196,7 +195,8 @@ Z_GenericRecord *read_grs1(char *str, ODR o)
 
 	original = str;
 	r = (Z_GenericRecord *)odr_malloc(o, sizeof(*r));
-	r->elements = (Z_TaggedElement **) odr_malloc(o, sizeof(Z_TaggedElement*) * GRS_MAX_FIELDS);
+	r->elements = (Z_TaggedElement **)
+		odr_malloc(o, sizeof(Z_TaggedElement*) * GRS_MAX_FIELDS);
 	r->num_elements = 0;
 
 	for (;;)
@@ -241,7 +241,8 @@ Z_GenericRecord *read_grs1(char *str, ODR o)
 			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));
+		r->elements[r->num_elements] = t = (Z_TaggedElement *)
+			odr_malloc(o, sizeof(Z_TaggedElement));
 		t->tagType = odr_intdup(o, type);
 		t->tagValue = (Z_StringOrNumeric *)
 			odr_malloc(o, sizeof(Z_StringOrNumeric));
@@ -258,7 +259,8 @@ Z_GenericRecord *read_grs1(char *str, ODR o)
 		t->tagOccurrence = 0;
 		t->metaData = 0;
 		t->appliedVariant = 0;
-		t->content = c = (Z_ElementData *)odr_malloc(o, sizeof(Z_ElementData));
+		t->content = c = (Z_ElementData *)
+			odr_malloc(o, sizeof(Z_ElementData));
 		if (*buf == '{')
 		{
 			c->which = Z_ElementData_subtree;
@@ -626,7 +628,6 @@ int bend_sort(void *handle, bend_sort_rr *rr)
         SV *point;
 	STRLEN len;
 	char *ptr;
-	char *ODR_err_str;
 	char **input_setnames;
 	Zfront_handle *zhandle = (Zfront_handle *)handle;
         Z_SortKeySpecList *sort_spec = rr->sort_sequence;
@@ -702,9 +703,7 @@ int bend_sort(void *handle, bend_sort_rr *rr)
 	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;
+	rr->errstring = odr_strdupn(rr->stream, ptr, len);
         zhandle->handle = point;
 
 	sv_free(err_code);
@@ -817,9 +816,7 @@ static void f_SV_to_FacetField(HV *facet_field_hv, Z_FacetField **fl, ODR odr)
 	            c->list[0] = (Z_StringOrNumeric *) odr_malloc(odr,
                           sizeof(**c->list));
 	            c->list[0]->which = Z_StringOrNumeric_string;
-		    c->list[0]->u.string = odr_malloc(odr, s_len + 1);
-		    memcpy(c->list[0]->u.string, s_buf, s_len);
-		    c->list[0]->u.string[s_len] = '\0';
+		    c->list[0]->u.string = odr_strdupn(odr, s_buf, s_len);
 		    c->num_semanticAction = 0;
 		    c->semanticAction = 0;
             }
@@ -888,6 +885,18 @@ static void f_SV_to_FacetList(SV *sv, Z_OtherInformation **oip, ODR odr)
 	}
 }
 
+static HV *parse_extra_args(Z_SRW_extra_arg *args)
+{
+	HV *href = newHV();
+
+	for (; args; args = args->next)
+	{
+		hv_store(href, args->name, strlen(args->name),
+			newSVpv(args->value, 0), 0);
+	}
+	return href;
+}
+
 int bend_search(void *handle, bend_search_rr *rr)
 {
 	HV *href;
@@ -901,6 +910,8 @@ int bend_search(void *handle, bend_search_rr *rr)
 	CV* handler_cv = 0;
 	SV *rpnSV;
 	SV *facetSV;
+	char *ptr;
+	STRLEN len;
 
 	dSP;
 	ENTER;
@@ -919,6 +930,7 @@ 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);
@@ -931,6 +943,8 @@ int bend_search(void *handle, bend_search_rr *rr)
 	hv_store(href, "HANDLE", 6, zhandle->handle, 0);
 	hv_store(href, "PID", 3, newSViv(getpid()), 0);
 	hv_store(href, "PRESENT_NUMBER", 14, newSViv(rr->present_number), 0);
+	hv_store(href, "EXTRA_ARGS", 10,
+		newRV( (SV*) parse_extra_args(rr->extra_args)), 0);
 	if ((rpnSV = zquery2perl(rr->query)) != 0) {
 	    hv_store(href, "RPN", 3, rpnSV, 0);
 	}
@@ -981,6 +995,18 @@ int bend_search(void *handle, bend_search_rr *rr)
         if (SvTYPE(*temp) != SVt_NULL)
 	    f_SV_to_FacetList(*temp, &rr->search_info, rr->stream);
 
+	temp = hv_fetch(href, "EXTRA_RESPONSE_DATA", 19, 0);
+	if (temp)
+	{
+		ptr = SvPV(*temp, len);
+		rr->extra_response_data = odr_strdupn(rr->stream, ptr, len);
+	}
+
+	temp = hv_fetch(href, "ESTIMATED" "_HIT_" "COUNT", 19, 0);
+	if (temp)
+	{
+		rr->estimated_hit_count = SvIV(*temp);
+	}
 	hv_undef(href);
 	av_undef(aref);
 
@@ -1073,7 +1099,6 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
 	HV *href;
 	SV **temp;
 	SV *basename;
-	SV *record;
 	SV *last;
 	SV *err_code;
 	SV *err_string;
@@ -1082,9 +1107,6 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
 	SV *rep_form;
 	SV *schema = 0;
 	char *ptr;
-	char *ODR_record;
-	char *ODR_basename;
-	char *ODR_errstr;
 	WRBUF oid_dotted;
 	Zfront_handle *zhandle = (Zfront_handle *)handle;
 	CV* handler_cv = 0;
@@ -1117,7 +1139,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, "RECORD", 6, newSVpv("", 0), 0);
 	hv_store(href, "LAST", 4, newSViv(0), 0);
 	hv_store(href, "ERR_CODE", 8, newSViv(0), 0);
 	hv_store(href, "ERR_STR", 7, newSVpv("", 0), 0);
@@ -1186,8 +1207,6 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
 	temp = hv_fetch(href, "BASENAME", 8, 1);
 	basename = newSVsv(*temp);
 
-	temp = hv_fetch(href, "RECORD", 6, 1);
-	record = newSVsv(*temp);
 
 	temp = hv_fetch(href, "LAST", 4, 1);
 	last = newSVsv(*temp);
@@ -1204,26 +1223,20 @@ 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) {
+	temp = hv_fetch(href, "SCHEMA", 6, 0);
+	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);
-		}
+		if (length > 0)
+			rr->schema = odr_strdupn(rr->stream, ptr, length);
 	}
 
 	temp = hv_fetch(href, "HANDLE", 6, 1);
 	point = newSVsv(*temp);
 
-
-	hv_undef(href);
-
 	ptr = SvPV(basename, length);
-	ODR_basename = (char *)odr_malloc(rr->stream, length + 1);
-	strcpy(ODR_basename, ptr);
-	rr->basename = ODR_basename;
+	rr->basename = odr_strdupn(rr->stream, ptr, length);
 
 	ptr = SvPV(rep_form, length);
 
@@ -1235,20 +1248,26 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
 		rr->output_format =
 			odr_oiddup(rr->stream, yaz_oid_recsyn_sutrs);
 	}
-	ptr = SvPV(record, length);
-        /* Treat GRS-1 records separately */
-	if (!oid_oidcmp(rr->output_format, yaz_oid_recsyn_grs_1))
+	temp = hv_fetch(href, "RECORD", 6, 0);
+	if (temp)
 	{
-		rr->record = (char *) read_grs1(ptr, rr->stream);
-		rr->len = -1;
-	}
-	else
-	{
-		ODR_record = (char *)odr_malloc(rr->stream, length + 1);
-		strcpy(ODR_record, ptr);
-		rr->record = ODR_record;
-		rr->len = length;
+		SV *record = newSVsv(*temp);
+		ptr = SvPV(record, length);
+        	/* Treat GRS-1 records separately */
+		if (!oid_oidcmp(rr->output_format, yaz_oid_recsyn_grs_1))
+		{
+			rr->record = (char *) read_grs1(ptr, rr->stream);
+			rr->len = -1;
+		}
+		else
+		{
+			rr->record = odr_strdupn(rr->stream, ptr, length);
+			rr->len = length;
+		}
+		sv_free(record);
 	}
+	hv_undef(href);
+
 	zhandle->handle = point;
 	handle = zhandle;
 	rr->last_in_set = SvIV(last);
@@ -1257,16 +1276,13 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
 	{
 		rr->errcode = SvIV(err_code);
 		ptr = SvPV(err_string, length);
-		ODR_errstr = (char *)odr_malloc(rr->stream, length + 1);
-		strcpy(ODR_errstr, ptr);
-		rr->errstring = ODR_errstr;
+		rr->errstring = odr_strdupn(rr->stream, ptr, length);
 	}
 	rr->surrogate_flag = SvIV(sur_flag);
 
 	wrbuf_destroy(oid_dotted);
 	sv_free((SV*) href);
 	sv_free(basename);
-	sv_free(record);
 	sv_free(last);
 	sv_free(err_string);
 	sv_free(err_code),
@@ -1295,7 +1311,6 @@ int bend_present(void *handle, bend_present_rr *rr)
 	Z_RecordComposition *composition;
 	Z_ElementSetNames *simple;
 	Z_CompSpec *complex;
-	char *ODR_errstr;
 	char *ptr;
 	Zfront_handle *zhandle = (Zfront_handle *)handle;
 	CV* handler_cv = 0;
@@ -1390,9 +1405,7 @@ int bend_present(void *handle, bend_present_rr *rr)
 	rr->errcode = SvIV(err_code);
 
 	ptr = SvPV(err_string, len);
-	ODR_errstr = (char *)odr_malloc(rr->stream, len + 1);
-	strcpy(ODR_errstr, ptr);
-	rr->errstring = ODR_errstr;
+	rr->errstring = odr_strdupn(rr->stream, ptr, len);
 /*	wrbuf_free(oid_dotted, 1);*/
 	zhandle->handle = point;
 	handle = zhandle;
@@ -1418,9 +1431,9 @@ int bend_scan(void *handle, bend_scan_rr *rr)
 	AV *list;
 	AV *entries;
 	HV *scan_item;
-	struct scan_entry *scan_list;
 	struct scan_entry *buffer;
 	int *step_size = rr->step_size;
+	int scan_list_size = rr->num_entries;
 	int i;
 	char **basenames;
 	SV **temp;
@@ -1430,9 +1443,7 @@ int bend_scan(void *handle, bend_scan_rr *rr)
 	SV *status = sv_newmortal();
 	SV *number = sv_newmortal();
 	char *ptr;
-	char *ODR_errstr;
 	STRLEN len;
-	int term_len;
 	SV *entries_ref;
 	Zfront_handle *zhandle = (Zfront_handle *)handle;
 	CV* handler_cv = 0;
@@ -1451,8 +1462,9 @@ 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((char*) rr->term->term->u.general->buf, term_len), 0);
+		Odr_oct *oterm = rr->term->term->u.general;
+		hv_store(href, "TERM", 4, newSVpv((char*) oterm->buf,
+			oterm->len), 0);
 	} else {
 		rr->errcode = 229;	/* Unsupported term type */
 		return 0;
@@ -1466,6 +1478,8 @@ int bend_scan(void *handle, bend_scan_rr *rr)
 	hv_store(href, "HANDLE", 6, zhandle->handle, 0);
 	hv_store(href, "STATUS", 6, newSViv(BEND_SCAN_SUCCESS), 0);
 	hv_store(href, "ENTRIES", 7, newRV((SV *) list), 0);
+	hv_store(href, "EXTRA_ARGS", 10,
+		newRV( (SV*) parse_extra_args(rr->extra_args)), 0);
         aref = newAV();
         basenames = rr->basenames;
         for (i = 0; i < rr->num_bases; i++)
@@ -1503,33 +1517,42 @@ int bend_scan(void *handle, bend_scan_rr *rr)
 	temp = hv_fetch(href, "ENTRIES", 7, 1);
 	entries_ref = newSVsv(*temp);
 
+	temp = hv_fetch(href, "EXTRA_RESPONSE_DATA", 19, 0);
+	if (temp)
+	{
+		ptr = SvPV(*temp, len);
+		rr->extra_response_data = odr_strdupn(rr->stream, ptr, len);
+	}
+
 	PUTBACK;
 	FREETMPS;
 	LEAVE;
 
 	ptr = SvPV(err_str, len);
-	ODR_errstr = (char *)odr_malloc(rr->stream, len + 1);
-	strcpy(ODR_errstr, ptr);
-	rr->errstring = ODR_errstr;
+	rr->errstring = odr_strdupn(rr->stream, ptr, len);
 	rr->errcode = SvIV(err_code);
 	rr->num_entries = SvIV(number);
 	rr->status = SvIV(status);
-        scan_list = (struct scan_entry *) odr_malloc (rr->stream, rr->num_entries * sizeof(*scan_list));
-	buffer = scan_list;
+	buffer = rr->entries;
 	entries = (AV *)SvRV(entries_ref);
 	if (rr->errcode == 0) for (i = 0; i < rr->num_entries; i++)
 	{
 		scan_item = (HV *)SvRV(sv_2mortal(av_shift(entries)));
 		temp = hv_fetch(scan_item, "TERM", 4, 1);
 		ptr = SvPV(*temp, len);
-		buffer->term = (char *) odr_malloc (rr->stream, len + 1);
-		strcpy(buffer->term, ptr);
+		buffer->term = odr_strdupn(rr->stream, ptr, len);
 		temp = hv_fetch(scan_item, "OCCURRENCE", 10, 1);
 		buffer->occurrences = SvIV(*temp);
+		temp = hv_fetch(scan_item, "DISPLAY_TERM", 12, 0);
+		if (temp)
+		{
+			ptr = SvPV(*temp, len);
+			buffer->display_term = odr_strdupn(rr->stream, ptr,len);
+		}
 		buffer++;
 		hv_undef(scan_item);
 	}
-	rr->entries = scan_list;
+
 	zhandle->handle = point;
 	handle = zhandle;
 	sv_free(err_code);
@@ -1586,8 +1609,7 @@ int bend_explain(void *handle, bend_explain_rr *q)
 	LEAVE;
 
 	explain = SvPV(explainsv, len);
-	q->explain_buf = (char*) odr_malloc(q->stream, len + 1);
-	strcpy(q->explain_buf, explain);
+	q->explain_buf = odr_strdupn(q->stream, explain, len);
 
         return 0;
 }
@@ -1617,8 +1639,8 @@ bend_initresult *bend_init(bend_initrequest *q)
 	dSP;
 	STRLEN len;
 	NMEM nmem = nmem_create();
-	Zfront_handle *zhandle =  (Zfront_handle *) nmem_malloc (nmem,
-			sizeof(*zhandle));
+	Zfront_handle *zhandle = (Zfront_handle *)
+		nmem_malloc(nmem, sizeof(*zhandle));
 	SV *handle;
 	HV *href;
 	SV **temp;
@@ -1632,7 +1654,7 @@ bend_initresult *bend_init(bend_initrequest *q)
 
         if (sort_ref)
         {
-            q->bend_sort = bend_sort;
+		q->bend_sort = bend_sort;
         }
 	if (search_ref)
 	{
@@ -1643,7 +1665,8 @@ bend_initresult *bend_init(bend_initrequest *q)
 		q->bend_present = bend_present;
 	}
 	/*q->bend_esrequest = bend_esrequest;*/
-	if (delete_ref) {
+	if (delete_ref)
+	{
 		q->bend_delete = bend_delete;
 	}
 	if (fetch_ref)
@@ -1726,8 +1749,7 @@ bend_initresult *bend_init(bend_initrequest *q)
 
 	temp = hv_fetch(href, "ERR_STR", 7, 1);
 	ptr = SvPV(*temp, len);
-	r->errstring = (char *)odr_malloc(q->stream, len + 1);
-	strcpy(r->errstring, ptr);
+	r->errstring = odr_strdupn(q->stream, ptr, len);
 
 	temp = hv_fetch(href, "HANDLE", 6, 1);
 	handle= newSVsv(*temp);