-/* $Id: recgrs.c,v 1.4 2006-08-14 10:40:15 adam Exp $
+/* $Id: recgrs.c,v 1.9 2006-10-29 17:20:01 adam Exp $
Copyright (C) 1995-2006
Index Data ApS
return 1;
}
-static struct source_parser *source_parser_create()
+static struct source_parser *source_parser_create(void)
{
struct source_parser *sp = xmalloc(sizeof(*sp));
data1_termlist *xpath_termlist_by_tagpath(char *tagpath, data1_node *n)
{
data1_absyn *abs = n->root->u.root.absyn;
- data1_xpelement *xpe = abs->xp_elements;
+
+ data1_xpelement *xpe = 0;
data1_node *nn;
#ifdef ENHANCED_XELM
struct xpath_location_step *xp;
#endif
char *pexpr = xmalloc(strlen(tagpath)+5);
- int ok = 0;
sprintf (pexpr, "/%s\n", tagpath);
- for (; xpe; xpe = xpe->next)
+
+ for (xpe = abs->xp_elements; xpe; xpe = xpe->next)
+ xpe->match_state = -1; /* don't know if it matches yet */
+
+ for (xpe = abs->xp_elements; xpe; xpe = xpe->next)
{
int i;
- ok = dfa_match_first(xpe->dfa->states, pexpr);
-
+ int ok = xpe->match_state;
+ if (ok == -1)
+ { /* don't know whether there is a match yet */
+ data1_xpelement *xpe1;
+
+ assert(xpe->dfa);
+ ok = dfa_match_first(xpe->dfa->states, pexpr);
+
+#if OPTIMIZE_MELM
+ /* mark this and following ones with same regexp */
+ for (xpe1 = xpe; xpe1; xpe1 = xpe1->match_next)
+ xpe1->match_state = ok;
+#endif
+ }
+ assert (ok == 0 || ok == 1);
if (ok) {
#ifdef ENHANCED_XELM
/* we have to check the perdicates up to the root node */
xfree(pexpr);
- if (ok) {
+ if (xpe) {
yaz_log(YLOG_DEBUG, "Got it");
return xpe->termlists;
} else {
if (n->root->u.root.absyn &&
(tl = xpath_termlist_by_tagpath(tag_path_full, n)))
{
+ zint max_seqno = 0;
for (; tl; tl = tl->next)
{
/* need to copy recword because it may be changed */
else
(*p->tokenAdd)(&wrd_tl);
}
+ if (wrd_tl.seqno > max_seqno)
+ max_seqno = wrd_tl.seqno;
}
+ if (max_seqno)
+ wrd->seqno = max_seqno;
+
}
/* xpath indexing is done, if there was no termlist given,
or no ! in the termlist, and default indexing is enabled... */
int oidtmp[OID_SIZE];
RecWord wrd;
- gri.readf = p->readf;
- gri.seekf = p->seekf;
- gri.tellf = p->tellf;
- gri.endf = p->endf;
- gri.fh = p->fh;
- gri.offset = p->offset;
+ gri.stream = p->stream;
gri.mem = mem;
gri.dh = p->dh;
gri.clientData = clientData;
int dummy;
mem = nmem_create();
- gri.readf = p->readf;
- gri.seekf = p->seekf;
- gri.tellf = p->tellf;
- gri.endf = NULL;
- gri.fh = p->fh;
- gri.offset = 0;
+ gri.stream = p->stream;
gri.mem = mem;
gri.dh = p->dh;
gri.clientData = clientData;