X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzrpn.c;h=259129130d2a6fd6349e234d1f9e8c7d7c7bf4e7;hb=12c6db025bffd23e760ceb31120468cf363256df;hp=358557e3b67c876bfb975432db9d382261494212;hpb=d2462e5d299a6772dace31311998d3fccacf86af;p=idzebra-moved-to-github.git diff --git a/index/zrpn.c b/index/zrpn.c index 358557e..2591291 100644 --- a/index/zrpn.c +++ b/index/zrpn.c @@ -1,4 +1,4 @@ -/* $Id: zrpn.c,v 1.151 2004-09-13 09:02:16 adam Exp $ +/* $Id: zrpn.c,v 1.156 2004-10-01 15:36:15 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps @@ -64,7 +64,7 @@ typedef struct { static const char **rpn_char_map_handler (void *vp, const char **from, int len) { struct rpn_char_map_info *p = (struct rpn_char_map_info *) vp; - const char **out = zebra_maps_input (p->zm, p->reg_type, from, len); + const char **out = zebra_maps_input (p->zm, p->reg_type, from, len, 0); #if 0 if (out && *out) { @@ -261,7 +261,7 @@ static int grep_handle (char *name, const char *info, void *p) } static int term_pre (ZebraMaps zebra_maps, int reg_type, const char **src, - const char *ct1, const char *ct2) + const char *ct1, const char *ct2, int first) { const char *s1, *s0 = *src; const char **map; @@ -274,7 +274,7 @@ static int term_pre (ZebraMaps zebra_maps, int reg_type, const char **src, if (ct2 && strchr (ct2, *s0)) break; s1 = s0; - map = zebra_maps_input (zebra_maps, reg_type, &s1, strlen(s1)); + map = zebra_maps_input (zebra_maps, reg_type, &s1, strlen(s1), first); if (**map != *CHR_SPACE) break; s0 = s1; @@ -298,13 +298,13 @@ static int term_100 (ZebraMaps zebra_maps, int reg_type, const char *space_start = 0; const char *space_end = 0; - if (!term_pre (zebra_maps, reg_type, src, NULL, NULL)) + if (!term_pre (zebra_maps, reg_type, src, NULL, NULL, !space_split)) return 0; s0 = *src; while (*s0) { s1 = s0; - map = zebra_maps_input (zebra_maps, reg_type, &s0, strlen(s0)); + map = zebra_maps_input (zebra_maps, reg_type, &s0, strlen(s0), 0); if (space_split) { if (**map == *CHR_SPACE) @@ -356,7 +356,7 @@ static int term_101 (ZebraMaps zebra_maps, int reg_type, int i = 0; int j = 0; - if (!term_pre (zebra_maps, reg_type, src, "#", "#")) + if (!term_pre (zebra_maps, reg_type, src, "#", "#", !space_split)) return 0; s0 = *src; while (*s0) @@ -370,7 +370,7 @@ static int term_101 (ZebraMaps zebra_maps, int reg_type, else { s1 = s0; - map = zebra_maps_input (zebra_maps, reg_type, &s0, strlen(s0)); + map = zebra_maps_input (zebra_maps, reg_type, &s0, strlen(s0), 0); if (space_split && **map == *CHR_SPACE) break; while (s1 < s0) @@ -398,7 +398,7 @@ static int term_103 (ZebraMaps zebra_maps, int reg_type, const char **src, const char *s0, *s1; const char **map; - if (!term_pre (zebra_maps, reg_type, src, "^\\()[].*+?|", "(")) + if (!term_pre (zebra_maps, reg_type, src, "^\\()[].*+?|", "(", !space_split)) return 0; s0 = *src; if (errors && *s0 == '+' && s0[1] && s0[2] == '+' && s0[3] && @@ -419,7 +419,7 @@ static int term_103 (ZebraMaps zebra_maps, int reg_type, const char **src, else { s1 = s0; - map = zebra_maps_input (zebra_maps, reg_type, &s0, strlen(s0)); + map = zebra_maps_input (zebra_maps, reg_type, &s0, strlen(s0), 0); if (**map == *CHR_SPACE) break; while (s1 < s0) @@ -456,7 +456,7 @@ static int term_104 (ZebraMaps zebra_maps, int reg_type, int i = 0; int j = 0; - if (!term_pre (zebra_maps, reg_type, src, "?*#", "?*#")) + if (!term_pre (zebra_maps, reg_type, src, "?*#", "?*#", !space_split)) return 0; s0 = *src; while (*s0) @@ -499,7 +499,7 @@ static int term_104 (ZebraMaps zebra_maps, int reg_type, } { s1 = s0; - map = zebra_maps_input (zebra_maps, reg_type, &s0, strlen(s0)); + map = zebra_maps_input (zebra_maps, reg_type, &s0, strlen(s0), 0); if (space_split && **map == *CHR_SPACE) break; while (s1 < s0) @@ -527,7 +527,7 @@ static int term_105 (ZebraMaps zebra_maps, int reg_type, int i = 0; int j = 0; - if (!term_pre (zebra_maps, reg_type, src, "*!", "*!")) + if (!term_pre (zebra_maps, reg_type, src, "*!", "*!", !space_split)) return 0; s0 = *src; while (*s0) @@ -545,7 +545,7 @@ static int term_105 (ZebraMaps zebra_maps, int reg_type, } { s1 = s0; - map = zebra_maps_input (zebra_maps, reg_type, &s0, strlen(s0)); + map = zebra_maps_input (zebra_maps, reg_type, &s0, strlen(s0), 0); if (space_split && **map == *CHR_SPACE) break; while (s1 < s0) @@ -1245,7 +1245,7 @@ static int trans_scan_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt, while ((len = (cp_end - cp)) > 0) { - map = zebra_maps_input (zh->reg->zebra_maps, reg_type, &cp, len); + map = zebra_maps_input (zh->reg->zebra_maps, reg_type, &cp, len, 0); if (**map == *CHR_SPACE) space_map = *map; else @@ -1464,8 +1464,8 @@ static RSET rpn_search_APT_and_list (ZebraHandle zh, NMEM rset_nmem) { char term_dst[IT_MAX_WORD+1]; - RSET rset[60], result; - int i, rset_no = 0; + RSET rset[60]; /* FIXME - bug 160 - should be dynamic somehow */ + int rset_no = 0; struct grep_info grep_info; char *termz = normalize_term(zh, zapt, termz_org, stream, reg_type); const char *termp = termz; @@ -1490,12 +1490,9 @@ static RSET rpn_search_APT_and_list (ZebraHandle zh, grep_info_delete (&grep_info); if (rset_no == 0) return rsnull_create (rset_nmem,key_it_ctrl); - result = rset[0]; - /* FIXME - Use a proper rsmultiand */ - for (i = 1; iscope, - result, rset[i] ); - return result; + + return rsmultiand_create( rset_nmem, key_it_ctrl, key_it_ctrl->scope, + rset_no, rset); } static int numeric_relation (ZebraHandle zh, Z_AttributesPlusTerm *zapt, @@ -1694,10 +1691,11 @@ static RSET rpn_search_APT_numeric (ZebraHandle zh, { char term_dst[IT_MAX_WORD+1]; const char *termp = termz; - RSET rset[60], result; - int i, r, rset_no = 0; + RSET rset[60]; /* FIXME - hard-coded magic number */ + int r, rset_no = 0; struct grep_info grep_info; + logf (LOG_DEBUG, "APT_numeric t='%s'",termz); if (grep_info_prepare (zh, zapt, &grep_info, reg_type, stream)) return 0; while (1) @@ -1724,14 +1722,10 @@ static RSET rpn_search_APT_numeric (ZebraHandle zh, grep_info_delete (&grep_info); if (rset_no == 0) return rsnull_create (rset_nmem,key_it_ctrl); - result = rset[0]; - for (i = 1; iscope, - result, rset[i] ); - } - return result; + if (rset_no == 1) + return rset[0]; + return rsmultiand_create(rset_nmem,key_it_ctrl,key_it_ctrl->scope, + rset_no, rset); } static RSET rpn_search_APT_local (ZebraHandle zh, Z_AttributesPlusTerm *zapt, @@ -1744,14 +1738,6 @@ static RSET rpn_search_APT_local (ZebraHandle zh, Z_AttributesPlusTerm *zapt, RSFD rsfd; struct it_key key; int sys; - /* - rset_temp_parms parms; - - 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); - */ result = rstemp_create( rset_nmem,key_it_ctrl,key_it_ctrl->scope, res_get (zh->res, "setTmpDir") ); rsfd = rset_open (result, RSETF_WRITE); @@ -1759,16 +1745,9 @@ static RSET rpn_search_APT_local (ZebraHandle zh, Z_AttributesPlusTerm *zapt, sys = atoi(termz); if (sys <= 0) sys = 1; -#if IT_KEY_NEW key.mem[0] = sys; key.mem[1] = 1; key.len = 2; -#else - key.sysno = sys; - key.seqno = 1; - if (key.sysno <= 0) - key.sysno = 1; -#endif rset_write (rsfd, &key); rset_close (rsfd); return result; @@ -2184,38 +2163,37 @@ static RSET rpn_search_structure (ZebraHandle zh, Z_RPNStructure *zs, if (zs->which == Z_RPNStructure_complex) { Z_Operator *zop = zs->u.complex->roperator; - RSET rset_l; - RSET rset_r; + RSET rsets[2]; /* l and r argument */ - rset_l = rpn_search_structure (zh, zs->u.complex->s1, + rsets[0]=rpn_search_structure (zh, zs->u.complex->s1, attributeSet, stream, rset_nmem, sort_sequence, num_bases, basenames); - if (rset_l == NULL) + if (rsets[0] == NULL) return NULL; - rset_r = rpn_search_structure (zh, zs->u.complex->s2, + rsets[1]=rpn_search_structure (zh, zs->u.complex->s2, attributeSet, stream, rset_nmem, sort_sequence, num_bases, basenames); - if (rset_r == NULL) + if (rsets[1] == NULL) { - rset_delete (rset_l); + rset_delete (rsets[0]); return NULL; } switch (zop->which) { case Z_Operator_and: - r = rsbool_create_and(rset_nmem,key_it_ctrl, key_it_ctrl->scope, - rset_l,rset_r ); + r=rsmultiand_create(rset_nmem, key_it_ctrl, key_it_ctrl->scope, + 2, rsets); break; case Z_Operator_or: - r = rsbool_create_or(rset_nmem,key_it_ctrl, key_it_ctrl->scope, - rset_l,rset_r ); + r=rsmultior_create(rset_nmem, key_it_ctrl, key_it_ctrl->scope, + 2, rsets); break; case Z_Operator_and_not: r = rsbool_create_not(rset_nmem,key_it_ctrl, key_it_ctrl->scope, - rset_l,rset_r ); + rsets[0],rsets[1]); break; case Z_Operator_prox: if (zop->u.prox->which != Z_ProximityOperator_known) @@ -2234,12 +2212,8 @@ static RSET rpn_search_structure (ZebraHandle zh, Z_RPNStructure *zs, else { /* new / old prox */ - RSET twosets[2]; - - twosets[0] = rset_l; - twosets[1] = rset_r; r=rsprox_create(rset_nmem,key_it_ctrl,key_it_ctrl->scope, - 2, twosets, + 2, rsets, *zop->u.prox->ordered, (!zop->u.prox->exclusion ? 0 : *zop->u.prox->exclusion), @@ -2308,7 +2282,7 @@ RSET rpn_search (ZebraHandle zh, NMEM nmem, NMEM rset_nmem, sort_sequence = (Z_SortKeySpecList *) nmem_malloc (nmem, sizeof(*sort_sequence)); - sort_sequence->num_specs = 10; + sort_sequence->num_specs = 10; /* FIXME - Hard-coded number */ sort_sequence->specs = (Z_SortKeySpec **) nmem_malloc (nmem, sort_sequence->num_specs * sizeof(*sort_sequence->specs)); @@ -2420,19 +2394,11 @@ static void count_set (RSET r, int *count) rfd = rset_open (r, RSETF_READ); while (rset_read (rfd, &key)) { -#if IT_KEY_NEW if (key.mem[0] != psysno) { psysno = key.mem[0]; (*count)++; } -#else - if (key.sysno != psysno) - { - psysno = key.sysno; - (*count)++; - } -#endif kno++; } rset_close (rfd);