-/* $Id: recgrs.c,v 1.99 2005-01-17 22:32:16 adam Exp $
+/* $Id: recgrs.c,v 1.102 2005-06-23 06:45:47 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
/* 2nd arg: start */
if (!sp_expr(sp, n, &tmp_w))
return 0;
- start = atoi_n(tmp_w.string, tmp_w.length);
+ start = atoi_n(tmp_w.term_buf, tmp_w.term_len);
if (sp->lookahead == ',')
{
/* 3rd arg: length */
if (!sp_expr(sp, n, &tmp_w))
return 0;
- len = atoi_n(tmp_w.string, tmp_w.length);
+ len = atoi_n(tmp_w.term_buf, tmp_w.term_len);
}
else
- len = wrd->length;
+ len = wrd->term_len;
/* ) */
if (sp->lookahead != ')')
return 0;
sp_lex(sp);
- if (wrd->string && wrd->length)
+ if (wrd->term_buf && wrd->term_len)
{
- wrd->string += start;
- wrd->length -= start;
- if (wrd->length > len)
- wrd->length = len;
+ wrd->term_buf += start;
+ wrd->term_len -= start;
+ if (wrd->term_len > len)
+ wrd->term_len = len;
}
return 1;
}
if (!sp_expr(sp, n, &search_w))
return 0;
- for (i = 0; i<wrd->length; i++)
+ for (i = 0; i<wrd->term_len; i++)
{
int j;
- for (j = 0; j<search_w.length && i+j < wrd->length; j++)
- if (wrd->string[i+j] != search_w.string[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.length) /* match ? */
+ if (j == search_w.term_len) /* match ? */
{
if (min_pos == -1 || i < min_pos)
min_pos = i;
if (min_pos == -1)
min_pos = 0; /* the default if not found */
sprintf(num_str, "%d", min_pos);
- wrd->string = nmem_strdup(sp->nmem, num_str);
- wrd->length = strlen(wrd->string);
+ wrd->term_buf = nmem_strdup(sp->nmem, num_str);
+ wrd->term_len = strlen(wrd->term_buf);
return 1;
}
{
if (n->which == DATA1N_data)
{
- wrd->string = n->u.data.data;
- wrd->length = n->u.data.len;
+ wrd->term_buf = n->u.data.data;
+ wrd->term_len = n->u.data.len;
}
sp_lex(sp);
}
{
if (n->which == DATA1N_tag)
{
- wrd->string = n->u.tag.tag;
- wrd->length = strlen(n->u.tag.tag);
+ wrd->term_buf = n->u.tag.tag;
+ wrd->term_len = strlen(n->u.tag.tag);
}
sp_lex(sp);
}
if (!sp_expr(sp, n, &tmp_w))
return 0;
- wrd->string = "";
- wrd->length = 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.length &&
- memcmp (p->name, tmp_w.string, tmp_w.length))
+ 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->string = p->value;
- wrd->length = strlen(p->value);
+ wrd->term_buf = p->value;
+ wrd->term_len = strlen(p->value);
}
}
if (sp->lookahead != ')')
}
else if (sp->len > 0 && isdigit(*(unsigned char *)sp->tok))
{
- wrd->string = nmem_malloc(sp->nmem, sp->len);
- memcpy(wrd->string, sp->tok, sp->len);
- wrd->length = sp->len;
+ 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->length = sp->len - 2;
- wrd->string = nmem_malloc(sp->nmem, wrd->length);
- memcpy(wrd->string, sp->tok+1, wrd->length);
+ 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->string = "";
- wrd->length = 0;
+ wrd->term_buf = "";
+ wrd->term_len = 0;
sp_lex(sp);
}
return 1;
yaz_log(YLOG_WARN,
" Only attributes (@) are supported in xelm xpath predicates");
yaz_log(YLOG_WARN, "predicate %s ignored", p->u.relation.name);
- return (1);
+ return 1;
}
attname = p->u.relation.name + 1;
res = 0;
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);
- yaz_log(YLOG_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;
- 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);
+ yaz_log(YLOG_DEBUG, " xpath match %s",xpe->xpath_expr);
else
- yaz_log(YLOG_DEBUG," xpath no match %s",xpe->xpath_expr);
+ yaz_log(YLOG_DEBUG, " xpath no match %s",xpe->xpath_expr);
pexpr--;
if (ok) {
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--) {
-
- yaz_log(YLOG_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)) {
- yaz_log(YLOG_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) {
- yaz_log(YLOG_DEBUG,"Got it");
+ yaz_log(YLOG_DEBUG, "Got it");
return xpe->termlists;
} else {
return NULL;
char *structure, struct recExtractCtrl *p,
RecWord *wrd)
{
+#if NATTR
+ wrd->index_name = ZEBRA_XPATH_ELM_BEGIN;
+#else
wrd->attrSet = VAL_IDXPATH;
wrd->attrUse = 1;
- wrd->reg_type = '0';
- wrd->string = tag_path;
- wrd->length = strlen(tag_path);
+#endif
+ wrd->index_type = '0';
+ wrd->term_buf = tag_path;
+ wrd->term_len = strlen(tag_path);
(*p->tokenAdd)(wrd);
if (value) {
+#if NATTR
+ wrd->index_name = ZEBRA_XPATH_ATTR;
+#else
wrd->attrUse = 1015;
- wrd->reg_type = 'w';
- wrd->string = value;
- wrd->length = strlen(value);
+#endif
+ wrd->index_type = 'w';
+ wrd->term_buf = value;
+ wrd->term_len = strlen(value);
(*p->tokenAdd)(wrd);
}
-
+#if NATTR
+ wrd->index_name = ZEBRA_XPATH_ELM_END;
+#else
wrd->attrUse = 2;
- wrd->reg_type = '0';
- wrd->string = tag_path;
- wrd->length = strlen(tag_path);
+#endif
+ 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 index_xpath(struct source_parser *sp, data1_node *n,
+ struct recExtractCtrl *p,
+ int level, RecWord *wrd,
+#if NATTR
+ char *xpath_index,
+ int xpath_is_start
+#else
+ int use
+#endif
+ )
{
int i;
char tag_path_full[1024];
int termlist_only = 1;
data1_termlist *tl;
int xpdone = 0;
+#if NATTR
+#else
+ int xpath_is_start = 0;
+ if (use == 1)
+ xpath_is_start = 1;
+#endif
+#if NATTR
+ yaz_log(YLOG_DEBUG, "index_xpath level=%d xpath_index=%s",
+ level, xpath_index);
+#else
yaz_log(YLOG_DEBUG, "index_xpath level=%d use=%d", level, use);
+#endif
if ((!n->root->u.root.absyn) ||
(n->root->u.root.absyn->enable_xpath_indexing)) {
termlist_only = 0;
switch (n->which)
{
case DATA1N_data:
- wrd->string = n->u.data.data;
- wrd->length = n->u.data.len;
+ wrd->term_buf = n->u.data.data;
+ wrd->term_len = n->u.data.len;
xpdone = 0;
flen = 0;
{
/* 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) {
+#if NATTR
+ if (!tl->index_name)
+#else
+ if (!tl->att)
+#endif
+ {
+ /* this is the ! case, so structure is for the xpath index */
+#if NATTR
+ wrd_tl.index_name = xpath_index;
+#else
wrd_tl.attrSet = VAL_IDXPATH;
wrd_tl.attrUse = use;
+#endif
if (p->flagShowRecords)
{
int i;
printf("%*sXPath index", (level + 1) * 4, "");
printf (" XData:\"");
- for (i = 0; i<wrd_tl.length && i < 40; i++)
- fputc (wrd_tl.string[i], stdout);
+ for (i = 0; i<wrd_tl.term_len && i < 40; i++)
+ fputc (wrd_tl.term_buf[i], stdout);
fputc ('"', stdout);
- if (wrd_tl.length > 40)
+ if (wrd_tl.term_len > 40)
printf (" ...");
fputc ('\n', stdout);
}
xpdone = 1;
} else {
/* this is just the old fashioned attribute based index */
+#if NATTR
+ wrd_tl.index_name = tl->index_name;
+#else
wrd_tl.attrSet = (int) (tl->att->parent->reference);
wrd_tl.attrUse = tl->att->locals->local;
+#endif
if (p->flagShowRecords)
{
int i;
printf("%*sIdx: [%s]", (level + 1) * 4, "",
tl->structure);
+#if NATTR
+ printf("%s %s", tl->index_name, tl->source);
+#else
printf("%s:%s [%d] %s",
tl->att->parent->name,
tl->att->name, tl->att->value,
tl->source);
+#endif
printf (" XData:\"");
- for (i = 0; i<wrd_tl.length && i < 40; i++)
- fputc (wrd_tl.string[i], stdout);
+ for (i = 0; i<wrd_tl.term_len && i < 40; i++)
+ fputc (wrd_tl.term_buf[i], stdout);
fputc ('"', stdout);
- if (wrd_tl.length > 40)
+ if (wrd_tl.term_len > 40)
printf (" ...");
fputc ('\n', stdout);
}
or no ! in the termlist, and default indexing is enabled... */
if (!p->flagShowRecords && !xpdone && !termlist_only)
{
+#if NATTR
+ wrd->index_name = xpath_index;
+#else
wrd->attrSet = VAL_IDXPATH;
wrd->attrUse = use;
- wrd->reg_type = 'w';
+#endif
+ wrd->index_type = 'w';
(*p->tokenAdd)(wrd);
}
break;
}
- wrd->reg_type = '0';
- wrd->string = tag_path_full;
- wrd->length = flen;
+ wrd->index_type = '0';
+ wrd->term_buf = tag_path_full;
+ wrd->term_len = flen;
+#if NATTR
+ wrd->index_name = xpath_index;
+#else
wrd->attrSet = VAL_IDXPATH;
wrd->attrUse = use;
+#endif
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");
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 NATTR
+ if (!tl->index_name)
+#else
+ if (!tl->att)
+#endif
+ 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];
if ((tl = tll[i]))
{
for (; tl; tl = tl->next)
- {
+ {
+#if NATTR
+ if (!tl->index_name)
+ do_xpindex = 1;
+#else
if (!tl->att)
do_xpindex = 1;
+#endif
}
}
if (do_xpindex) {
/* attribute (no value) */
- wrd->reg_type = '0';
+ wrd->index_type = '0';
+#if NATTR
+ wrd->index_name = ZEBRA_XPATH_ATTR;
+#else
wrd->attrUse = 3;
- wrd->string = xp->name;
- wrd->length = strlen(xp->name);
+#endif
+ wrd->term_buf = xp->name;
+ wrd->term_len = strlen(xp->name);
wrd->seqno--;
(*p->tokenAdd)(wrd);
strcpy (comb, xp->name);
strcat (comb, "=");
strcat (comb, xp->value);
-
+
+#if NATTR
+ wrd->index_name = ZEBRA_XPATH_ATTR;
+#else
wrd->attrUse = 3;
- wrd->reg_type = '0';
- wrd->string = comb;
- wrd->length = strlen(comb);
+#endif
+ wrd->index_type = '0';
+ wrd->term_buf = comb;
+ wrd->term_len = strlen(comb);
wrd->seqno--;
(*p->tokenAdd)(wrd);
/* If there is a termlist given (=xelm directive) */
for (; tl; tl = tl->next)
{
- if (!tl->att) {
+#if NATTR
+ if (!tl->index_name)
+#else
+ if (!tl->att)
+#endif
+ {
/* add xpath index for the attribute */
index_xpath_attr (attr_tag_path_full, xp->name,
xp->value, tl->structure,
xpdone = 1;
} else {
/* add attribute based index for the attribute */
- if (xp->value) {
+ if (xp->value)
+ {
+#if NATTR
+ wrd->index_name = tl->index_name;
+#else
wrd->attrSet = (int)
(tl->att->parent->reference);
wrd->attrUse = tl->att->locals->local;
- wrd->reg_type = *tl->structure;
- wrd->string = xp->value;
- wrd->length = strlen(xp->value);
+#endif
+ wrd->index_type = *tl->structure;
+ wrd->term_buf = xp->value;
+ wrd->term_len = strlen(xp->value);
(*p->tokenAdd)(wrd);
}
}
for (; tlist; tlist = tlist->next)
{
/* consider source */
- wrd->string = 0;
+ wrd->term_buf = 0;
assert(tlist->source);
sp_parse(sp, n, wrd, tlist->source);
- if (wrd->string && wrd->length)
+ if (wrd->term_buf && wrd->term_len)
{
if (p->flagShowRecords)
{
int i;
printf("%*sIdx: [%s]", (level + 1) * 4, "",
tlist->structure);
+#if NATTR
+ printf("%s %s", tlist->index_name, tlist->source);
+#else
printf("%s:%s [%d] %s",
tlist->att->parent->name,
tlist->att->name, tlist->att->value,
tlist->source);
+#endif
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);
}
else
{
- wrd->reg_type = *tlist->structure;
+ wrd->index_type = *tlist->structure;
+#if NATTR
+ wrd->index_name = tlist->index_name;
+#else
wrd->attrSet = (int) (tlist->att->parent->reference);
wrd->attrUse = tlist->att->locals->local;
+#endif
(*p->tokenAdd)(wrd);
}
}
{
index_termlist(sp, n, n, p, level, wrd);
/* index start tag */
+#if NATTR
+ if (n->root->u.root.absyn)
+ index_xpath(sp, n, p, level, wrd, ZEBRA_XPATH_ELM_BEGIN,
+ 1 /* is start */);
+#else
if (n->root->u.root.absyn)
index_xpath(sp, n, p, level, wrd, 1);
+#endif
}
if (n->child)
if (par)
index_termlist(sp, par, n, p, level, wrd);
+#if NATTR
+ index_xpath(sp, n, p, level, wrd, ZEBRA_XPATH_CDATA,
+ 0 /* is start */);
+#else
index_xpath(sp, n, p, level, wrd, 1016);
+#endif
}
if (n->which == DATA1N_tag)
{
/* index end tag */
+#if NATTR
+ index_xpath(sp, n, p, level, wrd, ZEBRA_XPATH_ELM_END,
+ 0 /* is start */);
+#else
index_xpath(sp, n, p, level, wrd, 2);
+#endif
}
if (p->flagShowRecords && n->which == DATA1N_root)
projects / idzebra-moved-to-github.git / blobdiff