projects
/
simpleserver-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updating.
[simpleserver-moved-to-github.git]
/
SimpleServer.xs
diff --git
a/SimpleServer.xs
b/SimpleServer.xs
index
012a301
..
0562cee
100644
(file)
--- a/
SimpleServer.xs
+++ b/
SimpleServer.xs
@@
-1,5
+1,5
@@
/*
/*
- * $Id: SimpleServer.xs,v 1.48 2006-06-07 18:25:15 quinn Exp $
+ * $Id: SimpleServer.xs,v 1.55 2006-12-22 12:27:19 sondberg Exp $
* ----------------------------------------------------------------------
*
* Copyright (c) 2000-2004, Index Data.
* ----------------------------------------------------------------------
*
* Copyright (c) 2000-2004, Index Data.
@@
-35,6
+35,7
@@
#include <yaz/backend.h>
#include <yaz/log.h>
#include <yaz/wrbuf.h>
#include <yaz/backend.h>
#include <yaz/log.h>
#include <yaz/wrbuf.h>
+#include <yaz/querytowrbuf.h>
#include <stdio.h>
#ifdef WIN32
#else
#include <stdio.h>
#ifdef WIN32
#else
@@
-194,7
+195,7
@@
Z_GenericRecord *read_grs1(char *str, ODR o)
}
len = ptr - str;
if (len > GRS_BUF_SIZE) {
}
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);
len = GRS_BUF_SIZE;
}
strncpy(line, str, len);
@@
-209,7
+210,7
@@
Z_GenericRecord *read_grs1(char *str, ODR o)
}
if (sscanf(buf, "(%d,%[^)])", &type, value) != 2)
{
}
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')
return r;
}
if (!type && *value == '0')
@@
-221,7
+222,7
@@
Z_GenericRecord *read_grs1(char *str, ODR o)
buf++;
if (r->num_elements >= GRS_MAX_FIELDS)
{
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));
exit(0);
}
r->elements[r->num_elements] = t = (Z_TaggedElement *) odr_malloc(o, sizeof(Z_TaggedElement));
@@
-843,6
+844,7
@@
int bend_fetch(void *handle, bend_fetch_rr *rr)
SV *sur_flag;
SV *point;
SV *rep_form;
SV *sur_flag;
SV *point;
SV *rep_form;
+ SV *schema = 0;
char *ptr;
char *ODR_record;
char *ODR_basename;
char *ptr;
char *ODR_record;
char *ODR_basename;
@@
-865,6
+867,8
@@
int bend_fetch(void *handle, bend_fetch_rr *rr)
rr->errcode = 0;
href = newHV();
hv_store(href, "SETNAME", 7, newSVpv(rr->setname, 0), 0);
rr->errcode = 0;
href = newHV();
hv_store(href, "SETNAME", 7, newSVpv(rr->setname, 0), 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);
temp = hv_store(href, "OFFSET", 6, newSViv(rr->number), 0);
if (rr->request_format_raw != 0) {
oid_dotted = oid2dotted(rr->request_format_raw);
@@
-913,14
+917,17
@@
int bend_fetch(void *handle, bend_fetch_rr *rr)
}
else
{
}
else
{
+#if 0 /* For now ignore this error, which is ubiquitous in SRU */
+ fprintf(stderr, "complex is weird\n");
rr->errcode = 26;
return 0;
rr->errcode = 26;
return 0;
+#endif /*0*/
}
}
else
{
rr->errcode = 26;
}
}
else
{
rr->errcode = 26;
- return;
+ return 0;
}
}
}
}
@@
-956,6
+963,16
@@
int bend_fetch(void *handle, bend_fetch_rr *rr)
temp = hv_fetch(href, "REP_FORM", 8, 1);
rep_form = newSVsv(*temp);
temp = hv_fetch(href, "REP_FORM", 8, 1);
rep_form = 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);
temp = hv_fetch(href, "HANDLE", 6, 1);
point = newSVsv(*temp);
@@
-1013,6
+1030,9
@@
int bend_fetch(void *handle, bend_fetch_rr *rr)
sv_free(sur_flag);
sv_free(rep_form);
sv_free(sur_flag);
sv_free(rep_form);
+ if (schema)
+ sv_free(schema);
+
PUTBACK;
FREETMPS;
LEAVE;
PUTBACK;
FREETMPS;
LEAVE;
@@
-1093,7
+1113,7
@@
int bend_present(void *handle, bend_present_rr *rr)
else
{
rr->errcode = 26;
else
{
rr->errcode = 26;
- return;
+ return 0;
}
}
}
}
@@
-1192,7
+1212,7
@@
int bend_scan(void *handle, bend_scan_rr *rr)
if (rr->term->term->which == Z_Term_general)
{
term_len = rr->term->term->u.general->len;
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;
} else {
rr->errcode = 229; /* Unsupported term type */
return 0;