X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzrpn.c;h=4ec577cec3084f7970139fadec7f5411498fd966;hb=b24dc9a2d7ed255ed3b4f4ba35f11656aa89ef03;hp=f09278d6bf4fa1b5abdb0efb8012d61542bdb743;hpb=881b9293d6699c85195142af3f4a957f4982e6e2;p=idzebra-moved-to-github.git diff --git a/index/zrpn.c b/index/zrpn.c index f09278d..4ec577c 100644 --- a/index/zrpn.c +++ b/index/zrpn.c @@ -1,4 +1,4 @@ -/* $Id: zrpn.c,v 1.135 2004-01-15 13:31:31 adam Exp $ +/* $Id: zrpn.c,v 1.140 2004-06-16 21:29:49 adam Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps @@ -38,6 +38,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include #include +#include struct rpn_char_map_info { ZebraMaps zm; @@ -941,7 +942,7 @@ static int string_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt, zh->errString = basenames[base_no]; return -1; } - if (use_value == -2) /* string attribute (assume IDXPATH/any) */ + if (xpath_use > 0 && use_value == -2) { use_value = xpath_use; attp.local_attributes = &id_xpath_attr; @@ -958,17 +959,23 @@ static int string_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt, } else { - if ((r=att_getentbyatt (zh, &attp, curAttributeSet, use_value))) + if ((r=att_getentbyatt (zh, &attp, curAttributeSet, use_value, + use_string))) { logf (LOG_DEBUG, "att_getentbyatt fail. set=%d use=%d r=%d", curAttributeSet, use_value, r); if (r == -1) { /* set was found, but value wasn't defined */ - char val_str[32]; - sprintf (val_str, "%d", use_value); errCode = 114; - errString = nmem_strdup (stream, val_str); + if (use_string) + errString = nmem_strdup(stream, use_string); + else + { + char val_str[32]; + sprintf (val_str, "%d", use_value); + errString = nmem_strdup (stream, val_str); + } } else { @@ -1011,10 +1018,14 @@ static int string_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt, } if (!prefix_len) { +#if 1 + bases_ok++; +#else char val_str[32]; sprintf (val_str, "%d", use_value); errCode = 114; errString = nmem_strdup (stream, val_str); +#endif continue; } bases_ok++; /* this has OK attributes */ @@ -1242,238 +1253,6 @@ static int trans_scan_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt, return 0; } -static RSET rpn_prox (ZebraHandle zh, RSET *rset, int rset_no, - int ordered, int exclusion, int relation, int distance) -{ - int i; - RSFD *rsfd; - int *more; - struct it_key **buf; - RSET result; - char prox_term[1024]; - int length_prox_term = 0; - int min_nn = 10000000; - int term_index; - int term_type = Z_Term_characterString; - const char *flags = NULL; - - rsfd = (RSFD *) xmalloc (sizeof(*rsfd)*rset_no); - more = (int *) xmalloc (sizeof(*more)*rset_no); - buf = (struct it_key **) xmalloc (sizeof(*buf)*rset_no); - - *prox_term = '\0'; - for (i = 0; ino_rset_terms; j++) - { - const char *nflags = rset[i]->rset_terms[j]->flags; - char *term = rset[i]->rset_terms[j]->name; - int lterm = strlen(term); - if (lterm + length_prox_term < sizeof(prox_term)-1) - { - if (length_prox_term) - prox_term[length_prox_term++] = ' '; - strcpy (prox_term + length_prox_term, term); - length_prox_term += lterm; - } - if (min_nn > rset[i]->rset_terms[j]->nn) - min_nn = rset[i]->rset_terms[j]->nn; - flags = nflags; - term_type = rset[i]->rset_terms[j]->type; - - /* only if all term types are of type characterString .. */ - /* the resulting term is of that type */ - if (term_type != Z_Term_characterString) - term_type = Z_Term_general; - } - } - for (i = 0; inn = 0; - result = rset_create (rset_kind_null, &parms); - } - else if (ordered && relation == 3 && exclusion == 0 && distance == 1) - { - /* special proximity case = phrase search ... */ - rset_temp_parms parms; - RSFD rsfd_result; - - parms.rset_term = rset_term_create (prox_term, length_prox_term, - flags, term_type); - parms.rset_term->nn = min_nn; - parms.cmp = key_compare_it; - parms.key_size = sizeof (struct it_key); - parms.temp_path = res_get (zh->res, "setTmpDir"); - result = rset_create (rset_kind_temp, &parms); - rsfd_result = rset_open (result, RSETF_WRITE); - - while (*more) - { - for (i = 1; i 1) - { - more[i-1] = rset_read (rset[i-1], rsfd[i-1], - buf[i-1], &term_index); - break; - } - else if (cmp == 1) - { - if (buf[i-1]->seqno+1 != buf[i]->seqno) - { - more[i-1] = rset_read (rset[i-1], rsfd[i-1], - buf[i-1], &term_index); - break; - } - } - else - { - more[i] = rset_read (rset[i], rsfd[i], buf[i], - &term_index); - break; - } - } - if (i == rset_no) - { - rset_write (result, rsfd_result, buf[0]); - more[0] = rset_read (*rset, *rsfd, *buf, &term_index); - } - } - rset_close (result, rsfd_result); - } - else if (rset_no == 2) - { - /* generic proximity case (two input sets only) ... */ - rset_temp_parms parms; - RSFD rsfd_result; - - yaz_log (LOG_LOG, "generic prox, dist=%d, relation=%d, ordered=%d" - ", exclusion=%d", - distance, relation, ordered, exclusion); - parms.rset_term = rset_term_create (prox_term, length_prox_term, - flags, term_type); - parms.rset_term->nn = min_nn; - parms.cmp = key_compare_it; - parms.key_size = sizeof (struct it_key); - parms.temp_path = res_get (zh->res, "setTmpDir"); - result = rset_create (rset_kind_temp, &parms); - rsfd_result = rset_open (result, RSETF_WRITE); - - while (more[0] && more[1]) - { - int cmp = key_compare_it (buf[0], buf[1]); - if (cmp < -1) - more[0] = rset_read (rset[0], rsfd[0], buf[0], &term_index); - else if (cmp > 1) - more[1] = rset_read (rset[1], rsfd[1], buf[1], &term_index); - else - { - int sysno = buf[0]->sysno; - int seqno[500]; - int n = 0; - - seqno[n++] = buf[0]->seqno; - while ((more[0] = rset_read (rset[0], rsfd[0], buf[0], - &term_index)) && - sysno == buf[0]->sysno) - if (n < 500) - seqno[n++] = buf[0]->seqno; - do - { - for (i = 0; iseqno - seqno[i]; - int excl = exclusion; - if (!ordered && diff < 0) - diff = -diff; - switch (relation) - { - case 1: /* < */ - if (diff < distance && diff >= 0) - excl = !excl; - break; - case 2: /* <= */ - if (diff <= distance && diff >= 0) - excl = !excl; - break; - case 3: /* == */ - if (diff == distance && diff >= 0) - excl = !excl; - break; - case 4: /* >= */ - if (diff >= distance && diff >= 0) - excl = !excl; - break; - case 5: /* > */ - if (diff > distance && diff >= 0) - excl = !excl; - break; - case 6: /* != */ - if (diff != distance && diff >= 0) - excl = !excl; - break; - } - if (excl) - { - rset_write (result, rsfd_result, buf[1]); - break; - } - } - } while ((more[1] = rset_read (rset[1], rsfd[1], buf[1], - &term_index)) && - sysno == buf[1]->sysno); - } - } - rset_close (result, rsfd_result); - } - else - { - rset_null_parms parms; - - parms.rset_term = rset_term_create (prox_term, length_prox_term, - flags, term_type); - parms.rset_term->nn = 0; - result = rset_create (rset_kind_null, &parms); - } - for (i = 0; isortRelation = (int *) nmem_malloc (stream, sizeof(*sks->sortRelation)); if (sort_relation_value == 1) - *sks->sortRelation = Z_SortRelation_ascending; + *sks->sortRelation = Z_SortKeySpec_ascending; else if (sort_relation_value == 2) - *sks->sortRelation = Z_SortRelation_descending; + *sks->sortRelation = Z_SortKeySpec_descending; else - *sks->sortRelation = Z_SortRelation_ascending; + *sks->sortRelation = Z_SortKeySpec_ascending; sks->caseSensitivity = (int *) nmem_malloc (stream, sizeof(*sks->caseSensitivity)); @@ -2106,33 +1903,6 @@ static RSET rpn_sort_spec (ZebraHandle zh, Z_AttributesPlusTerm *zapt, return rset_create (rset_kind_null, &parms); } -/* pop - moved to xpath.c */ -#if 0 - -struct xpath_predicate { - int which; - union { -#define XPATH_PREDICATE_RELATION 1 - struct { - char *name; - char *op; - char *value; - } relation; -#define XPATH_PREDICATE_BOOLEAN 2 - struct { - const char *op; - struct xpath_predicate *left; - struct xpath_predicate *right; - } boolean; - } u; -}; - -struct xpath_location_step { - char *part; - struct xpath_predicate *predicate; -}; - -#endif static int parse_xpath(ZebraHandle zh, Z_AttributesPlusTerm *zapt, oid_value attributeSet, @@ -2473,6 +2243,7 @@ static RSET rpn_search_structure (ZebraHandle zh, Z_RPNStructure *zs, } bool_parms.key_size = sizeof(struct it_key); bool_parms.cmp = key_compare_it; + bool_parms.log_item = key_logdump_txt; switch (zop->which) { @@ -2501,19 +2272,24 @@ static RSET rpn_search_structure (ZebraHandle zh, Z_RPNStructure *zs, } else { - RSET rsets[2]; - - rsets[0] = bool_parms.rset_l; - rsets[1] = bool_parms.rset_r; + /* new / old prox */ + rset_prox_parms parms; + RSET twosets[2]; - r = rpn_prox (zh, rsets, 2, - *zop->u.prox->ordered, - (!zop->u.prox->exclusion ? 0 : - *zop->u.prox->exclusion), - *zop->u.prox->relationType, - *zop->u.prox->distance); - rset_delete (rsets[0]); - rset_delete (rsets[1]); + twosets[0] = bool_parms.rset_l; + twosets[1] = bool_parms.rset_r; + parms.rset = twosets; + parms.rset_no = 2; + parms.ordered = *zop->u.prox->ordered; + parms.exclusion = (!zop->u.prox->exclusion ? 0 : + *zop->u.prox->exclusion); + parms.relation = *zop->u.prox->relationType; + parms.distance = *zop->u.prox->distance; + parms.key_size = sizeof(struct it_key); + parms.cmp = key_compare_it; + parms.getseq = key_get_seq; + parms.log_item = key_logdump_txt; + r = rset_create(rset_kind_prox, &parms); } break; default: @@ -2715,6 +2491,7 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, char termz[IT_MAX_WORD+20]; AttrType use; int use_value; + const char *use_string = 0; struct scan_info *scan_info_array; ZebraScanEntry *glist; int ords[32], ord_no = 0; @@ -2765,7 +2542,7 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, pos, num, attributeset); attr_init (&use, zapt, 1); - use_value = attr_find (&use, &attributeset); + use_value = attr_find_ex (&use, &attributeset, &use_string); if (zebra_maps_attr (zh->reg->zebra_maps, zapt, ®_id, &search_type, rank_type, &complete_flag, &sort_flag)) @@ -2784,7 +2561,8 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, attent attp; data1_local_attribute *local_attr; - if ((r=att_getentbyatt (zh, &attp, attributeset, use_value))) + if ((r=att_getentbyatt (zh, &attp, attributeset, use_value, + use_string))) { logf (LOG_DEBUG, "att_getentbyatt fail. set=%d use=%d", attributeset, use_value); @@ -2919,7 +2697,8 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, bool_parms.key_size = sizeof(struct it_key); bool_parms.cmp = key_compare_it; - bool_parms.rset_l = rset; + bool_parms.log_item = key_logdump_txt; + bool_parms.rset_l = rset; bool_parms.rset_r = rset2; rset = rset_create (rset_kind_or, &bool_parms); @@ -2933,7 +2712,8 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, bool_parms.key_size = sizeof(struct it_key); bool_parms.cmp = key_compare_it; - bool_parms.rset_l = rset; + bool_parms.log_item = key_logdump_txt; + bool_parms.rset_l = rset; bool_parms.rset_r = rset_dup(limit_set); rset = rset_create (rset_kind_and, &bool_parms); @@ -2998,7 +2778,8 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, bool_parms.key_size = sizeof(struct it_key); bool_parms.cmp = key_compare_it; - bool_parms.rset_l = rset; + bool_parms.log_item = key_logdump_txt; + bool_parms.rset_l = rset; bool_parms.rset_r = rset2; rset = rset_create (rset_kind_or, &bool_parms); @@ -3012,6 +2793,7 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, bool_parms.key_size = sizeof(struct it_key); bool_parms.cmp = key_compare_it; + bool_parms.log_item = key_logdump_txt; bool_parms.rset_l = rset; bool_parms.rset_r = rset_dup(limit_set);