* OF THIS SOFTWARE.
*/
+/*$Log: SimpleServer.xs,v $
+/*Revision 1.12 2001-08-30 14:02:10 sondberg
+/*Small changes.
+/*
+/*Revision 1.11 2001/08/30 13:15:11 sondberg
+/*Corrected a memory leak, one more to go.
+/*
+/*Revision 1.10 2001/08/29 11:48:36 sondberg
+/*Added routines
+/*
+/* Net::Z3950::SimpleServer::ScanSuccess
+/* Net::Z3950::SimpleServer::ScanPartial
+/*
+/*and a bit of documentation.
+/*
+/*Revision 1.9 2001/08/24 14:00:20 sondberg
+/*Added support for scan.
+/*
+/*Revision 1.8 2001/05/21 11:07:02 sondberg
+/*Extended maximum numbers of GRS-1 elements. Should be done dynamically.
+/*
+/*Revision 1.7 2001/03/13 14:17:15 sondberg
+/*Added support for GRS-1.
+/**/
+
#include "EXTERN.h"
#include "perl.h"
#include <yaz/log.h>
#include <yaz/wrbuf.h>
#include <stdio.h>
+#include <unistd.h>
#include <stdlib.h>
#include <ctype.h>
+#define GRS_MAX_FIELDS 500
#ifdef ASN_COMPILED
#include <yaz/ill.h>
#endif
SV *scan_ref = NULL;
int MAX_OID = 15;
+
+Z_GenericRecord *read_grs1(char *str, ODR o)
+{
+ int type, ivalue;
+ char line[512], *buf, *ptr, *original;
+ char value[512];
+ Z_GenericRecord *r = 0;
+
+ original = str;
+ for (;;)
+ {
+ Z_TaggedElement *t;
+ Z_ElementData *c;
+
+ ptr = strchr(str, '\n');
+ if (!ptr) {
+ return r;
+ }
+ strncpy(line, str, ptr - str);
+ line[ptr - str] = 0;
+ buf = line;
+ str = ptr + 1;
+ while (*buf && isspace(*buf))
+ buf++;
+ if (*buf == '}') {
+ memmove(original, str, strlen(str));
+ return r;
+ }
+ if (sscanf(buf, "(%d,%[^)])", &type, value) != 2)
+ {
+ yaz_log(LOG_WARN, "Bad data in '%s'", buf);
+ return 0;
+ }
+ if (!type && *value == '0')
+ return r;
+ if (!(buf = strchr(buf, ')')))
+ return 0;
+ buf++;
+ while (*buf && isspace(*buf))
+ buf++;
+ if (!*buf)
+ return 0;
+ if (!r)
+ {
+ r = (Z_GenericRecord *)odr_malloc(o, sizeof(*r));
+ r->elements = (Z_TaggedElement **)
+ odr_malloc(o, sizeof(Z_TaggedElement*) * GRS_MAX_FIELDS);
+ r->num_elements = 0;
+ }
+ 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);
+ 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->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;
+ }
+ 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->tagOccurrence = 0;
+ t->metaData = 0;
+ t->appliedVariant = 0;
+ t->content = c = (Z_ElementData *)odr_malloc(o, sizeof(Z_ElementData));
+ if (*buf == '{')
+ {
+ c->which = Z_ElementData_subtree;
+ c->u.subtree = read_grs1(str, o);
+ }
+ else
+ {
+ c->which = Z_ElementData_string;
+/* buf[strlen(buf)-1] = '\0';*/
+ buf[strlen(buf)] = '\0';
+ c->u.string = odr_strdup(o, buf);
+ }
+ r->num_elements++;
+ }
+}
+
+
+
+
static void oid2str(Odr_oid *o, WRBUF buf)
{
for (; *o >= 0; o++) {
hv_store(href, "HITS", 4, newSViv(0), 0);
hv_store(href, "DATABASES", 9, newRV( (SV*) aref), 0);
hv_store(href, "HANDLE", 6, zhandle->handle, 0);
+ hv_store(href, "PID", 3, newSViv(getpid()), 0);
query = zquery2pquery(rr->query);
if (query)
{
char *ODR_basename;
char *ODR_errstr;
int *ODR_oid_buf;
+ oident *oid;
WRBUF oid_dotted;
Zfront_handle *zhandle = (Zfront_handle *)handle;
Z_RecordComposition *composition;
Z_ElementSetNames *simple;
STRLEN length;
- int oid;
dSP;
ENTER;
hv_store(href, "ERR_STR", 7, newSVpv("", 0), 0);
hv_store(href, "SUR_FLAG", 8, newSViv(0), 0);
hv_store(href, "HANDLE", 6, zhandle->handle, 0);
+ hv_store(href, "PID", 3, newSViv(getpid()), 0);
if (rr->comp)
{
composition = rr->comp;
rr->output_format_raw = ODR_oid_buf;
ptr = SvPV(record, length);
- ODR_record = (char *)odr_malloc(rr->stream, length + 1);
- strcpy(ODR_record, ptr);
- rr->record = ODR_record;
- rr->len = length;
-
+ oid = oid_getentbyoid(ODR_oid_buf);
+ if (oid->value == VAL_GRS1) /* Treat GRS-1 records separately */
+ {
+ rr->record = (char *) read_grs1(ptr, rr->stream);
+ rr->len = -1;
+ }
+ else
+ {
+ ODR_record = (char *)odr_malloc(rr->stream, length + 1);
+ strcpy(ODR_record, ptr);
+ rr->record = ODR_record;
+ rr->len = length;
+ }
zhandle->handle = point;
handle = zhandle;
rr->last_in_set = SvIV(last);
/*oid_dotted = oid2dotted(rr->request_format_raw);
hv_store(href, "REQ_FORM", 8, newSVpv((char *)oid_dotted->buf, oid_dotted->pos), 0);*/
hv_store(href, "HITS", 4, newSViv(0), 0);
+ hv_store(href, "PID", 3, newSViv(getpid()), 0);
if (rr->comp)
{
composition = rr->comp;
int bend_scan(void *handle, bend_scan_rr *rr)
{
- perl_call_sv(scan_ref, G_VOID | G_DISCARD | G_NOARGS);
- return 0;
+ HV *href;
+ AV *aref;
+ AV *list;
+ AV *entries;
+ HV *scan_item;
+ struct scan_entry *scan_list;
+ struct scan_entry *buffer;
+ int *step_size = rr->step_size;
+ int i;
+ char **basenames;
+ SV **temp;
+ SV *err_code = sv_newmortal();
+ SV *err_str = sv_newmortal();
+ SV *point = sv_newmortal();
+ SV *status = sv_newmortal();
+ SV *number = sv_newmortal();
+ char *ptr;
+ char *ODR_errstr;
+ STRLEN len;
+ int term_len;
+ SV *term_tmp;
+ SV *entries_ref;
+
+ Zfront_handle *zhandle = (Zfront_handle *)handle;
+
+ dSP;
+ ENTER;
+ SAVETMPS;
+ href = newHV();
+ list = newAV();
+ 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);
+ } else {
+ rr->errcode = 229; /* Unsupported term type */
+ return 0;
+ }
+ hv_store(href, "STEP", 4, newSViv(*step_size), 0);
+ hv_store(href, "NUMBER", 6, newSViv(rr->num_entries), 0);
+ hv_store(href, "POS", 3, newSViv(rr->term_position), 0);
+ hv_store(href, "ERR_CODE", 8, newSViv(0), 0);
+ hv_store(href, "ERR_STR", 7, newSVpv("", 0), 0);
+ hv_store(href, "HANDLE", 6, zhandle->handle, 0);
+ hv_store(href, "STATUS", 6, newSViv(BEND_SCAN_SUCCESS), 0);
+ hv_store(href, "ENTRIES", 7, newRV((SV *) list), 0);
+ aref = newAV();
+ basenames = rr->basenames;
+ for (i = 0; i < rr->num_bases; i++)
+ {
+ av_push(aref, newSVpv(*basenames++, 0));
+ }
+ hv_store(href, "DATABASES", 9, newRV( (SV*) aref), 0);
+
+ PUSHMARK(sp);
+
+ XPUSHs(sv_2mortal(newRV( (SV*) href)));
+
+ PUTBACK;
+
+ perl_call_sv(scan_ref, G_SCALAR | G_DISCARD);
+
+ SPAGAIN;
+
+ temp = hv_fetch(href, "ERR_CODE", 8, 1);
+ err_code = newSVsv(*temp);
+
+ temp = hv_fetch(href, "ERR_STR", 7, 1);
+ err_str = newSVsv(*temp);
+
+ temp = hv_fetch(href, "HANDLE", 6, 1);
+ point = newSVsv(*temp);
+
+ temp = hv_fetch(href, "STATUS", 6, 1);
+ status = newSVsv(*temp);
+
+ temp = hv_fetch(href, "NUMBER", 6, 1);
+ number = newSVsv(*temp);
+
+ temp = hv_fetch(href, "ENTRIES", 7, 1);
+ entries_ref = newSVsv(*temp);
+
+ PUTBACK;
+ FREETMPS;
+ LEAVE;
+
+ ptr = SvPV(err_str, len);
+ ODR_errstr = (char *)odr_malloc(rr->stream, len + 1);
+ strcpy(ODR_errstr, ptr);
+ rr->errstring = ODR_errstr;
+ rr->errcode = SvIV(err_code);
+ rr->num_entries = SvIV(number);
+ rr->status = SvIV(status);
+ scan_list = (struct scan_entry *) odr_malloc (rr->stream, rr->num_entries * sizeof(*scan_list));
+ buffer = scan_list;
+ entries = (AV *)SvRV(entries_ref);
+ for (i = 0; i < rr->num_entries; i++)
+ {
+ scan_item = (HV *)SvRV(sv_2mortal(av_shift(entries)));
+ temp = hv_fetch(scan_item, "TERM", 4, 1);
+ ptr = SvPV(*temp, len);
+ buffer->term = (char *) odr_malloc (rr->stream, len + 1);
+ strcpy(buffer->term, ptr);
+ temp = hv_fetch(scan_item, "OCCURRENCE", 10, 1);
+ buffer->occurrences = SvIV(*temp);
+ buffer++;
+ hv_undef(scan_item);
+ }
+ rr->entries = scan_list;
+ zhandle->handle = point;
+ handle = zhandle;
+ sv_free(err_code);
+ sv_free(err_str);
+ sv_free(status);
+ sv_free(number);
+ hv_undef(href);
+ sv_free((SV *)href);
+ av_undef(aref);
+ sv_free((SV *)aref);
+ av_undef(list);
+ sv_free((SV *)list);
+ av_undef(entries);
+ /*sv_free((SV *)entries);*/
+ sv_free(entries_ref);
+
+ return 0;
}
{
q->bend_fetch = bend_fetch;
}
- /*q->bend_scan = bend_scan;*/
+ if (scan_ref)
+ {
+ q->bend_scan = bend_scan;
+ }
href = newHV();
hv_store(href, "IMP_NAME", 8, newSVpv("", 0), 0);
hv_store(href, "IMP_VER", 7, newSVpv("", 0), 0);
hv_store(href, "ERR_CODE", 8, newSViv(0), 0);
hv_store(href, "PEER_NAME", 9, newSVpv(q->peer_name, 0), 0);
hv_store(href, "HANDLE", 6, newSVsv(&sv_undef), 0);
+ hv_store(href, "PID", 3, newSViv(getpid()), 0);
PUSHMARK(sp);
RETVAL = statserv_main(items, argv, bend_init, bend_close);
OUTPUT:
- RETVAL
+ RETVAL
+
+
+int
+ScanSuccess()
+ CODE:
+ RETVAL = BEND_SCAN_SUCCESS;
+ OUTPUT:
+ RETVAL
+
+int
+ScanPartial()
+ CODE:
+ RETVAL = BEND_SCAN_PARTIAL;
+ OUTPUT:
+ RETVAL
+
+