/*
- * $Id: SimpleServer.xs,v 1.60 2007-04-17 20:26:58 adam Exp $
+ * $Id: SimpleServer.xs,v 1.63 2007-05-23 10:22:00 sondberg Exp $
* ----------------------------------------------------------------------
*
* Copyright (c) 2000-2004, Index Data.
#include <yaz/querytowrbuf.h>
#include <stdio.h>
#include <yaz/mutex.h>
+#include <yaz/oid_db.h>
#ifdef WIN32
#else
#include <unistd.h>
SV *scan_ref = NULL;
SV *explain_ref = NULL;
PerlInterpreter *root_perl_context;
-int MAX_OID = 15;
#define GRS_BUF_SIZE 8192
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;
}
}
-WRBUF oid2dotted(int *oid)
+WRBUF oid2dotted(Odr_oid *oid)
{
WRBUF buf = wrbuf_alloc();
oid2str(oid, buf);
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;
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);
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;