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
Getting ready to release.
[simpleserver-moved-to-github.git]
/
SimpleServer.xs
diff --git
a/SimpleServer.xs
b/SimpleServer.xs
index
012a301
..
93dbc4c
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.53 2006-07-26 11:09:14 mike Exp $
* ----------------------------------------------------------------------
*
* Copyright (c) 2000-2004, Index Data.
* ----------------------------------------------------------------------
*
* Copyright (c) 2000-2004, Index Data.
@@
-843,6
+843,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;
char *ptr;
char *ODR_record;
char *ODR_basename;
char *ptr;
char *ODR_record;
char *ODR_basename;
@@
-865,6
+866,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,8
+916,11
@@
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
}
}
else
@@
-956,6
+962,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);
@@
-1012,6
+1028,7
@@
int bend_fetch(void *handle, bend_fetch_rr *rr)
sv_free(err_code),
sv_free(sur_flag);
sv_free(rep_form);
sv_free(err_code),
sv_free(sur_flag);
sv_free(rep_form);
+ sv_free(schema);
PUTBACK;
FREETMPS;
PUTBACK;
FREETMPS;
@@
-1192,7
+1209,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;