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

diff --git a/SimpleServer.xs b/SimpleServer.xs
index e83f47b..c9eb888 100644
--- a/SimpleServer.xs
+++ b/SimpleServer.xs
@@ -1,5 +1,5 @@
 /* This file is part of simpleserver.
- * Copyright (C) 2000-2011 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:
@@ -32,19 +32,22 @@
 #include "XSUB.h"
 #include <assert.h>
 #include <yaz/backend.h>
+#include <yaz/facet.h>
 #include <yaz/log.h>
 #include <yaz/wrbuf.h>
+#include <yaz/pquery.h>
 #include <yaz/querytowrbuf.h>
 #include <stdio.h>
 #include <yaz/mutex.h>
 #include <yaz/oid_db.h>
+#include <yaz/yaz-version.h>
 #ifdef WIN32
 #else
 #include <unistd.h>
 #endif
 #include <stdlib.h>
 #include <ctype.h>
-#define GRS_MAX_FIELDS 500 
+#define GRS_MAX_FIELDS 500
 #ifdef ASN_COMPILED
 #include <yaz/ill.h>
 #endif
@@ -57,19 +60,6 @@ YAZ_MUTEX simpleserver_mutex;
 typedef struct {
 	SV *ghandle;	/* Global handle specified at creation */
 	SV *handle;	/* Per-connection handle set at Init */
-#if 0
-/* ### These callback-reference elements are never used! */
-	SV *init_ref;
-	SV *close_ref;
-	SV *sort_ref;
-	SV *search_ref;
-	SV *fetch_ref;
-	SV *present_ref;
-	SV *esrequest_ref;
-	SV *delete_ref;
-	SV *scan_ref;
-	SV *explain_ref;
-#endif /*0*/
 	NMEM nmem;
 	int stop_flag;  /* is used to stop server prematurely .. */
 } Zfront_handle;
@@ -87,6 +77,7 @@ SV *esrequest_ref = NULL;
 SV *delete_ref = NULL;
 SV *scan_ref = NULL;
 SV *explain_ref = NULL;
+SV *start_ref = NULL;
 PerlInterpreter *root_perl_context;
 
 #define GRS_BUF_SIZE 8192
@@ -101,22 +92,20 @@ 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);
 }
 
 
 CV * simpleserver_sv2cv(SV *handler) {
     STRLEN len;
     char *buf;
-   
+
     if (SvPOK(handler)) {
 	CV *ret;
 	buf = SvPV( handler, len);
@@ -124,7 +113,7 @@ CV * simpleserver_sv2cv(SV *handler) {
 	    fprintf( stderr, "simpleserver_sv2cv: No such handler '%s'\n\n", buf );
 	    exit(1);
 	}
-	
+
 	return ret;
     } else {
 	return (CV *) handler;
@@ -135,7 +124,7 @@ CV * simpleserver_sv2cv(SV *handler) {
 #ifdef USE_ITHREADS
 void tst_clones(void)
 {
-    int i; 
+    int i;
     PerlInterpreter *parent = PERL_GET_CONTEXT;
     for (i = 0; i<5000; i++)
     {
@@ -184,7 +173,7 @@ void simpleserver_free(void) {
         PerlInterpreter *current_interp = PERL_GET_CONTEXT;
 
 	/* If current Perl Interp is different from root interp, then
-	 * we're in threaded mode and we must destroy.. 
+	 * we're in threaded mode and we must destroy..
 	 */
 	if (current_interp != root_perl_context) {
        	    PL_perl_destruct_level = 2;
@@ -206,15 +195,16 @@ 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 (;;)
 	{
 		Z_TaggedElement *t;
 		Z_ElementData *c;
 		int len;
-	
+
 		ptr = strchr(str, '\n');
 		if (!ptr) {
 			return r;
@@ -251,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));
@@ -268,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;
@@ -302,13 +294,13 @@ WRBUF oid2dotted(Odr_oid *oid)
     oid2str(oid, buf);
     return buf;
 }
-		
+
 
 WRBUF zquery2pquery(Z_Query *q)
 {
     WRBUF buf = wrbuf_alloc();
 
-    if (q->which != Z_Query_type_1 && q->which != Z_Query_type_101) 
+    if (q->which != Z_Query_type_1 && q->which != Z_Query_type_101)
 	return 0;
     yaz_rpnquery_to_wrbuf(buf, q->u.type_1);
     return buf;
@@ -393,23 +385,14 @@ static SV *translateOID(Odr_oid *x)
     }
 }
 
-
-static SV *apt2perl(Z_AttributesPlusTerm *at)
+static SV *attributes2perl(Z_AttributeList *list)
 {
-    SV *sv;
-    HV *hv;
     AV *av;
-
-    if (at->term->which != Z_Term_general)
-	fatal("can't handle RPN terms other than general");
-
-    sv = newObject("Net::Z3950::RPN::Term", (SV*) (hv = newHV()));
-    if (at->attributes) {
 	int i;
 	SV *attrs = newObject("Net::Z3950::RPN::Attributes",
 			      (SV*) (av = newAV()));
-	for (i = 0; i < at->attributes->num_attributes; i++) {
-	    Z_AttributeElement *elem = at->attributes->attributes[i];
+	for (i = 0; i < list->num_attributes; i++) {
+	    Z_AttributeElement *elem = list->attributes[i];
 	    HV *hv2;
 	    SV *tmp = newObject("Net::Z3950::RPN::Attribute",
 				(SV*) (hv2 = newHV()));
@@ -439,13 +422,25 @@ static SV *apt2perl(Z_AttributesPlusTerm *at)
 	    }
 	    av_push(av, tmp);
 	}
-	setMember(hv, "attributes", attrs);
-    }
-    setMember(hv, "term", newSVpv((char*) at->term->u.general->buf,
-				  at->term->u.general->len));
-    return sv;
+	return attrs;
 }
 
+static SV *f_Term_to_SV(Z_Term *term, Z_AttributeList *attributes)
+{
+	HV *hv;
+	SV *sv = newObject("Net::Z3950::RPN::Term", (SV*) (hv = newHV()));
+
+	if (term->which != Z_Term_general)
+		fatal("can't handle RPN terms other than general");
+
+        setMember(hv, "term", newSVpv((char*) term->u.general->buf,
+				  term->u.general->len));
+
+	if (attributes) {
+		setMember(hv, "attributes", attributes2perl(attributes));
+	}
+	return sv;
+}
 
 static SV *rpn2perl(Z_RPNStructure *s)
 {
@@ -473,8 +468,8 @@ static SV *rpn2perl(Z_RPNStructure *s)
 	}
 
 	case  Z_Operand_APT:
-	    return apt2perl(o->u.attributesPlusTerm);
-
+	    return f_Term_to_SV(o->u.attributesPlusTerm->term,
+			o->u.attributesPlusTerm->attributes);
 	default:
 	    fatal("unknown RPN simple type %d", (int) o->which);
 	}
@@ -503,7 +498,7 @@ static SV *rpn2perl(Z_RPNStructure *s)
     default:
 	fatal("unknown RPN node type %d", (int) s->which);
     }
-    
+
     return 0;
 }
 
@@ -525,11 +520,11 @@ int simpleserver_ExpandSortAttributes (HV *sort_spec, Z_SortAttributes *sattr)
 
     hv_store(sort_spec, "SORT_ATTR", 9, newRV( sv_2mortal( (SV*) list ) ), 0);
 
-    for (i = 0; i < attr_list->num_attributes; i++) 
+    for (i = 0; i < attr_list->num_attributes; i++)
     {
-        Z_AttributeElement *attr = *attr_list->attributes++; 
+        Z_AttributeElement *attr = *attr_list->attributes++;
         HV *attr_spec = newHV();
-                
+
         av_push(list, newRV( sv_2mortal( (SV*) attr_spec ) ));
         hv_store(attr_spec, "ATTR_TYPE", 9, newSViv(*attr->attributeType), 0);
 
@@ -567,7 +562,7 @@ int simpleserver_SortKeySpecToHash (HV *sort_spec, Z_SortKeySpec *spec)
         else if (key->which == Z_SortKey_elementSpec)
         {
             Z_Specification *zspec = key->u.elementSpec;
-            
+
             hv_store(sort_spec, "ELEMENTSPEC_TYPE", 16,
                      newSViv(zspec->which), 0);
 
@@ -610,7 +605,7 @@ static SV *zquery2perl(Z_Query *q)
     SV *sv;
     HV *hv;
 
-    if (q->which != Z_Query_type_1 && q->which != Z_Query_type_101) 
+    if (q->which != Z_Query_type_1 && q->which != Z_Query_type_101)
 	return 0;
     sv = newObject("Net::Z3950::APDU::Query", (SV*) (hv = newHV()));
     if (q->u.type_1->attributeSetId)
@@ -633,16 +628,15 @@ 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;
 	int i;
-	
+
 	dSP;
 	ENTER;
 	SAVETMPS;
-	
+
 	aref = newAV();
 	input_setnames = rr->input_setnames;
 	for (i = 0; i < rr->num_input_setnames; i++)
@@ -664,7 +658,7 @@ int bend_sort(void *handle, bend_sort_rr *rr)
                 return 0;
             }
         }
-        
+
 	href = newHV();
 	hv_store(href, "INPUT", 5, newRV( (SV*) aref), 0);
 	hv_store(href, "OUTPUT", 6, newSVpv(rr->output_setname, 0), 0);
@@ -700,24 +694,22 @@ int bend_sort(void *handle, bend_sort_rr *rr)
 	hv_undef(href);
 	av_undef(aref);
         av_undef(sort_seq);
-       
+
 	sv_free( (SV*) aref);
 	sv_free( (SV*) href);
 	sv_free( (SV*) sort_seq);
 
 	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;
+	rr->errstring = odr_strdupn(rr->stream, ptr, len);
         zhandle->handle = point;
 
 	sv_free(err_code);
 	sv_free(err_str);
 	sv_free(status);
-	
+
         PUTBACK;
 	FREETMPS;
 	LEAVE;
@@ -725,6 +717,185 @@ int bend_sort(void *handle, bend_sort_rr *rr)
 	return 0;
 }
 
+static SV *f_FacetField_to_SV(Z_FacetField *facet_field)
+{
+	HV *hv;
+	AV *av;
+	SV *terms;
+	int i;
+	SV *sv = newObject("Net::Z3950::FacetField", (SV *) (hv = newHV()));
+	if (facet_field->attributes) {
+                setMember(hv, "attributes",
+                     attributes2perl(facet_field->attributes));
+        }
+	terms = newObject("Net::Z3950::FacetTerms", (SV *) (av = newAV()));
+
+	for (i = 0; i < facet_field->num_terms; i++) {
+	    Z_Term *z_term = facet_field->terms[i]->term;
+            HV *hv;
+	    SV *sv_count = newSViv(*facet_field->terms[i]->count);
+            SV *sv_term;
+	    SV *tmp;
+	    if (z_term->which == Z_Term_general) {
+	        sv_term = newSVpv((char*) z_term->u.general->buf,
+	                           z_term->u.general->len);
+            } else if (z_term->which == Z_Term_characterString) {
+                sv_term = newSVpv(z_term->u.characterString,
+		                  strlen(z_term->u.characterString));
+            }
+	    tmp = newObject("Net::Z3950::FacetTerm", (SV *) (hv = newHV()));
+
+	    setMember(hv, "count", sv_count);
+	    setMember(hv, "term", sv_term);
+
+	    av_push(av, tmp);
+	}
+	setMember(hv, "terms", terms);
+	return sv;
+}
+
+static SV *f_FacetList_to_SV(Z_FacetList *facet_list)
+{
+	SV *sv = 0;
+	if (facet_list) {
+		AV *av;
+		int i;
+		sv = newObject("Net::Z3950::FacetList", (SV *) (av = newAV()));
+
+		for (i = 0; i < facet_list->num; i++) {
+		       SV *sv = f_FacetField_to_SV(facet_list->elements[i]);
+		       av_push(av, sv);
+		}
+	}
+	return sv;
+}
+
+
+static void f_SV_to_FacetField(HV *facet_field_hv, Z_FacetField **fl, ODR odr)
+{
+	int i;
+	int num_terms, num_attributes;
+        SV **temp;
+	Z_AttributeList *attributes = odr_malloc(odr, sizeof(*attributes));
+
+        AV *sv_terms, *sv_attributes;
+
+	temp = hv_fetch(facet_field_hv, "attributes", 10, 1);
+	sv_attributes = (AV *) SvRV(*temp);
+	num_attributes = av_len(sv_attributes) + 1;
+	attributes->num_attributes = num_attributes;
+	attributes->attributes = (Z_AttributeElement **)
+	     odr_malloc(odr, sizeof(*attributes->attributes) * num_attributes);
+
+	for (i = 0; i < num_attributes; i++) {
+            HV *hv_elem = (HV*) SvRV(sv_2mortal(av_shift(sv_attributes)));
+            Z_AttributeElement *elem;
+	    elem = (Z_AttributeElement *) odr_malloc(odr, sizeof(*elem));
+	    attributes->attributes[i] = elem;
+
+	    elem->attributeSet = 0;
+
+  	    temp = hv_fetch(hv_elem, "attributeType", 13, 1);
+   	    elem->attributeType = odr_intdup(odr, SvIV(*temp));
+
+  	    temp = hv_fetch(hv_elem, "attributeValue", 14, 1);
+
+	    if (SvIOK(*temp)) {
+	    	    elem->which = Z_AttributeValue_numeric;
+	            elem->value.numeric = odr_intdup(odr, SvIV(*temp));
+            } else {
+                    STRLEN s_len;
+	            char *s_buf = SvPV(*temp, s_len);
+	            Z_ComplexAttribute *c = odr_malloc(odr, sizeof *c);
+	    	    elem->which = Z_AttributeValue_complex;
+		    elem->value.complex = c;
+
+		    c->num_list = 1;
+		    c->list = (Z_StringOrNumeric **) odr_malloc(odr,
+		          sizeof(*c->list));
+	            c->list[0] = (Z_StringOrNumeric *) odr_malloc(odr,
+                          sizeof(**c->list));
+	            c->list[0]->which = Z_StringOrNumeric_string;
+		    c->list[0]->u.string = odr_strdupn(odr, s_buf, s_len);
+		    c->num_semanticAction = 0;
+		    c->semanticAction = 0;
+            }
+	    hv_undef(hv_elem);
+        }
+
+	temp = hv_fetch(facet_field_hv, "terms", 5, 1);
+
+	sv_terms = (AV *) SvRV(*temp);
+	if (SvTYPE(sv_terms) == SVt_PVAV) {
+  	    num_terms = av_len(sv_terms) + 1;
+        } else {
+            num_terms = 0;
+	}
+	*fl = facet_field_create(odr, attributes, num_terms);
+	for (i = 0; i < num_terms; i++) {
+	    STRLEN s_len;
+            char *s_buf;
+            HV *hv_elem = (HV*) SvRV(sv_2mortal(av_shift(sv_terms)));
+
+	    Z_FacetTerm *facet_term =
+	     (Z_FacetTerm *) odr_malloc(odr, sizeof(*facet_term));
+	    (*fl)->terms[i] = facet_term;
+
+  	    temp = hv_fetch(hv_elem, "count", 5, 1);
+	    facet_term->count = odr_intdup(odr, SvIV(*temp));
+
+  	    temp = hv_fetch(hv_elem, "term", 4, 1);
+
+            s_buf = SvPV(*temp, s_len);
+	    facet_term->term = z_Term_create(odr, Z_Term_general, s_buf, s_len);
+	    hv_undef(hv_elem);
+	}
+}
+
+static void f_SV_to_FacetList(SV *sv, Z_OtherInformation **oip, ODR odr)
+{
+	AV *entries = (AV *) SvRV(sv);
+	int num_facets;
+	if (entries && SvTYPE(entries) == SVt_PVAV &&
+       		(num_facets = av_len(entries) + 1) > 0)
+ 	{
+            Z_OtherInformation *oi;
+            Z_OtherInformationUnit *oiu;
+	    Z_FacetList *facet_list = facet_list_create(odr, num_facets);
+	    int i;
+	    for (i = 0; i < num_facets; i++) {
+	        HV *facet_field = (HV*) SvRV(sv_2mortal(av_shift(entries)));
+	    	f_SV_to_FacetField(facet_field, &facet_list->elements[i], odr);
+		hv_undef(facet_field);
+	    }
+            oi = odr_malloc(odr, sizeof(*oi));
+            oiu = odr_malloc(odr, sizeof(*oiu));
+            oi->num_elements = 1;
+            oi->list = odr_malloc(odr, oi->num_elements * sizeof(*oi->list));
+            oiu->category = 0;
+            oiu->which = Z_OtherInfo_externallyDefinedInfo;
+            oiu->information.externallyDefinedInfo = odr_malloc(odr, sizeof(*oiu->information.externallyDefinedInfo));
+            oiu->information.externallyDefinedInfo->direct_reference = odr_oiddup(odr, yaz_oid_userinfo_facet_1);
+            oiu->information.externallyDefinedInfo->descriptor = 0;
+            oiu->information.externallyDefinedInfo->indirect_reference = 0;
+            oiu->information.externallyDefinedInfo->which = Z_External_userFacets;
+            oiu->information.externallyDefinedInfo->u.facetList = facet_list;
+            oi->list[0] = oiu;
+            *oip = oi;
+	}
+}
+
+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)
 {
@@ -738,6 +909,9 @@ int bend_search(void *handle, bend_search_rr *rr)
 	Zfront_handle *zhandle = (Zfront_handle *)handle;
 	CV* handler_cv = 0;
 	SV *rpnSV;
+	SV *facetSV;
+	char *ptr;
+	STRLEN len;
 
 	dSP;
 	ENTER;
@@ -755,9 +929,10 @@ int bend_search(void *handle, bend_search_rr *rr)
 		zhandle->stop_flag = 1;
 	}
 #endif
-	href = newHV();		
+	href = newHV();
+
 	hv_store(href, "SETNAME", 7, newSVpv(rr->setname, 0), 0);
-	if (rr->srw_sortKeys && *rr->srw_sortKeys) 
+	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);
@@ -767,9 +942,17 @@ int bend_search(void *handle, bend_search_rr *rr)
 	hv_store(href, "GHANDLE", 7, newSVsv(zhandle->ghandle), 0);
 	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);
 	}
+	facetSV = f_FacetList_to_SV(yaz_oi_get_facetlist(&rr->search_input));
+	if (facetSV) {
+	    hv_store(href, "INPUTFACETS", 11, facetSV, 0);
+	}
+
 	query = zquery2pquery(rr->query);
 	if (query)
 	{
@@ -781,14 +964,14 @@ int bend_search(void *handle, bend_search_rr *rr)
 		     newSVpv(rr->query->u.type_104->u.cql, 0), 0);
 	}
 	else
-	{	
+	{
 		rr->errcode = 108;
 		return 0;
 	}
 	PUSHMARK(sp);
-	
+
 	XPUSHs(sv_2mortal(newRV( (SV*) href)));
-	
+
 	PUTBACK;
 
 	handler_cv = simpleserver_sv2cv( search_ref );
@@ -808,6 +991,22 @@ int bend_search(void *handle, bend_search_rr *rr)
 	temp = hv_fetch(href, "HANDLE", 6, 1);
 	point = newSVsv(*temp);
 
+	temp = hv_fetch(href, "OUTPUTFACETS", 12, 1);
+        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);
 
@@ -885,7 +1084,7 @@ int bend_delete(void *handle, bend_delete_rr *rr)
 
 	zhandle->handle = point;
 
-	sv_free( (SV*) href);	
+	sv_free( (SV*) href);
 
 	PUTBACK;
 	FREETMPS;
@@ -900,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;
@@ -909,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;
@@ -944,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);
@@ -961,7 +1155,7 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
 			if (simple->which == Z_ElementSetNames_generic)
 			{
 				hv_store(href, "COMP", 4, newSVpv(simple->u.generic, 0), 0);
-			} 
+			}
 			else
 			{
 				rr->errcode = 26;
@@ -1004,7 +1198,7 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
 	XPUSHs(sv_2mortal(newRV( (SV*) href)));
 
 	PUTBACK;
-	
+
 	handler_cv = simpleserver_sv2cv( fetch_ref );
 	perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD);
 
@@ -1013,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);
@@ -1031,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);
 
@@ -1062,38 +1248,41 @@ 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);
-	
+
 	if (!(rr->errcode))
 	{
 		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),
@@ -1106,7 +1295,7 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
 	PUTBACK;
 	FREETMPS;
 	LEAVE;
-	
+
 	return 0;
 }
 
@@ -1122,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;
@@ -1153,7 +1341,7 @@ int bend_present(void *handle, bend_present_rr *rr)
 			if (simple->which == Z_ElementSetNames_generic)
 			{
 				hv_store(href, "COMP", 4, newSVpv(simple->u.generic, 0), 0);
-			} 
+			}
 			else
 			{
 				rr->errcode = 26;
@@ -1190,14 +1378,14 @@ int bend_present(void *handle, bend_present_rr *rr)
 	}
 
 	PUSHMARK(sp);
-	
+
 	XPUSHs(sv_2mortal(newRV( (SV*) href)));
-	
+
 	PUTBACK;
-	
+
 	handler_cv = simpleserver_sv2cv( present_ref );
 	perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD);
-	
+
 	SPAGAIN;
 
 	temp = hv_fetch(href, "ERR_CODE", 8, 1);
@@ -1212,14 +1400,12 @@ int bend_present(void *handle, bend_present_rr *rr)
 	PUTBACK;
 	FREETMPS;
 	LEAVE;
-	
+
 	hv_undef(href);
 	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;
@@ -1245,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;
@@ -1257,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;
@@ -1272,14 +1456,15 @@ int bend_scan(void *handle, bend_scan_rr *rr)
 	list = newAV();
 
 	/* RPN is better than TERM since it includes attributes */
-	if ((rpnSV = apt2perl(rr->term)) != 0) {
+	if ((rpnSV = f_Term_to_SV(rr->term->term, rr->term->attributes)) != 0) {
 	    setMember(href, "RPN", rpnSV);
 	}
 
 	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;
@@ -1293,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++)
@@ -1323,40 +1510,49 @@ int bend_scan(void *handle, bend_scan_rr *rr)
 
 	temp = hv_fetch(href, "STATUS", 6, 1);
 	status = newSVsv(*temp);
-	
+
 	temp = hv_fetch(href, "NUMBER", 6, 1);
 	number = newSVsv(*temp);
 
 	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);
-		temp = hv_fetch(scan_item, "OCCURRENCE", 10, 1); 
+		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);
@@ -1413,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;
 }
@@ -1444,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;
@@ -1459,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)
 	{
@@ -1470,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)
@@ -1486,7 +1682,7 @@ bend_initresult *bend_init(bend_initrequest *q)
 		q->bend_explain = bend_explain;
 	}
 
-       	href = newHV();	
+       	href = newHV();
 
 	/* ### These should be given initial values from the client */
 	hv_store(href, "IMP_ID", 6, newSVpv("", 0), 0);
@@ -1522,7 +1718,7 @@ bend_initresult *bend_init(bend_initrequest *q)
 	        hv_store(href, "PASS", 4, newSVpv(passwd, 0), 0);
 	}
 
-	PUSHMARK(sp);	
+	PUSHMARK(sp);
 
 	XPUSHs(sv_2mortal(newRV((SV*) href)));
 
@@ -1553,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);
@@ -1568,8 +1763,8 @@ bend_initresult *bend_init(bend_initrequest *q)
 	PUTBACK;
 	FREETMPS;
 	LEAVE;
-	
-	return r;	
+
+	return r;
 }
 
 void bend_close(void *handle)
@@ -1593,10 +1788,10 @@ void bend_close(void *handle)
 		XPUSHs(sv_2mortal(newRV((SV *)href)));
 
 		PUTBACK;
-	
+
 		handler_cv = simpleserver_sv2cv( close_ref );
 		perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD);
-	
+
 		SPAGAIN;
 
 		sv_free((SV*) href);
@@ -1615,6 +1810,41 @@ void bend_close(void *handle)
 	return;
 }
 
+static void start_stop(struct statserv_options_block *sob, SV *handler_ref)
+{
+	HV *href;
+	dSP;
+	ENTER;
+	SAVETMPS;
+
+	href = newHV();
+	hv_store(href, "CONFIG", 6, newSVpv(sob->configname, 0), 0);
+
+	PUSHMARK(sp);
+
+	XPUSHs(sv_2mortal(newRV((SV*) href)));
+
+	PUTBACK;
+
+	if (handler_ref != NULL)
+	{
+		CV* handler_cv = simpleserver_sv2cv( handler_ref );
+		perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD);
+	}
+
+	SPAGAIN;
+
+	PUTBACK;
+	FREETMPS;
+	LEAVE;
+
+
+}
+
+void bend_start(struct statserv_options_block *sob)
+{
+	start_stop(sob, start_ref);
+}
 
 MODULE = Net::Z3950::SimpleServer	PACKAGE = Net::Z3950::SimpleServer
 
@@ -1626,14 +1856,14 @@ set_ghandle(arg)
 		SV *arg
 	CODE:
 		_global_ghandle = newSVsv(arg);
-		
+
 
 void
 set_init_handler(arg)
 		SV *arg
 	CODE:
 		init_ref = newSVsv(arg);
-		
+
 
 void
 set_close_handler(arg)
@@ -1695,6 +1925,12 @@ set_explain_handler(arg)
 	CODE:
 		explain_ref = newSVsv(arg);
 
+void
+set_start_handler(arg)
+		SV *arg
+	CODE:
+		start_ref = newSVsv(arg);
+
 int
 start_server(...)
 	PREINIT:
@@ -1703,6 +1939,7 @@ start_server(...)
 		char *ptr;
 		int i;
 		STRLEN len;
+		struct statserv_options_block *sob;
 	CODE:
 		argv_buf = (char **)xmalloc((items + 1) * sizeof(char *));
 		argv = argv_buf;
@@ -1710,16 +1947,21 @@ start_server(...)
 		{
 			ptr = SvPV(ST(i), len);
 			*argv_buf = (char *)xmalloc(len + 1);
-			strcpy(*argv_buf++, ptr); 
+			strcpy(*argv_buf++, ptr);
 		}
 		*argv_buf = NULL;
+
+		sob = statserv_getcontrol();
+		sob->bend_start = bend_start;
+		statserv_setcontrol(sob);
+
 		root_perl_context = PERL_GET_CONTEXT;
 		yaz_mutex_create(&simpleserver_mutex);
 #if 0
 		/* only for debugging perl_clone .. */
 		tst_clones();
 #endif
-		
+
 		RETVAL = statserv_main(items, argv, bend_init, bend_close);
 	OUTPUT:
 		RETVAL
@@ -1739,7 +1981,7 @@ ScanPartial()
 	OUTPUT:
 		RETVAL
 
- 
+
 void
 yazlog(arg)
 		SV *arg