-/* $Id: recgrs.c,v 1.82 2003-08-21 10:29:00 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
- Index Data Aps
+/* $Id: recgrs.c,v 1.101 2005-04-29 23:09:30 adam Exp $
+ Copyright (C) 1995-2005
+ Index Data ApS
This file is part of the Zebra server.
#include <stdio.h>
#include <assert.h>
#include <sys/types.h>
-#ifndef WIN32
-#include <unistd.h>
-#endif
+#include <ctype.h>
#include <yaz/log.h>
#include <yaz/oid.h>
-#include <recctrl.h>
-#include "grsread.h"
+#include <d1_absyn.h>
+#include <idzebra/recgrs.h>
#define GRS_MAX_WORD 512
-struct grs_handler {
- RecTypeGrs type;
- void *clientData;
- int initFlag;
- struct grs_handler *next;
-};
-
-struct grs_handlers {
- struct grs_handler *handlers;
+struct source_parser {
+ int len;
+ const char *tok;
+ const char *src;
+ int lookahead;
+ NMEM nmem;
};
-static int read_grs_type (struct grs_handlers *h,
- struct grs_read_info *p, const char *type,
- data1_node **root)
+static int sp_lex(struct source_parser *sp)
{
- struct grs_handler *gh = h->handlers;
- const char *cp = strchr (type, '.');
+ while (*sp->src == ' ')
+ (sp->src)++;
+ sp->tok = sp->src;
+ sp->len = 0;
+ while (*sp->src && !strchr("<>();,-: ", *sp->src))
+ {
+ sp->src++;
+ sp->len++;
+ }
+ if (sp->len)
+ sp->lookahead = 't';
+ else
+ {
+ sp->lookahead = *sp->src;
+ if (*sp->src)
+ sp->src++;
+ }
+ return sp->lookahead;
+}
- if (cp == NULL || cp == type)
+static int sp_expr(struct source_parser *sp, data1_node *n, RecWord *wrd);
+
+static int sp_range(struct source_parser *sp, data1_node *n, RecWord *wrd)
+{
+ int start, len;
+ RecWord tmp_w;
+
+ /* ( */
+ sp_lex(sp);
+ if (sp->lookahead != '(')
+ return 0;
+ sp_lex(sp); /* skip ( */
+
+ /* 1st arg: string */
+ if (!sp_expr(sp, n, wrd))
+ return 0;
+
+ if (sp->lookahead != ',')
+ return 0;
+ sp_lex(sp); /* skip , */
+
+ /* 2nd arg: start */
+ if (!sp_expr(sp, n, &tmp_w))
+ return 0;
+ start = atoi_n(tmp_w.term_buf, tmp_w.term_len);
+
+ if (sp->lookahead == ',')
{
- cp = strlen(type) + type;
- *p->type = 0;
+ sp_lex(sp); /* skip , */
+
+ /* 3rd arg: length */
+ if (!sp_expr(sp, n, &tmp_w))
+ return 0;
+ len = atoi_n(tmp_w.term_buf, tmp_w.term_len);
}
else
- strcpy (p->type, cp+1);
- for (gh = h->handlers; gh; gh = gh->next)
+ len = wrd->term_len;
+
+ /* ) */
+ if (sp->lookahead != ')')
+ return 0;
+ sp_lex(sp);
+
+ if (wrd->term_buf && wrd->term_len)
{
- if (!memcmp (type, gh->type->type, cp-type) &&
- gh->type->type[cp-type] == '\0')
+ wrd->term_buf += start;
+ wrd->term_len -= start;
+ if (wrd->term_len > len)
+ wrd->term_len = len;
+ }
+ return 1;
+}
+
+static int sp_first(struct source_parser *sp, data1_node *n, RecWord *wrd)
+{
+ char num_str[20];
+ int min_pos = -1;
+ sp_lex(sp);
+ if (sp->lookahead != '(')
+ return 0;
+ sp_lex(sp); /* skip ( */
+ if (!sp_expr(sp, n, wrd))
+ return 0;
+ while (sp->lookahead == ',')
+ {
+ RecWord search_w;
+ int i;
+ sp_lex(sp); /* skip , */
+
+ if (!sp_expr(sp, n, &search_w))
+ return 0;
+ for (i = 0; i<wrd->term_len; i++)
{
- if (!gh->initFlag)
+ int j;
+ for (j = 0; j<search_w.term_len && i+j < wrd->term_len; j++)
+ if (wrd->term_buf[i+j] != search_w.term_buf[j])
+ break;
+ if (j == search_w.term_len) /* match ? */
{
- gh->initFlag = 1;
- gh->clientData = (*gh->type->init)();
+ if (min_pos == -1 || i < min_pos)
+ min_pos = i;
+ break;
}
- p->clientData = gh->clientData;
- *root = (gh->type->read)(p);
- gh->clientData = p->clientData;
- return 0;
}
}
+ if (sp->lookahead != ')')
+ return 0;
+ sp_lex(sp);
+ if (min_pos == -1)
+ min_pos = 0; /* the default if not found */
+ sprintf(num_str, "%d", min_pos);
+ wrd->term_buf = nmem_strdup(sp->nmem, num_str);
+ wrd->term_len = strlen(wrd->term_buf);
return 1;
}
-static void grs_add_handler (struct grs_handlers *h, RecTypeGrs t)
+static int sp_expr(struct source_parser *sp, data1_node *n, RecWord *wrd)
{
- struct grs_handler *gh = (struct grs_handler *) xmalloc (sizeof(*gh));
- gh->next = h->handlers;
- h->handlers = gh;
- gh->initFlag = 0;
- gh->clientData = 0;
- gh->type = t;
+ if (sp->lookahead != 't')
+ return 0;
+ if (sp->len == 4 && !memcmp(sp->tok, "data", sp->len))
+ {
+ if (n->which == DATA1N_data)
+ {
+ wrd->term_buf = n->u.data.data;
+ wrd->term_len = n->u.data.len;
+ }
+ sp_lex(sp);
+ }
+ else if (sp->len == 3 && !memcmp(sp->tok, "tag", sp->len))
+ {
+ if (n->which == DATA1N_tag)
+ {
+ wrd->term_buf = n->u.tag.tag;
+ wrd->term_len = strlen(n->u.tag.tag);
+ }
+ sp_lex(sp);
+ }
+ else if (sp->len == 4 && !memcmp(sp->tok, "attr", sp->len))
+ {
+ RecWord tmp_w;
+ sp_lex(sp);
+ if (sp->lookahead != '(')
+ return 0;
+ sp_lex(sp);
+
+ if (!sp_expr(sp, n, &tmp_w))
+ return 0;
+
+ wrd->term_buf = "";
+ wrd->term_len = 0;
+ if (n->which == DATA1N_tag)
+ {
+ data1_xattr *p = n->u.tag.attributes;
+ while (p && strlen(p->name) != tmp_w.term_len &&
+ memcmp (p->name, tmp_w.term_buf, tmp_w.term_len))
+ p = p->next;
+ if (p)
+ {
+ wrd->term_buf = p->value;
+ wrd->term_len = strlen(p->value);
+ }
+ }
+ if (sp->lookahead != ')')
+ return 0;
+ sp_lex(sp);
+ }
+ else if (sp->len == 5 && !memcmp(sp->tok, "first", sp->len))
+ {
+ return sp_first(sp, n, wrd);
+ }
+ else if (sp->len == 5 && !memcmp(sp->tok, "range", sp->len))
+ {
+ return sp_range(sp, n, wrd);
+ }
+ else if (sp->len > 0 && isdigit(*(unsigned char *)sp->tok))
+ {
+ wrd->term_buf = nmem_malloc(sp->nmem, sp->len);
+ memcpy(wrd->term_buf, sp->tok, sp->len);
+ wrd->term_len = sp->len;
+ sp_lex(sp);
+ }
+ else if (sp->len > 2 && sp->tok[0] == '\'' && sp->tok[sp->len-1] == '\'')
+ {
+ wrd->term_len = sp->len - 2;
+ wrd->term_buf = nmem_malloc(sp->nmem, wrd->term_len);
+ memcpy(wrd->term_buf, sp->tok+1, wrd->term_len);
+ sp_lex(sp);
+ }
+ else
+ {
+ wrd->term_buf = "";
+ wrd->term_len = 0;
+ sp_lex(sp);
+ }
+ return 1;
}
-static void *grs_init(RecType recType)
+static struct source_parser *source_parser_create()
{
- struct grs_handlers *h = (struct grs_handlers *) xmalloc (sizeof(*h));
- h->handlers = 0;
+ struct source_parser *sp = xmalloc(sizeof(*sp));
- grs_add_handler (h, recTypeGrs_sgml);
- grs_add_handler (h, recTypeGrs_regx);
-#if HAVE_TCL_H
- grs_add_handler (h, recTypeGrs_tcl);
-#endif
- grs_add_handler (h, recTypeGrs_marc);
- grs_add_handler (h, recTypeGrs_marcxml);
-#if HAVE_EXPAT_H
- grs_add_handler (h, recTypeGrs_xml);
-#endif
-#if HAVE_PERL
- grs_add_handler (h, recTypeGrs_perl);
-#endif
- return h;
+ sp->nmem = nmem_create();
+ return sp;
}
-static void grs_destroy(void *clientData)
+static void source_parser_destroy(struct source_parser *sp)
{
- struct grs_handlers *h = (struct grs_handlers *) clientData;
- struct grs_handler *gh = h->handlers, *gh_next;
- while (gh)
- {
- gh_next = gh->next;
- if (gh->initFlag)
- (*gh->type->destroy)(gh->clientData);
- xfree (gh);
- gh = gh_next;
- }
- xfree (h);
+ if (!sp)
+ return;
+ nmem_destroy(sp->nmem);
+ xfree(sp);
+}
+
+static int sp_parse(struct source_parser *sp,
+ data1_node *n, RecWord *wrd, const char *src)
+{
+ sp->len = 0;
+ sp->tok = 0;
+ sp->src = src;
+ sp->lookahead = 0;
+ nmem_reset(sp->nmem);
+
+ sp_lex(sp);
+ return sp_expr(sp, n, wrd);
}
int d1_check_xpath_predicate(data1_node *n, struct xpath_predicate *p)
if (p->which == XPATH_PREDICATE_RELATION) {
if (p->u.relation.name[0]) {
if (*p->u.relation.name != '@') {
- logf(LOG_WARN,
+ yaz_log(YLOG_WARN,
" Only attributes (@) are supported in xelm xpath predicates");
- logf(LOG_WARN, "predicate %s ignored", p->u.relation.name);
- return (1);
+ yaz_log(YLOG_WARN, "predicate %s ignored", p->u.relation.name);
+ return 1;
}
attname = p->u.relation.name + 1;
res = 0;
/* looking for the attribute with a specified name */
for (attr = n->u.tag.attributes; attr; attr = attr->next) {
- logf(LOG_DEBUG," - attribute %s <-> %s", attname, attr->name );
+ yaz_log(YLOG_DEBUG," - attribute %s <-> %s", attname, attr->name );
if (!strcmp(attr->name, attname)) {
if (p->u.relation.op[0]) {
if (*p->u.relation.op != '=') {
- logf(LOG_WARN,
+ yaz_log(YLOG_WARN,
"Only '=' relation is supported (%s)",p->u.relation.op);
- logf(LOG_WARN, "predicate %s ignored", p->u.relation.name);
+ yaz_log(YLOG_WARN, "predicate %s ignored", p->u.relation.name);
res = 1; break;
} else {
- logf(LOG_DEBUG," - value %s <-> %s",
+ yaz_log(YLOG_DEBUG," - value %s <-> %s",
p->u.relation.value, attr->value );
if (!strcmp(attr->value, p->u.relation.value)) {
res = 1; break;
}
}
}
+ yaz_log(YLOG_DEBUG, "return %d", res);
return res;
} else {
return 1;
return (d1_check_xpath_predicate(n, p->u.boolean.left)
|| d1_check_xpath_predicate(n, p->u.boolean.right));
} else {
- logf(LOG_WARN, "Unknown boolean relation %s, ignored",p->u.boolean.op);
+ yaz_log(YLOG_WARN, "Unknown boolean relation %s, ignored",p->u.boolean.op);
return 1;
}
}
data1_node *nn;
#ifdef ENHANCED_XELM
struct xpath_location_step *xp;
-
#endif
char *pexpr = xmalloc(strlen(tagpath)+2);
int ok = 0;
sprintf (pexpr, "%s\n", tagpath);
- logf(LOG_DEBUG,"Checking tagpath %s",tagpath);
- while (xpe)
+ yaz_log(YLOG_DEBUG, "Checking tagpath %s",tagpath);
+ for (; xpe; xpe = xpe->next)
{
struct DFA_state **dfaar = xpe->dfa->states;
- struct DFA_state *s=dfaar[0];
- struct DFA_tran *t;
- const char *p;
- int i;
- unsigned char c;
+ struct DFA_state *s = dfaar[0];
+ struct DFA_tran *t = s->trans;
+ int i = s->tran_no;
+ unsigned char c = *pexpr++;
int start_line = 1;
- logf(LOG_DEBUG," - xpath %s",xpe->xpath_expr);
-
- c = *pexpr++; t = s->trans; i = s->tran_no;
- if ((c >= t->ch[0] && c <= t->ch[1]) || (!t->ch[0])) {
- p = pexpr;
- do {
+ if ((c >= t->ch[0] && c <= t->ch[1]) || (!t->ch[0]))
+ {
+ const char *p = pexpr;
+ do
+ {
if ((s = dfaar[t->to])->rule_no &&
- (start_line || s->rule_nno)) {
+ (start_line || s->rule_nno))
+ {
ok = 1;
break;
}
- for (t=s->trans, i=s->tran_no; --i >= 0; t++) {
+ for (t=s->trans, i=s->tran_no; --i >= 0; t++)
if ((unsigned) *p >= t->ch[0] && (unsigned) *p <= t->ch[1])
break;
- }
p++;
- } while (i >= 0);
+ }
+ while (i >= 0);
}
+ if (ok)
+ yaz_log(YLOG_DEBUG, " xpath match %s",xpe->xpath_expr);
+ else
+ yaz_log(YLOG_DEBUG, " xpath no match %s",xpe->xpath_expr);
+
pexpr--;
if (ok) {
#ifdef ENHANCED_XELM
xp = xpe->xpath;
/* find the first tag up in the node structure */
- nn = n; while (nn && nn->which != DATA1N_tag) {
- nn = nn->parent;
- }
+ for (nn = n; nn && nn->which != DATA1N_tag; nn = nn->parent)
+ ;
/* go from inside out in the node structure, while going
backwards trough xpath location steps ... */
- for (i=xpe->xpath_len - 1; i>0; i--) {
-
- logf(LOG_DEBUG,"Checking step %d: %s on tag %s",
- i,xp[i].part,nn->u.tag.tag);
+ for (i = xpe->xpath_len - 1; i>0; i--)
+ {
+ yaz_log(YLOG_DEBUG, "Checking step %d: %s on tag %s",
+ i, xp[i].part, nn->u.tag.tag);
- if (!d1_check_xpath_predicate(nn, xp[i].predicate)) {
- logf(LOG_DEBUG," Predicates didn't match");
+ if (!d1_check_xpath_predicate(nn, xp[i].predicate))
+ {
+ yaz_log(YLOG_DEBUG, " Predicates didn't match");
ok = 0;
break;
}
- if (nn->which == DATA1N_tag) {
+ if (nn->which == DATA1N_tag)
nn = nn->parent;
- }
}
#endif
- if (ok) {
+ if (ok)
break;
- }
}
- xpe = xpe->next;
}
xfree(pexpr);
if (ok) {
- logf(LOG_DEBUG,"Got it");
+ yaz_log(YLOG_DEBUG, "Got it");
return xpe->termlists;
} else {
return NULL;
wrd->attrSet = VAL_IDXPATH;
wrd->attrUse = 1;
wrd->reg_type = '0';
- wrd->string = tag_path;
- wrd->length = strlen(tag_path);
+ wrd->term_buf = tag_path;
+ wrd->term_len = strlen(tag_path);
(*p->tokenAdd)(wrd);
if (value) {
wrd->attrUse = 1015;
wrd->reg_type = 'w';
- wrd->string = value;
- wrd->length = strlen(value);
+ wrd->term_buf = value;
+ wrd->term_len = strlen(value);
(*p->tokenAdd)(wrd);
}
wrd->attrUse = 2;
wrd->reg_type = '0';
- wrd->string = tag_path;
- wrd->length = strlen(tag_path);
+ wrd->term_buf = tag_path;
+ wrd->term_len = strlen(tag_path);
(*p->tokenAdd)(wrd);
}
-static void index_xpath (data1_node *n, struct recExtractCtrl *p,
+static void index_xpath (struct source_parser *sp, data1_node *n,
+ struct recExtractCtrl *p,
int level, RecWord *wrd, int use)
{
int i;
size_t flen = 0;
data1_node *nn;
int termlist_only = 1;
+ data1_termlist *tl;
+ int xpdone = 0;
+ yaz_log(YLOG_DEBUG, "index_xpath level=%d use=%d", level, use);
if ((!n->root->u.root.absyn) ||
(n->root->u.root.absyn->enable_xpath_indexing)) {
- termlist_only = 0;
+ termlist_only = 0;
}
switch (n->which)
{
case DATA1N_data:
- wrd->string = n->u.data.data;
- wrd->length = n->u.data.len;
- if (p->flagShowRecords)
- {
- printf("%*s XData:\"", (level + 1) * 4, "");
- for (i = 0; i<wrd->length && i < 8; i++)
- fputc (wrd->string[i], stdout);
- printf("\"\n");
- }
- else {
- data1_termlist *tl;
- int xpdone = 0;
- flen = 0;
-
- // logf (LOG_LOG,"Index value, %s",wrd->string);
-
- /* we have to fetch the whole path to the data tag */
- for (nn = n; nn; nn = nn->parent) {
- if (nn->which == DATA1N_tag) {
- size_t tlen = strlen(nn->u.tag.tag);
- if (tlen + flen > (sizeof(tag_path_full)-2)) return;
- memcpy (tag_path_full + flen, nn->u.tag.tag, tlen);
- flen += tlen;
- tag_path_full[flen++] = '/';
- }
- else if (nn->which == DATA1N_root) break;
- }
-
- tag_path_full[flen] = 0;
+ wrd->term_buf = n->u.data.data;
+ wrd->term_len = n->u.data.len;
+ xpdone = 0;
+ flen = 0;
- /* If we have a matching termlist... */
- if ((tl = xpath_termlist_by_tagpath(tag_path_full, n))) {
- for (; tl; tl = tl->next) {
- wrd->reg_type = *tl->structure;
- /* this is the ! case, so structure is for the xpath index */
- if (!tl->att) {
- wrd->attrSet = VAL_IDXPATH;
- wrd->attrUse = use;
- (*p->tokenAdd)(wrd);
- xpdone = 1;
- /* this is just the old fashioned attribute based index */
- } else {
- wrd->attrSet = (int) (tl->att->parent->reference);
- wrd->attrUse = tl->att->locals->local;
- (*p->tokenAdd)(wrd);
- }
- }
- }
- /* xpath indexing is done, if there was no termlist given,
- or no ! in the termlist, and default indexing is enabled... */
- if ((!xpdone) && (!termlist_only)) {
- wrd->attrSet = VAL_IDXPATH;
- wrd->attrUse = use;
- wrd->reg_type = 'w';
- (*p->tokenAdd)(wrd);
- }
+ /* we have to fetch the whole path to the data tag */
+ for (nn = n; nn; nn = nn->parent)
+ {
+ if (nn->which == DATA1N_tag)
+ {
+ size_t tlen = strlen(nn->u.tag.tag);
+ if (tlen + flen > (sizeof(tag_path_full)-2))
+ break;
+ memcpy (tag_path_full + flen, nn->u.tag.tag, tlen);
+ flen += tlen;
+ tag_path_full[flen++] = '/';
+ }
+ else
+ if (nn->which == DATA1N_root)
+ break;
+ }
+
+ tag_path_full[flen] = 0;
+
+ /* If we have a matching termlist... */
+ if (n->root->u.root.absyn &&
+ (tl = xpath_termlist_by_tagpath(tag_path_full, n)))
+ {
+ for (; tl; tl = tl->next)
+ {
+ /* need to copy recword because it may be changed */
+ RecWord wrd_tl;
+ wrd->reg_type = *tl->structure;
+ /* this is the ! case, so structure is for the xpath index */
+ memcpy (&wrd_tl, wrd, sizeof(*wrd));
+ if (tl->source)
+ sp_parse(sp, n, &wrd_tl, tl->source);
+ if (!tl->att) {
+ wrd_tl.attrSet = VAL_IDXPATH;
+ wrd_tl.attrUse = use;
+ if (p->flagShowRecords)
+ {
+ int i;
+ printf("%*sXPath index", (level + 1) * 4, "");
+ printf (" XData:\"");
+ for (i = 0; i<wrd_tl.term_len && i < 40; i++)
+ fputc (wrd_tl.term_buf[i], stdout);
+ fputc ('"', stdout);
+ if (wrd_tl.term_len > 40)
+ printf (" ...");
+ fputc ('\n', stdout);
+ }
+ else
+ (*p->tokenAdd)(&wrd_tl);
+ xpdone = 1;
+ } else {
+ /* this is just the old fashioned attribute based index */
+ wrd_tl.attrSet = (int) (tl->att->parent->reference);
+ wrd_tl.attrUse = tl->att->locals->local;
+ if (p->flagShowRecords)
+ {
+ int i;
+ printf("%*sIdx: [%s]", (level + 1) * 4, "",
+ tl->structure);
+ printf("%s:%s [%d] %s",
+ tl->att->parent->name,
+ tl->att->name, tl->att->value,
+ tl->source);
+ printf (" XData:\"");
+ for (i = 0; i<wrd_tl.term_len && i < 40; i++)
+ fputc (wrd_tl.term_buf[i], stdout);
+ fputc ('"', stdout);
+ if (wrd_tl.term_len > 40)
+ printf (" ...");
+ fputc ('\n', stdout);
+ }
+ else
+ (*p->tokenAdd)(&wrd_tl);
+ }
+ }
+ }
+ /* xpath indexing is done, if there was no termlist given,
+ or no ! in the termlist, and default indexing is enabled... */
+ if (!p->flagShowRecords && !xpdone && !termlist_only)
+ {
+ wrd->attrSet = VAL_IDXPATH;
+ wrd->attrUse = use;
+ wrd->reg_type = 'w';
+ (*p->tokenAdd)(wrd);
}
break;
case DATA1N_tag:
{
size_t tlen = strlen(nn->u.tag.tag);
if (tlen + flen > (sizeof(tag_path_full)-2))
- return;
+ break;
memcpy (tag_path_full + flen, nn->u.tag.tag, tlen);
flen += tlen;
tag_path_full[flen++] = '/';
wrd->reg_type = '0';
- wrd->string = tag_path_full;
- wrd->length = flen;
+ wrd->term_buf = tag_path_full;
+ wrd->term_len = flen;
wrd->attrSet = VAL_IDXPATH;
wrd->attrUse = use;
if (p->flagShowRecords)
{
printf("%*s tag=", (level + 1) * 4, "");
- for (i = 0; i<wrd->length && i < 40; i++)
- fputc (wrd->string[i], stdout);
+ for (i = 0; i<wrd->term_len && i < 40; i++)
+ fputc (wrd->term_buf[i], stdout);
if (i == 40)
printf (" ..");
printf("\n");
if (use == 1) /* only for the starting tag... */
{
-
#define MAX_ATTR_COUNT 50
-
data1_termlist *tll[MAX_ATTR_COUNT];
int i = 0;
/* attribute (no value) */
wrd->reg_type = '0';
wrd->attrUse = 3;
- wrd->string = xp->name;
- wrd->length = strlen(xp->name);
+ wrd->term_buf = xp->name;
+ wrd->term_len = strlen(xp->name);
wrd->seqno--;
(*p->tokenAdd)(wrd);
wrd->attrUse = 3;
wrd->reg_type = '0';
- wrd->string = comb;
- wrd->length = strlen(comb);
+ wrd->term_buf = comb;
+ wrd->term_len = strlen(comb);
wrd->seqno--;
(*p->tokenAdd)(wrd);
(tl->att->parent->reference);
wrd->attrUse = tl->att->locals->local;
wrd->reg_type = *tl->structure;
- wrd->string = xp->value;
- wrd->length = strlen(xp->value);
+ wrd->term_buf = xp->value;
+ wrd->term_len = strlen(xp->value);
(*p->tokenAdd)(wrd);
}
}
}
}
-static void index_termlist (data1_node *par, data1_node *n,
+static void index_termlist (struct source_parser *sp, data1_node *par,
+ data1_node *n,
struct recExtractCtrl *p, int level, RecWord *wrd)
{
data1_termlist *tlist = 0;
return;
if (par->u.tag.element->tag)
dtype = par->u.tag.element->tag->kind;
-
+
for (; tlist; tlist = tlist->next)
{
-
- char xattr[512];
/* consider source */
- wrd->string = 0;
+ wrd->term_buf = 0;
+ assert(tlist->source);
+ sp_parse(sp, n, wrd, tlist->source);
- if (!strcmp (tlist->source, "data") && n->which == DATA1N_data)
- {
- wrd->string = n->u.data.data;
- wrd->length = n->u.data.len;
- }
- else if (!strcmp (tlist->source, "tag") && n->which == DATA1N_tag)
- {
- wrd->string = n->u.tag.tag;
- wrd->length = strlen(n->u.tag.tag);
- }
- else if (sscanf (tlist->source, "attr(%511[^)])", xattr) == 1 &&
- n->which == DATA1N_tag)
- {
- data1_xattr *p = n->u.tag.attributes;
- while (p && strcmp (p->name, xattr))
- p = p->next;
- if (p)
- {
- wrd->string = p->value;
- wrd->length = strlen(p->value);
- }
- }
- if (wrd->string)
+ if (wrd->term_buf && wrd->term_len)
{
if (p->flagShowRecords)
{
tlist->att->name, tlist->att->value,
tlist->source);
printf (" XData:\"");
- for (i = 0; i<wrd->length && i < 40; i++)
- fputc (wrd->string[i], stdout);
+ for (i = 0; i<wrd->term_len && i < 40; i++)
+ fputc (wrd->term_buf[i], stdout);
fputc ('"', stdout);
- if (wrd->length > 40)
+ if (wrd->term_len > 40)
printf (" ...");
fputc ('\n', stdout);
}
}
}
-static int dumpkeys(data1_node *n, struct recExtractCtrl *p, int level,
- RecWord *wrd)
+static int dumpkeys_r(struct source_parser *sp,
+ data1_node *n, struct recExtractCtrl *p, int level,
+ RecWord *wrd)
{
for (; n; n = n->next)
{
if (n->which == DATA1N_tag)
{
- index_termlist (n, n, p, level, wrd);
+ index_termlist(sp, n, n, p, level, wrd);
/* index start tag */
if (n->root->u.root.absyn)
- index_xpath (n, p, level, wrd, 1);
+ index_xpath(sp, n, p, level, wrd, 1);
}
if (n->child)
- if (dumpkeys(n->child, p, level + 1, wrd) < 0)
+ if (dumpkeys_r(sp, n->child, p, level + 1, wrd) < 0)
return -1;
}
if (par)
- index_termlist (par, n, p, level, wrd);
+ index_termlist(sp, par, n, p, level, wrd);
- index_xpath (n, p, level, wrd, 1016);
+ index_xpath(sp, n, p, level, wrd, 1016);
}
if (n->which == DATA1N_tag)
{
/* index end tag */
- index_xpath (n, p, level, wrd, 2);
+ index_xpath(sp, n, p, level, wrd, 2);
}
if (p->flagShowRecords && n->which == DATA1N_root)
return 0;
}
+static int dumpkeys(data1_node *n, struct recExtractCtrl *p, RecWord *wrd)
+{
+ struct source_parser *sp = source_parser_create();
+ int r = dumpkeys_r(sp, n, p, 0, wrd);
+ source_parser_destroy(sp);
+ return r;
+}
+
int grs_extract_tree(struct recExtractCtrl *p, data1_node *n)
{
oident oe;
}
(*p->init)(p, &wrd);
- return dumpkeys(n, p, 0, &wrd);
+ return dumpkeys(n, p, &wrd);
}
-static int grs_extract_sub(struct grs_handlers *h, struct recExtractCtrl *p,
- NMEM mem)
+static int grs_extract_sub(void *clientData, struct recExtractCtrl *p,
+ NMEM mem,
+ data1_node *(*grs_read)(struct grs_read_info *))
{
data1_node *n;
struct grs_read_info gri;
gri.offset = p->offset;
gri.mem = mem;
gri.dh = p->dh;
+ gri.clientData = clientData;
- if (read_grs_type (h, &gri, p->subType, &n))
- return RECCTRL_EXTRACT_ERROR_NO_SUCH_FILTER;
+ n = (*grs_read)(&gri);
if (!n)
return RECCTRL_EXTRACT_EOF;
oe.proto = PROTO_Z3950;
#endif
(*p->init)(p, &wrd);
- if (dumpkeys(n, p, 0, &wrd) < 0)
+ if (dumpkeys(n, p, &wrd) < 0)
{
data1_free_tree(p->dh, n);
return RECCTRL_EXTRACT_ERROR_GENERIC;
return RECCTRL_EXTRACT_OK;
}
-static int grs_extract(void *clientData, struct recExtractCtrl *p)
+int zebra_grs_extract(void *clientData, struct recExtractCtrl *p,
+ data1_node *(*grs_read)(struct grs_read_info *))
{
int ret;
NMEM mem = nmem_create ();
- struct grs_handlers *h = (struct grs_handlers *) clientData;
-
- ret = grs_extract_sub(h, p, mem);
+ ret = grs_extract_sub(clientData, p, mem, grs_read);
nmem_destroy(mem);
return ret;
}
/*
* Return: -1: Nothing done. 0: Ok. >0: Bib-1 diagnostic.
*/
-static int process_comp(data1_handle dh, data1_node *n, Z_RecordComposition *c)
+static int process_comp(data1_handle dh, data1_node *n, Z_RecordComposition *c,
+ char **addinfo, ODR o)
{
data1_esetname *eset;
Z_Espec1 *espec = 0;
if (!(eset = data1_getesetbyname(dh, n->u.root.absyn,
c->u.simple->u.generic)))
{
- logf(LOG_LOG, "Unknown esetname '%s'", c->u.simple->u.generic);
+ yaz_log(YLOG_LOG, "Unknown esetname '%s'", c->u.simple->u.generic);
+ *addinfo = odr_strdup(o, c->u.simple->u.generic);
return 25; /* invalid esetname */
}
- logf(LOG_DEBUG, "Esetname '%s' in simple compspec",
+ yaz_log(YLOG_DEBUG, "Esetname '%s' in simple compspec",
c->u.simple->u.generic);
espec = eset->spec;
break;
data1_getesetbyname(dh, n->u.root.absyn,
p->u.elementSetName)))
{
- logf(LOG_LOG, "Unknown esetname '%s'",
+ yaz_log(YLOG_DEBUG, "Unknown esetname '%s'",
p->u.elementSetName);
+ *addinfo = odr_strdup(o, p->u.elementSetName);
return 25; /* invalid esetname */
}
- logf(LOG_DEBUG, "Esetname '%s' in complex compspec",
+ yaz_log(YLOG_DEBUG, "Esetname '%s' in complex compspec",
p->u.elementSetName);
espec = eset->spec;
break;
case Z_ElementSpec_externalSpec:
if (p->u.externalSpec->which == Z_External_espec1)
{
- logf(LOG_DEBUG, "Got Espec-1");
+ yaz_log(YLOG_DEBUG, "Got Espec-1");
espec = p->u.externalSpec-> u.espec1;
}
else
{
- logf(LOG_LOG, "Unknown external espec.");
+ yaz_log(YLOG_LOG, "Unknown external espec.");
return 25; /* bad. what is proper diagnostic? */
}
break;
}
if (espec)
{
- logf (LOG_DEBUG, "Element: Espec-1 match");
+ yaz_log(YLOG_DEBUG, "Element: Espec-1 match");
return data1_doespec1(dh, n, espec);
}
else
{
- logf (LOG_DEBUG, "Element: all match");
+ yaz_log(YLOG_DEBUG, "Element: all match");
return -1;
}
}
data1_mk_tag_data_int (p->dh, n, "score", p->score, mem);
}
data1_mk_text (p->dh, mem, i4, n);
- data1_mk_tag_data_int (p->dh, n, "localnumber", p->localno, mem);
+ data1_mk_tag_data_zint (p->dh, n, "localnumber", p->localno, mem);
if (p->fname)
{
data1_mk_text (p->dh, mem, i4, n);
data1_mk_text (p->dh, mem, i2, n);
}
-static int grs_retrieve(void *clientData, struct recRetrieveCtrl *p)
+int zebra_grs_retrieve(void *clientData, struct recRetrieveCtrl *p,
+ data1_node *(*grs_read)(struct grs_read_info *))
{
data1_node *node = 0, *onode = 0, *top;
data1_node *dnew;
NMEM mem;
struct grs_read_info gri;
const char *tagname;
- struct grs_handlers *h = (struct grs_handlers *) clientData;
+
int requested_schema = VAL_NONE;
data1_marctab *marctab;
int dummy;
gri.offset = 0;
gri.mem = mem;
gri.dh = p->dh;
+ gri.clientData = clientData;
- logf (LOG_DEBUG, "grs_retrieve");
- if (read_grs_type (h, &gri, p->subType, &node))
- {
- p->diagnostic = 14;
- nmem_destroy (mem);
- return 0;
- }
+ yaz_log(YLOG_DEBUG, "grs_retrieve");
+ node = (*grs_read)(&gri);
if (!node)
{
p->diagnostic = 14;
}
data1_concat_text(p->dh, mem, node);
- /* ensure our data1 tree is UTF-8 */
- data1_iconv (p->dh, mem, node, "UTF-8", data1_get_encoding(p->dh, node));
-
#if 0
data1_pr_tree (p->dh, node, stdout);
#endif
top = data1_get_root_tag (p->dh, node);
- logf (LOG_DEBUG, "grs_retrieve: size");
+ yaz_log(YLOG_DEBUG, "grs_retrieve: size");
tagname = data1_systag_lookup(node->u.root.absyn, "size", "size");
if (tagname &&
(dnew = data1_mk_tag_data_wd(p->dh, top, tagname, mem)))
if (tagname && p->score >= 0 &&
(dnew = data1_mk_tag_data_wd(p->dh, top, tagname, mem)))
{
- logf (LOG_DEBUG, "grs_retrieve: %s", tagname);
+ yaz_log(YLOG_DEBUG, "grs_retrieve: %s", tagname);
dnew->u.data.what = DATA1I_num;
dnew->u.data.data = dnew->lbuf;
sprintf(dnew->u.data.data, "%d", p->score);
if (tagname && p->localno > 0 &&
(dnew = data1_mk_tag_data_wd(p->dh, top, tagname, mem)))
{
- logf (LOG_DEBUG, "grs_retrieve: %s", tagname);
+ yaz_log(YLOG_DEBUG, "grs_retrieve: %s", tagname);
dnew->u.data.what = DATA1I_text;
dnew->u.data.data = dnew->lbuf;
- sprintf(dnew->u.data.data, "%d", p->localno);
+ sprintf(dnew->u.data.data, ZINT_FORMAT, p->localno);
dnew->u.data.len = strlen(dnew->u.data.data);
}
+
+ if (p->input_format == VAL_TEXT_XML)
+ zebra_xml_metadata (p, top, mem);
+
#if 0
data1_pr_tree (p->dh, node, stdout);
#endif
-#if YAZ_VERSIONL >= 0x010903L
if (p->comp && p->comp->which == Z_RecordComp_complex &&
p->comp->u.complex->generic &&
p->comp->u.complex->generic->which == Z_Schema_oid &&
if (oe)
requested_schema = oe->value;
}
-#else
- if (p->comp && p->comp->which == Z_RecordComp_complex &&
- p->comp->u.complex->generic && p->comp->u.complex->generic->schema)
- {
- oident *oe = oid_getentbyoid (p->comp->u.complex->generic->schema);
- if (oe)
- requested_schema = oe->value;
- }
-#endif
-
/* If schema has been specified, map if possible, then check that
* we got the right one
*/
if (requested_schema != VAL_NONE)
{
- logf (LOG_DEBUG, "grs_retrieve: schema mapping");
+ yaz_log(YLOG_DEBUG, "grs_retrieve: schema mapping");
for (map = node->u.root.absyn->maptabs; map; map = map->next)
{
if (map->target_absyn_ref == requested_schema)
* the overlap of schema and formatting which is inherent in the MARC
* family)
*/
- yaz_log (LOG_DEBUG, "grs_retrieve: syntax mapping");
+ yaz_log(YLOG_DEBUG, "grs_retrieve: syntax mapping");
if (node->u.root.absyn)
for (map = node->u.root.absyn->maptabs; map; map = map->next)
{
break;
}
}
- yaz_log (LOG_DEBUG, "grs_retrieve: schemaIdentifier");
+ yaz_log(YLOG_DEBUG, "grs_retrieve: schemaIdentifier");
if (node->u.root.absyn &&
node->u.root.absyn->reference != VAL_NONE &&
p->input_format == VAL_GRS1)
}
}
- logf (LOG_DEBUG, "grs_retrieve: element spec");
- if (p->comp && (res = process_comp(p->dh, node, p->comp)) > 0)
+ yaz_log(YLOG_DEBUG, "grs_retrieve: element spec");
+ if (p->comp && (res = process_comp(p->dh, node, p->comp, &p->addinfo,
+ p->odr)) > 0)
{
p->diagnostic = res;
if (onode)
#if 0
data1_pr_tree (p->dh, node, stdout);
#endif
- logf (LOG_DEBUG, "grs_retrieve: transfer syntax mapping");
+ yaz_log(YLOG_DEBUG, "grs_retrieve: transfer syntax mapping");
switch (p->output_format = (p->input_format != VAL_NONE ?
p->input_format : VAL_SUTRS))
{
case VAL_TEXT_XML:
- zebra_xml_metadata (p, top, mem);
-
#if 0
data1_pr_tree (p->dh, node, stdout);
#endif
-
- if (p->encoding)
- data1_iconv (p->dh, mem, node, p->encoding, "UTF-8");
+ /* default output encoding for XML is UTF-8 */
+ data1_iconv (p->dh, mem, node,
+ p->encoding ? p->encoding : "UTF-8",
+ data1_get_encoding(p->dh, node));
if (!(p->rec_buf = data1_nodetoidsgml(p->dh, node, selected,
&p->rec_len)))
}
break;
case VAL_GRS1:
+ data1_iconv (p->dh, mem, node, "UTF-8", data1_get_encoding(p->dh, node));
dummy = 0;
if (!(p->rec_buf = data1_nodetogr(p->dh, node, selected,
p->odr, &dummy)))
p->rec_len = (size_t) (-1);
break;
case VAL_EXPLAIN:
+ /* ensure our data1 tree is UTF-8 */
+ data1_iconv (p->dh, mem, node, "UTF-8", data1_get_encoding(p->dh, node));
+
if (!(p->rec_buf = data1_nodetoexplain(p->dh, node, selected,
p->odr)))
p->diagnostic = 238;
p->rec_len = (size_t) (-1);
break;
case VAL_SUMMARY:
+ /* ensure our data1 tree is UTF-8 */
+ data1_iconv (p->dh, mem, node, "UTF-8", data1_get_encoding(p->dh, node));
if (!(p->rec_buf = data1_nodetosummary(p->dh, node, selected,
p->odr)))
p->diagnostic = 238;
p->rec_len = (size_t) (-1);
break;
case VAL_SUTRS:
- if (p->encoding)
- data1_iconv (p->dh, mem, node, p->encoding, "UTF-8");
+ if (p->encoding)
+ data1_iconv (p->dh, mem, node, p->encoding,
+ data1_get_encoding(p->dh, node));
if (!(p->rec_buf = data1_nodetobuf(p->dh, node, selected,
&p->rec_len)))
p->diagnostic = 238;
}
break;
case VAL_SOIF:
+ if (p->encoding)
+ data1_iconv (p->dh, mem, node, p->encoding,
+ data1_get_encoding(p->dh, node));
if (!(p->rec_buf = data1_nodetosoif(p->dh, node, selected,
&p->rec_len)))
p->diagnostic = 238;
p->diagnostic = 238;
break;
}
- if (p->encoding)
- data1_iconv (p->dh, mem, node, p->encoding, "UTF-8");
+ if (p->encoding)
+ data1_iconv (p->dh, mem, node, p->encoding,
+ data1_get_encoding(p->dh, node));
if (!(p->rec_buf = data1_nodetomarc(p->dh, marctab, node,
selected, &p->rec_len)))
p->diagnostic = 238;
return 0;
}
-static struct recType grs_type =
-{
- "grs",
- grs_init,
- grs_destroy,
- grs_extract,
- grs_retrieve
-};
-
-RecType recTypeGrs = &grs_type;
projects / idzebra-moved-to-github.git / blobdiff