X-Git-Url: http://git.indexdata.com/?p=simpleserver-moved-to-github.git;a=blobdiff_plain;f=SimpleServer.xs;h=74d22814e99aa6368e13c800e481b6b7bdd1cda8;hp=e2db79f52d07ca5cdb51fc106fa130dcafe34f0f;hb=ab2ce62608c39f599a199ee62fe2a22127c0b251;hpb=2edffd526d9e0ced8031fb5e3fcb658b93a69b39

diff --git a/SimpleServer.xs b/SimpleServer.xs
index e2db79f..74d2281 100644
--- a/SimpleServer.xs
+++ b/SimpleServer.xs
@@ -24,6 +24,14 @@
  * OF THIS SOFTWARE.
  */
 
+/*$Log: SimpleServer.xs,v $
+/*Revision 1.8  2001-05-21 11:07:02  sondberg
+/*Extended maximum numbers of GRS-1 elements. Should be done dynamically.
+/*
+/*Revision 1.7  2001/03/13 14:17:15  sondberg
+/*Added support for GRS-1.
+/**/
+
 
 #include "EXTERN.h"
 #include "perl.h"
@@ -32,12 +40,16 @@
 #include <yaz/log.h>
 #include <yaz/wrbuf.h>
 #include <stdio.h>
+#include <unistd.h>
 #include <stdlib.h>
 #include <ctype.h>
+#define GRS_MAX_FIELDS 500 
 #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;
@@ -64,6 +76,100 @@ SV *delete_ref = NULL;
 SV *scan_ref = NULL;
 int MAX_OID = 15;
 
+
+Z_GenericRecord *read_grs1(char *str, ODR o)
+{
+	int type, ivalue;
+	char line[512], *buf, *ptr, *original;
+	char value[512];
+ 	Z_GenericRecord *r = 0;
+
+	original = str;
+	for (;;)
+	{
+		Z_TaggedElement *t;
+		Z_ElementData *c;
+	
+		ptr = strchr(str, '\n');
+		if (!ptr) {
+			return r;
+		}
+		strncpy(line, str, ptr - str);
+		line[ptr - str] = 0;
+		buf = line;
+		str = ptr + 1;
+		while (*buf && isspace(*buf))
+			buf++;
+		if (*buf == '}') {
+			memmove(original, str, strlen(str));
+			return r;
+		}
+		if (sscanf(buf, "(%d,%[^)])", &type, value) != 2)
+		{
+			yaz_log(LOG_WARN, "Bad data in '%s'", buf);
+			return 0;
+		}
+		if (!type && *value == '0')
+			return r;
+		if (!(buf = strchr(buf, ')')))
+			return 0;
+		buf++;
+		while (*buf && isspace(*buf))
+			buf++;
+		if (!*buf)
+			return 0;
+		if (!r)
+		{
+			r = (Z_GenericRecord *)odr_malloc(o, sizeof(*r));
+			r->elements = (Z_TaggedElement **)
+			odr_malloc(o, sizeof(Z_TaggedElement*) * GRS_MAX_FIELDS);
+			r->num_elements = 0;
+		}
+		if (r->num_elements > GRS_MAX_FIELDS)
+		{
+			yaz_log(LOG_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));
+		t->tagType = (int *)odr_malloc(o, sizeof(int));
+		*t->tagType = type;
+		t->tagValue = (Z_StringOrNumeric *)
+			odr_malloc(o, sizeof(Z_StringOrNumeric));
+		if ((ivalue = atoi(value)))
+		{
+			t->tagValue->which = Z_StringOrNumeric_numeric;
+			t->tagValue->u.numeric = (int *)odr_malloc(o, sizeof(int));
+			*t->tagValue->u.numeric = ivalue;
+		}
+		else
+		{
+			t->tagValue->which = Z_StringOrNumeric_string;
+			t->tagValue->u.string = (char *)odr_malloc(o, strlen(value)+1);
+			strcpy(t->tagValue->u.string, value);
+		}
+		t->tagOccurrence = 0;
+		t->metaData = 0;
+		t->appliedVariant = 0;
+		t->content = c = (Z_ElementData *)odr_malloc(o, sizeof(Z_ElementData));
+		if (*buf == '{')
+		{
+			c->which = Z_ElementData_subtree;
+			c->u.subtree = read_grs1(str, o);
+		}
+		else
+		{
+			c->which = Z_ElementData_string;
+/*			buf[strlen(buf)-1] = '\0';*/
+			buf[strlen(buf)] = '\0';
+			c->u.string = odr_strdup(o, buf);
+		}
+		r->num_elements++;
+	}
+}
+
+
+
+
 static void oid2str(Odr_oid *o, WRBUF buf)
 {
     for (; *o >= 0; o++) {
@@ -267,6 +373,7 @@ int bend_search(void *handle, bend_search_rr *rr)
 	hv_store(href, "HITS", 4, newSViv(0), 0);
 	hv_store(href, "DATABASES", 9, newRV( (SV*) aref), 0);
 	hv_store(href, "HANDLE", 6, zhandle->handle, 0);
+	hv_store(href, "PID", 3, newSViv(getpid()), 0);
 	query = zquery2pquery(rr->query);
 	if (query)
 	{
@@ -407,13 +514,13 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
 	char *ODR_basename;
 	char *ODR_errstr;
 	int *ODR_oid_buf;
+	oident *oid;
 	WRBUF oid_dotted;
 	Zfront_handle *zhandle = (Zfront_handle *)handle;
 
 	Z_RecordComposition *composition;
 	Z_ElementSetNames *simple;
 	STRLEN length;
-	int oid;
 
 	dSP;
 	ENTER;
@@ -433,6 +540,7 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
 	hv_store(href, "ERR_STR", 7, newSVpv("", 0), 0);
 	hv_store(href, "SUR_FLAG", 8, newSViv(0), 0);
 	hv_store(href, "HANDLE", 6, zhandle->handle, 0);
+	hv_store(href, "PID", 3, newSViv(getpid()), 0);
 	if (rr->comp)
 	{
 		composition = rr->comp;
@@ -508,11 +616,19 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
 	rr->output_format_raw = ODR_oid_buf;	
 	
 	ptr = SvPV(record, length);
-	ODR_record = (char *)odr_malloc(rr->stream, length + 1);
-	strcpy(ODR_record, ptr);
-	rr->record = ODR_record;
-	rr->len = length;
-
+	oid = oid_getentbyoid(ODR_oid_buf);
+	if (oid->value == VAL_GRS1)		/* Treat GRS-1 records separately */
+	{
+		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;
+	}
 	zhandle->handle = point;
 	handle = zhandle;
 	rr->last_in_set = SvIV(last);
@@ -573,6 +689,7 @@ int bend_present(void *handle, bend_present_rr *rr)
 	/*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);
+	hv_store(href, "PID", 3, newSViv(getpid()), 0);
 	if (rr->comp)
 	{
 		composition = rr->comp;
@@ -706,6 +823,7 @@ bend_initresult *bend_init(bend_initrequest *q)
 	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);
+	hv_store(href, "PID", 3, newSViv(getpid()), 0);
 
 	PUSHMARK(sp);