X-Git-Url: http://git.indexdata.com/?p=simpleserver-moved-to-github.git;a=blobdiff_plain;f=SimpleServer.xs;h=2062ac3c8f4c9c034c8afa29c716ebd62c55ae74;hp=f3899e755f9d81c7f93e902fb69b7576397594b1;hb=c987ce263013255ff651b58eb78b63200feb31c1;hpb=9d4aafa68700c76b6d82203bc53592875bb83825

diff --git a/SimpleServer.xs b/SimpleServer.xs
index f3899e7..2062ac3 100644
--- a/SimpleServer.xs
+++ b/SimpleServer.xs
@@ -1,5 +1,5 @@
 /*
- * $Id: SimpleServer.xs,v 1.58 2007-04-17 07:56:29 adam Exp $ 
+ * $Id: SimpleServer.xs,v 1.63 2007-05-23 10:22:00 sondberg Exp $ 
  * ----------------------------------------------------------------------
  * 
  * Copyright (c) 2000-2004, Index Data.
@@ -37,6 +37,8 @@
 #include <yaz/wrbuf.h>
 #include <yaz/querytowrbuf.h>
 #include <stdio.h>
+#include <yaz/mutex.h>
+#include <yaz/oid_db.h>
 #ifdef WIN32
 #else
 #include <unistd.h>
@@ -51,7 +53,7 @@
 #define sv_undef PL_sv_undef
 #endif
 
-NMEM_MUTEX simpleserver_mutex;
+YAZ_MUTEX simpleserver_mutex;
 
 typedef struct {
 	SV *handle;
@@ -83,7 +85,6 @@ SV *delete_ref = NULL;
 SV *scan_ref = NULL;
 SV *explain_ref = NULL;
 PerlInterpreter *root_perl_context;
-int MAX_OID = 15;
 
 #define GRS_BUF_SIZE 8192
 
@@ -129,7 +130,7 @@ void tst_clones(void)
 
 int simpleserver_clone(void) {
 #ifdef USE_ITHREADS
-     nmem_mutex_enter(simpleserver_mutex);
+     yaz_mutex_enter(simpleserver_mutex);
      if (1)
      {
          PerlInterpreter *current = PERL_GET_CONTEXT;
@@ -145,14 +146,14 @@ int simpleserver_clone(void) {
              PERL_SET_CONTEXT( perl_interp );
          }
      }
-     nmem_mutex_leave(simpleserver_mutex);
+     yaz_mutex_leave(simpleserver_mutex);
 #endif
      return 0;
 }
 
 
 void simpleserver_free(void) {
-    nmem_mutex_enter(simpleserver_mutex);
+    yaz_mutex_enter(simpleserver_mutex);
     if (1)
     {
         PerlInterpreter *current_interp = PERL_GET_CONTEXT;
@@ -167,7 +168,7 @@ void simpleserver_free(void) {
             perl_free(current_interp);
 	}
     }
-    nmem_mutex_leave(simpleserver_mutex);
+    yaz_mutex_leave(simpleserver_mutex);
 }
 
 
@@ -226,21 +227,18 @@ Z_GenericRecord *read_grs1(char *str, ODR o)
 			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->tagType = odr_intdup(o, 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;
+			t->tagValue->u.numeric = odr_intdup(o, 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->tagValue->u.string = odr_strdup(o, value);
 		}
 		t->tagOccurrence = 0;
 		t->metaData = 0;
@@ -262,7 +260,6 @@ Z_GenericRecord *read_grs1(char *str, ODR o)
 
 
 
-
 static void oid2str(Odr_oid *o, WRBUF buf)
 {
     for (; *o >= 0; o++) {
@@ -274,6 +271,13 @@ static void oid2str(Odr_oid *o, WRBUF buf)
     }
 }
 
+WRBUF oid2dotted(Odr_oid *oid)
+{
+    WRBUF buf = wrbuf_alloc();
+    oid2str(oid, buf);
+    return buf;
+}
+		
 
 WRBUF zquery2pquery(Z_Query *q)
 {
@@ -767,30 +771,6 @@ int bend_search(void *handle, bend_search_rr *rr)
 }
 
 
-/* ### this is worryingly similar to oid2str() */
-WRBUF oid2dotted(int *oid)
-{
-
-	WRBUF buf = wrbuf_alloc();
-	int dot = 0;
-
-	for (; *oid != -1 ; oid++)
-	{
-		char ibuf[16];
-		if (dot)
-		{
-			wrbuf_putc(buf, '.');
-		}
-		else
-		{
-			dot = 1;
-		}
-		sprintf(ibuf, "%d", *oid);
-		wrbuf_puts(buf, ibuf);
-	}
-	return buf;
-}
-		
 int bend_fetch(void *handle, bend_fetch_rr *rr)
 {
 	HV *href;
@@ -808,7 +788,6 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
 	char *ODR_record;
 	char *ODR_basename;
 	char *ODR_errstr;
-	int *ODR_oid_buf;
 	WRBUF oid_dotted;
 	Zfront_handle *zhandle = (Zfront_handle *)handle;
 	CV* handler_cv = 0;
@@ -827,6 +806,9 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
 	hv_store(href, "SETNAME", 7, newSVpv(rr->setname, 0), 0);
 	if (rr->schema)
 		hv_store(href, "SCHEMA", 6, newSVpv(rr->schema, 0), 0);
+        else
+                hv_store(href, "SCHEMA", 6, newSVpv("", 0), 0);
+
 	temp = hv_store(href, "OFFSET", 6, newSViv(rr->number), 0);
 	if (rr->request_format != 0) {
 	    oid_dotted = oid2dotted(rr->request_format);
@@ -944,16 +926,17 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
 
 	ptr = SvPV(rep_form, length);
 
-	ODR_oid_buf = (int *)odr_malloc(rr->stream, (MAX_OID + 1) * sizeof(int));
-	if (oid_dotstring_to_oid(ptr, ODR_oid_buf))
+	rr->output_format = yaz_string_to_oid_odr(yaz_oid_std(),
+					CLASS_RECSYN, ptr, rr->stream);
+	if (!rr->output_format)
 	{
-		printf("Net::Z3950::SimpleServer: WARNING: OID structure too long, max length is %d\n", MAX_OID);
+		printf("Net::Z3950::SimpleServer: WARNING: Bad OID %s\n", ptr);
+		rr->output_format =
+			odr_oiddup(rr->stream, yaz_oid_recsyn_sutrs);
 	}
-	rr->output_format = ODR_oid_buf;	
-	
 	ptr = SvPV(record, length);
         /* Treat GRS-1 records separately */
-	if (!oid_oidcmp(ODR_oid_buf, yaz_oid_recsyn_grs_1))
+	if (!oid_oidcmp(rr->output_format, yaz_oid_recsyn_grs_1))
 	{
 		rr->record = (char *) read_grs1(ptr, rr->stream);
 		rr->len = -1;
@@ -1574,7 +1557,7 @@ start_server(...)
 		}
 		*argv_buf = NULL;
 		root_perl_context = PERL_GET_CONTEXT;
-		nmem_mutex_create(&simpleserver_mutex);
+		yaz_mutex_create(&simpleserver_mutex);
 #if 0
 		/* only for debugging perl_clone .. */
 		tst_clones();