-/* $Id: recgrs.c,v 1.101 2005-04-29 23:09:30 adam Exp $
- Copyright (C) 1995-2005
+/* $Id: recgrs.c,v 1.110 2006-05-19 13:49:35 adam Exp $
+ Copyright (C) 1995-2006
Index Data ApS
This file is part of the Zebra server.
}
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);
+ char *b;
wrd->term_len = sp->len;
+ b = nmem_malloc(sp->nmem, sp->len);
+ memcpy(b, sp->tok, sp->len);
+ wrd->term_buf = b;
sp_lex(sp);
}
else if (sp->len > 2 && sp->tok[0] == '\'' && sp->tok[sp->len-1] == '\'')
{
+ char *b;
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);
+ b = nmem_malloc(sp->nmem, wrd->term_len);
+ memcpy(b, sp->tok+1, wrd->term_len);
+ wrd->term_buf = b;
sp_lex(sp);
}
else
}
+static int dfa_match_first(struct DFA_state **dfaar, const char *text)
+{
+ struct DFA_state *s = dfaar[0]; /* start state */
+ struct DFA_tran *t;
+ int i;
+ const char *p = text;
+ unsigned char c;
+
+ for (c = *p++, t = s->trans, i = s->tran_no; --i >= 0; t++)
+ {
+ if (c >= t->ch[0] && c <= t->ch[1])
+ {
+ while (i >= 0)
+ {
+ /* move to next state and return if we get a match */
+ s = dfaar[t->to];
+ if (s->rule_no)
+ return 1;
+ /* next char */
+ if (!c)
+ return 0;
+ c = *p++;
+ for (t = s->trans, i = s->tran_no; --i >= 0; t++)
+ if (c >= t->ch[0] && c <= t->ch[1])
+ break;
+ }
+ }
+ }
+ return 0;
+}
+
/* *ostrich*
New function, looking for xpath "element" definitions in abs, by
#ifdef ENHANCED_XELM
struct xpath_location_step *xp;
#endif
- char *pexpr = xmalloc(strlen(tagpath)+2);
+ char *pexpr = xmalloc(strlen(tagpath)+5);
int ok = 0;
- sprintf (pexpr, "%s\n", tagpath);
- yaz_log(YLOG_DEBUG, "Checking tagpath %s",tagpath);
+ sprintf (pexpr, "/%s\n", tagpath);
for (; xpe; xpe = xpe->next)
{
- struct DFA_state **dfaar = xpe->dfa->states;
- 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;
-
- 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))
- {
- ok = 1;
- break;
- }
- 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);
- }
- if (ok)
- yaz_log(YLOG_DEBUG, " xpath match %s",xpe->xpath_expr);
- else
- yaz_log(YLOG_DEBUG, " xpath no match %s",xpe->xpath_expr);
+ int i;
+ ok = dfa_match_first(xpe->dfa->states, pexpr);
- pexpr--;
if (ok) {
#ifdef ENHANCED_XELM
/* we have to check the perdicates up to the root node */
char *structure, struct recExtractCtrl *p,
RecWord *wrd)
{
- wrd->attrSet = VAL_IDXPATH;
- wrd->attrUse = 1;
- wrd->reg_type = '0';
+ wrd->index_name = ZEBRA_XPATH_ELM_BEGIN;
+ wrd->index_type = '0';
wrd->term_buf = tag_path;
wrd->term_len = strlen(tag_path);
(*p->tokenAdd)(wrd);
if (value) {
- wrd->attrUse = 1015;
- wrd->reg_type = 'w';
+ wrd->index_name = ZEBRA_XPATH_ATTR_CDATA;
+ wrd->index_type = 'w';
wrd->term_buf = value;
wrd->term_len = strlen(value);
(*p->tokenAdd)(wrd);
}
-
- wrd->attrUse = 2;
- wrd->reg_type = '0';
+ wrd->index_name = ZEBRA_XPATH_ELM_END;
+ wrd->index_type = '0';
wrd->term_buf = tag_path;
wrd->term_len = strlen(tag_path);
(*p->tokenAdd)(wrd);
}
-static void index_xpath (struct source_parser *sp, data1_node *n,
- struct recExtractCtrl *p,
- int level, RecWord *wrd, int use)
+static void mk_tag_path_full(char *tag_path_full, size_t max, data1_node *n)
{
- int i;
- char tag_path_full[1024];
size_t flen = 0;
data1_node *nn;
+
+ /* 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 > (max - 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;
+}
+
+
+static void index_xpath(struct source_parser *sp, data1_node *n,
+ struct recExtractCtrl *p,
+ int level, RecWord *wrd,
+ char *xpath_index,
+ int xpath_is_start
+ )
+{
+ int i;
+ char tag_path_full[1024];
int termlist_only = 1;
data1_termlist *tl;
int xpdone = 0;
-
- yaz_log(YLOG_DEBUG, "index_xpath level=%d use=%d", level, use);
+ yaz_log(YLOG_DEBUG, "index_xpath level=%d xpath_index=%s",
+ level, xpath_index);
if ((!n->root->u.root.absyn) ||
(n->root->u.root.absyn->enable_xpath_indexing)) {
termlist_only = 0;
wrd->term_buf = n->u.data.data;
wrd->term_len = n->u.data.len;
xpdone = 0;
- flen = 0;
-
- /* 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;
+
+ mk_tag_path_full(tag_path_full, sizeof(tag_path_full), n);
/* If we have a matching termlist... */
if (n->root->u.root.absyn &&
{
/* 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 */
+ wrd->index_type = *tl->structure;
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 (!tl->index_name)
+ {
+ /* this is the ! case, so structure is for the xpath index */
+ wrd_tl.index_name = xpath_index;
if (p->flagShowRecords)
{
int i;
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;
+ wrd_tl.index_name = tl->index_name;
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("%s %s", tl->index_name, tl->source);
printf (" XData:\"");
for (i = 0; i<wrd_tl.term_len && i < 40; i++)
fputc (wrd_tl.term_buf[i], stdout);
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';
+ wrd->index_name = xpath_index;
+ wrd->index_type = 'w';
(*p->tokenAdd)(wrd);
}
break;
case DATA1N_tag:
- flen = 0;
- 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;
- }
+ mk_tag_path_full(tag_path_full, sizeof(tag_path_full), n);
-
- wrd->reg_type = '0';
+ wrd->index_type = '0';
wrd->term_buf = tag_path_full;
- wrd->term_len = flen;
- wrd->attrSet = VAL_IDXPATH;
- wrd->attrUse = use;
+ wrd->term_len = strlen(tag_path_full);
+ wrd->index_name = xpath_index;
if (p->flagShowRecords)
{
printf("%*s tag=", (level + 1) * 4, "");
data1_termlist *tl;
int do_xpindex;
- tag_path_full[flen] = 0;
-
- /* Add tag start/end xpath index, only when there is a ! in the apropriate xelm
- directive, or default xpath indexing is enabled */
- if (!(do_xpindex = 1 - termlist_only)) {
- if ((tl = xpath_termlist_by_tagpath(tag_path_full, n))) {
- for (; tl; tl = tl->next) { if (!tl->att) {do_xpindex = 1;} }
+ /* Add tag start/end xpath index, only when there is a ! in
+ the apropriate xelm directive, or default xpath indexing
+ is enabled
+ */
+ if (!(do_xpindex = 1 - termlist_only))
+ {
+ if ((tl = xpath_termlist_by_tagpath(tag_path_full, n)))
+ {
+ for (; tl; tl = tl->next)
+ {
+ if (!tl->index_name)
+ do_xpindex = 1;
+ }
}
}
if (do_xpindex) {
(*p->tokenAdd)(wrd); /* index element pag (AKA tag path) */
}
- if (use == 1) /* only for the starting tag... */
+ if (xpath_is_start == 1) /* only for the starting tag... */
{
#define MAX_ATTR_COUNT 50
data1_termlist *tll[MAX_ATTR_COUNT];
int do_xpindex = 1 - termlist_only;
data1_termlist *tl;
char attr_tag_path_full[1024];
- int int_len = flen;
/* this could be cached as well */
- sprintf (attr_tag_path_full, "@%s/%.*s",
- xp->name, int_len, tag_path_full);
+ sprintf (attr_tag_path_full, "@%s/%s",
+ xp->name, tag_path_full);
tll[i] = xpath_termlist_by_tagpath(attr_tag_path_full,n);
if ((tl = tll[i]))
{
for (; tl; tl = tl->next)
- {
- if (!tl->att)
- do_xpindex = 1;
+ {
+ if (!tl->index_name)
+ do_xpindex = 1;
}
}
if (do_xpindex) {
/* attribute (no value) */
- wrd->reg_type = '0';
- wrd->attrUse = 3;
+ wrd->index_type = '0';
+ wrd->index_name = ZEBRA_XPATH_ATTR_NAME;
wrd->term_buf = xp->name;
wrd->term_len = strlen(xp->name);
strcpy (comb, xp->name);
strcat (comb, "=");
strcat (comb, xp->value);
-
- wrd->attrUse = 3;
- wrd->reg_type = '0';
+
+ wrd->index_name = ZEBRA_XPATH_ATTR_NAME;
+ wrd->index_type = '0';
wrd->term_buf = comb;
wrd->term_len = strlen(comb);
wrd->seqno--;
for (xp = n->u.tag.attributes; xp; xp = xp->next) {
data1_termlist *tl;
char attr_tag_path_full[1024];
- int int_len = flen;
int xpdone = 0;
- sprintf (attr_tag_path_full, "@%s/%.*s",
- xp->name, int_len, tag_path_full);
+ sprintf (attr_tag_path_full, "@%s/%s",
+ xp->name, tag_path_full);
if ((tl = tll[i]))
{
/* If there is a termlist given (=xelm directive) */
for (; tl; tl = tl->next)
{
- if (!tl->att) {
+ if (!tl->index_name)
+ {
/* add xpath index for the attribute */
index_xpath_attr (attr_tag_path_full, xp->name,
xp->value, tl->structure,
p, wrd);
xpdone = 1;
} else {
- /* add attribute based index for the attribute */
- if (xp->value) {
- wrd->attrSet = (int)
- (tl->att->parent->reference);
- wrd->attrUse = tl->att->locals->local;
- wrd->reg_type = *tl->structure;
+ /* index attribute value (only path/@attr) */
+ if (xp->value)
+ {
+ wrd->index_name = tl->index_name;
+ wrd->index_type = *tl->structure;
wrd->term_buf = xp->value;
wrd->term_len = strlen(xp->value);
(*p->tokenAdd)(wrd);
int i;
printf("%*sIdx: [%s]", (level + 1) * 4, "",
tlist->structure);
- printf("%s:%s [%d] %s",
- tlist->att->parent->name,
- tlist->att->name, tlist->att->value,
- tlist->source);
+ printf("%s %s", tlist->index_name, tlist->source);
printf (" XData:\"");
for (i = 0; i<wrd->term_len && i < 40; i++)
fputc (wrd->term_buf[i], stdout);
}
else
{
- wrd->reg_type = *tlist->structure;
- wrd->attrSet = (int) (tlist->att->parent->reference);
- wrd->attrUse = tlist->att->locals->local;
+ wrd->index_type = *tlist->structure;
+ wrd->index_name = tlist->index_name;
(*p->tokenAdd)(wrd);
}
}
index_termlist(sp, n, n, p, level, wrd);
/* index start tag */
if (n->root->u.root.absyn)
- index_xpath(sp, n, p, level, wrd, 1);
+ index_xpath(sp, n, p, level, wrd, ZEBRA_XPATH_ELM_BEGIN,
+ 1 /* is start */);
}
if (n->child)
if (par)
index_termlist(sp, par, n, p, level, wrd);
- index_xpath(sp, n, p, level, wrd, 1016);
+ index_xpath(sp, n, p, level, wrd, ZEBRA_XPATH_CDATA,
+ 0 /* is start */);
}
if (n->which == DATA1N_tag)
{
/* index end tag */
- index_xpath(sp, n, p, level, wrd, 2);
+ index_xpath(sp, n, p, level, wrd, ZEBRA_XPATH_ELM_END,
+ 0 /* is start */);
}
if (p->flagShowRecords && n->which == DATA1N_root)
return 0;
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+
projects / idzebra-moved-to-github.git / blobdiff