/*
- * $Id: SimpleServer.xs,v 1.50 2006-07-24 23:05:22 mike Exp $
+ * $Id: SimpleServer.xs,v 1.56 2007-03-05 11:47:16 mike Exp $
* ----------------------------------------------------------------------
*
* Copyright (c) 2000-2004, Index Data.
#include <yaz/backend.h>
#include <yaz/log.h>
#include <yaz/wrbuf.h>
+#include <yaz/querytowrbuf.h>
#include <stdio.h>
#ifdef WIN32
#else
PerlInterpreter *root_perl_context;
int MAX_OID = 15;
-#define GRS_BUF_SIZE 512
+#define GRS_BUF_SIZE 8192
CV * simpleserver_sv2cv(SV *handler) {
STRLEN len;
}
len = ptr - str;
if (len > GRS_BUF_SIZE) {
- yaz_log(LOG_WARN, "GRS string too long - truncating (%d > %d)", len, GRS_BUF_SIZE);
+ yaz_log(YLOG_WARN, "GRS string too long - truncating (%d > %d)", len, GRS_BUF_SIZE);
len = GRS_BUF_SIZE;
}
strncpy(line, str, len);
}
if (sscanf(buf, "(%d,%[^)])", &type, value) != 2)
{
- yaz_log(LOG_WARN, "Bad data in '%s'", buf);
+ yaz_log(YLOG_WARN, "Bad data in '%s'", buf);
return r;
}
if (!type && *value == '0')
buf++;
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);
+ 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));
SV *sur_flag;
SV *point;
SV *rep_form;
- SV *schema;
+ SV *schema = 0;
char *ptr;
char *ODR_record;
char *ODR_basename;
else
{
rr->errcode = 26;
- return;
+ return 0;
}
}
temp = hv_fetch(href, "REP_FORM", 8, 1);
rep_form = newSVsv(*temp);
- temp = hv_fetch(href, "SCHEMA", 8, 1);
- schema = newSVsv(*temp);
+ temp = hv_fetch(href, "SCHEMA", 6, 1);
+ 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);
+ }
+ }
temp = hv_fetch(href, "HANDLE", 6, 1);
point = newSVsv(*temp);
strcpy(ODR_basename, ptr);
rr->basename = ODR_basename;
- ptr = SvPV(schema, length);
- rr->schema = (char *)odr_malloc(rr->stream, length + 1);
- strcpy(rr->schema, ptr);
-
ptr = SvPV(rep_form, length);
ODR_oid_buf = (int *)odr_malloc(rr->stream, (MAX_OID + 1) * sizeof(int));
if (dotted2oid(ptr, ODR_oid_buf) == -1) /* Maximum number of OID elements exceeded */
sv_free(err_code),
sv_free(sur_flag);
sv_free(rep_form);
- sv_free(schema);
+
+ if (schema)
+ sv_free(schema);
PUTBACK;
FREETMPS;
else
{
rr->errcode = 26;
- return;
+ return 0;
}
}
if (rr->term->term->which == Z_Term_general)
{
term_len = rr->term->term->u.general->len;
- hv_store(href, "TERM", 4, newSVpv(rr->term->term->u.general->buf, term_len), 0);
+ hv_store(href, "TERM", 4, newSVpv((char*) rr->term->term->u.general->buf, term_len), 0);
} else {
rr->errcode = 229; /* Unsupported term type */
return 0;