-/* $Id: recgrs.c,v 1.99 2005-01-17 22:32:16 adam Exp $
+/* $Id: recgrs.c,v 1.101 2005-04-29 23:09:30 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;
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);
}
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;
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);
}
tl->att->name, tl->att->value,
tl->source);
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);
}
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");
/* 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);
}
}
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)
{
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);
}