/*
- * $Id: SimpleServer.xs,v 1.53 2006-07-26 11:09:14 mike Exp $
+ * $Id: SimpleServer.xs,v 1.57 2007-04-17 07:55:02 adam 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));
oid2str(sattr->id, attrset_wr);
hv_store(sort_spec, "ATTRSET", 7,
newSVpv(attrset_wr->buf, attrset_wr->pos), 0);
- wrbuf_free(attrset_wr, 1);
+ wrbuf_destroy(attrset_wr);
hv_store(sort_spec, "SORT_ATTR", 9, newRV( sv_2mortal( (SV*) list ) ), 0);
oid2str(zspec->schema.oid, elementSpec);
hv_store(sort_spec, "ELEMENTSPEC_VALUE", 17,
newSVpv(elementSpec->buf, elementSpec->pos), 0);
- wrbuf_free(elementSpec, 1);
+ wrbuf_destroy(elementSpec);
}
else if (zspec->which == Z_Schema_uri)
{
sv_free( (SV*) aref);
sv_free( (SV*) href);
if (query)
- wrbuf_free(query, 1);
+ wrbuf_destroy(query);
PUTBACK;
FREETMPS;
LEAVE;
SV *sur_flag;
SV *point;
SV *rep_form;
- SV *schema;
+ SV *schema = 0;
char *ptr;
char *ODR_record;
char *ODR_basename;
char *ODR_errstr;
int *ODR_oid_buf;
- oident *oid;
WRBUF oid_dotted;
Zfront_handle *zhandle = (Zfront_handle *)handle;
CV* handler_cv = 0;
if (rr->schema)
hv_store(href, "SCHEMA", 6, newSVpv(rr->schema, 0), 0);
temp = hv_store(href, "OFFSET", 6, newSViv(rr->number), 0);
- if (rr->request_format_raw != 0) {
- oid_dotted = oid2dotted(rr->request_format_raw);
+ if (rr->request_format != 0) {
+ oid_dotted = oid2dotted(rr->request_format);
} else {
/* Probably an SRU request: assume XML is required */
oid_dotted = wrbuf_alloc();
else
{
rr->errcode = 26;
- return;
+ return 0;
}
}
rr->basename = ODR_basename;
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 */
+ if (oid_dotstring_to_oid(ptr, ODR_oid_buf))
{
printf("Net::Z3950::SimpleServer: WARNING: OID structure too long, max length is %d\n", MAX_OID);
}
- rr->output_format_raw = ODR_oid_buf;
+ rr->output_format = ODR_oid_buf;
ptr = SvPV(record, length);
- oid = oid_getentbyoid(ODR_oid_buf);
- if (oid->value == VAL_GRS1) /* Treat GRS-1 records separately */
+ /* Treat GRS-1 records separately */
+ if (!oid_oidcmp(ODR_oid_buf, yaz_oid_recsyn_grs_1))
{
rr->record = (char *) read_grs1(ptr, rr->stream);
rr->len = -1;
}
rr->surrogate_flag = SvIV(sur_flag);
- wrbuf_free(oid_dotted, 1);
+ wrbuf_destroy(oid_dotted);
sv_free((SV*) href);
sv_free(basename);
sv_free(record);
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;
}
}