X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=recctrl%2Frecgrs.c;h=af9f0966ef20145a6b01d747200dd42bee1bf08b;hb=2ca7b6bfd7e8d9a2cb9c36bf2520b46511a594eb;hp=42886984a227e7954d1138a6c011522d1e85c190;hpb=7c7aeb7843c5bec48a8928f07f6498fc12b3eb72;p=idzebra-moved-to-github.git diff --git a/recctrl/recgrs.c b/recctrl/recgrs.c index 4288698..af9f096 100644 --- a/recctrl/recgrs.c +++ b/recctrl/recgrs.c @@ -1,4 +1,4 @@ -/* $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 @@ -87,7 +87,7 @@ static int sp_range(struct source_parser *sp, data1_node *n, RecWord *wrd) /* 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 == ',') { @@ -96,22 +96,22 @@ static int sp_range(struct source_parser *sp, data1_node *n, RecWord *wrd) /* 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; } @@ -134,13 +134,13 @@ static int sp_first(struct source_parser *sp, data1_node *n, RecWord *wrd) if (!sp_expr(sp, n, &search_w)) return 0; - for (i = 0; ilength; i++) + for (i = 0; iterm_len; i++) { int j; - for (j = 0; jlength; j++) - if (wrd->string[i+j] != search_w.string[j]) + for (j = 0; jterm_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; @@ -154,8 +154,8 @@ static int sp_first(struct source_parser *sp, data1_node *n, RecWord *wrd) 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; } @@ -167,8 +167,8 @@ static int sp_expr(struct source_parser *sp, data1_node *n, RecWord *wrd) { 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); } @@ -176,8 +176,8 @@ static int sp_expr(struct source_parser *sp, data1_node *n, RecWord *wrd) { 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); } @@ -192,18 +192,18 @@ static int sp_expr(struct source_parser *sp, data1_node *n, RecWord *wrd) 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 != ')') @@ -220,22 +220,22 @@ static int sp_expr(struct source_parser *sp, data1_node *n, RecWord *wrd) } 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; @@ -285,7 +285,7 @@ int d1_check_xpath_predicate(data1_node *n, struct xpath_predicate *p) 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; @@ -361,43 +361,43 @@ data1_termlist *xpath_termlist_by_tagpath(char *tagpath, data1_node *n) 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) { @@ -406,39 +406,36 @@ data1_termlist *xpath_termlist_by_tagpath(char *tagpath, data1_node *n) 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; @@ -471,22 +468,22 @@ static void index_xpath_attr (char *tag_path, char *name, char *value, 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); } @@ -512,8 +509,8 @@ static void index_xpath (struct source_parser *sp, data1_node *n, 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; @@ -557,10 +554,10 @@ static void index_xpath (struct source_parser *sp, data1_node *n, int i; printf("%*sXPath index", (level + 1) * 4, ""); printf (" XData:\""); - for (i = 0; i 40) + if (wrd_tl.term_len > 40) printf (" ..."); fputc ('\n', stdout); } @@ -581,10 +578,10 @@ static void index_xpath (struct source_parser *sp, data1_node *n, tl->att->name, tl->att->value, tl->source); printf (" XData:\""); - for (i = 0; i 40) + if (wrd_tl.term_len > 40) printf (" ..."); fputc ('\n', stdout); } @@ -622,15 +619,15 @@ static void index_xpath (struct source_parser *sp, data1_node *n, 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; ilength && i < 40; i++) - fputc (wrd->string[i], stdout); + for (i = 0; iterm_len && i < 40; i++) + fputc (wrd->term_buf[i], stdout); if (i == 40) printf (" .."); printf("\n"); @@ -696,8 +693,8 @@ static void index_xpath (struct source_parser *sp, data1_node *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); @@ -712,8 +709,8 @@ static void index_xpath (struct source_parser *sp, data1_node *n, 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); @@ -750,8 +747,8 @@ static void index_xpath (struct source_parser *sp, data1_node *n, (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); } } @@ -796,11 +793,11 @@ static void index_termlist (struct source_parser *sp, data1_node *par, 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) { @@ -812,10 +809,10 @@ static void index_termlist (struct source_parser *sp, data1_node *par, tlist->att->name, tlist->att->value, tlist->source); printf (" XData:\""); - for (i = 0; ilength && i < 40; i++) - fputc (wrd->string[i], stdout); + for (i = 0; iterm_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); }