X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzrpn.c;h=3bca949e5c38e827b50e5d90a42c11b3624d2d20;hb=a9d1f1c7c6254115b779f46c3d12d6e59c240e0a;hp=9d12e038b4fde488c00192422cb528615e16222b;hpb=7e928bc31abe214023a0fc61d77b092f4ee9ba7e;p=idzebra-moved-to-github.git diff --git a/index/zrpn.c b/index/zrpn.c index 9d12e03..3bca949 100644 --- a/index/zrpn.c +++ b/index/zrpn.c @@ -4,7 +4,22 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: zrpn.c,v $ - * Revision 1.17 1995-10-04 12:55:17 adam + * Revision 1.22 1995-10-06 15:07:39 adam + * Structure 'local-number' handled. + * + * Revision 1.21 1995/10/06 13:52:06 adam + * Bug fixes. Handler may abort further scanning. + * + * Revision 1.20 1995/10/06 11:06:33 adam + * Scan entries include 'occurrences' now. + * + * Revision 1.19 1995/10/06 10:43:56 adam + * Scan added. 'occurrences' in scan entries not set yet. + * + * Revision 1.18 1995/10/04 16:57:20 adam + * Key input and merge sort in one pass. + * + * Revision 1.17 1995/10/04 12:55:17 adam * Bug fix in ranked search. Use=Any keys inserted. * * Revision 1.16 1995/10/02 16:24:40 adam @@ -346,7 +361,7 @@ static int trunc_term (ZServerInfo *zi, Z_AttributesPlusTerm *zapt, attr_init (&use, zapt, 1); use_value = attr_find (&use); - logf (LOG_DEBUG, "use value %d", truncation_value); + logf (LOG_DEBUG, "use value %d", use_value); attr_init (&truncation, zapt, 5); truncation_value = attr_find (&truncation); logf (LOG_DEBUG, "truncation value %d", truncation_value); @@ -397,29 +412,6 @@ static int trunc_term (ZServerInfo *zi, Z_AttributesPlusTerm *zapt, return 0; } -#if 0 -static void field_term (ZServerInfo *zi, Z_AttributesPlusTerm *zapt, - char *termz) -{ - size_t i, j, sizez; - AttrType use; - int use_value; - Z_Term *term = zapt->term; - - attr_init (&use, zapt, 1); - use_value = attr_find (&use); - if (use_value == -1) - use_value = 1016; - - i = index_word_prefix (termz, 1, use_value); - sizez = i + term->u.general->len; - if (sizez > IT_MAX_WORD) - sizez = IT_MAX_WORD; - for (j = 0; i < sizez; i++, j++) - termz[i] = index_char_cvt (term->u.general->buf[j]); - termz[i] = '\0'; -} -#else static void trans_term (ZServerInfo *zi, Z_AttributesPlusTerm *zapt, char *termz) { @@ -433,7 +425,6 @@ static void trans_term (ZServerInfo *zi, Z_AttributesPlusTerm *zapt, termz[i] = index_char_cvt (term->u.general->buf[i]); termz[i] = '\0'; } -#endif static RSET rpn_search_APT_relevance (ZServerInfo *zi, Z_AttributesPlusTerm *zapt) @@ -533,6 +524,33 @@ static RSET rpn_search_APT_phrase (ZServerInfo *zi, return rset_create (rset_kind_isam, &parms); } +static RSET rpn_search_APT_local (ZServerInfo *zi, Z_AttributesPlusTerm *zapt) +{ + RSET result; + RSFD rsfd; + struct it_key key; + rset_temp_parms parms; + char termz[IT_MAX_WORD+1]; + + if (zapt->term->which != Z_Term_general) + { + zi->errCode = 124; + return NULL; + } + parms.key_size = sizeof (struct it_key); + result = rset_create (rset_kind_temp, &parms); + rsfd = rset_open (result, 1); + + trans_term (zi, zapt, termz); + key.sysno = atoi (termz); + if (key.sysno <= 0) + key.sysno = 1; + rset_write (result, rsfd, &key); + rset_close (result, rsfd); + return result; +} + + static RSET rpn_search_APT (ZServerInfo *zi, Z_AttributesPlusTerm *zapt) { AttrType relation; @@ -582,7 +600,7 @@ static RSET rpn_search_APT (ZServerInfo *zi, Z_AttributesPlusTerm *zapt) case 106: /* document-text */ return rpn_search_APT_relevance (zi, zapt); case 107: /* local-number */ - break; + return rpn_search_APT_local (zi, zapt); case 108: /* string */ return rpn_search_APT_word (zi, zapt); case 109: /* numeric string */ @@ -693,6 +711,92 @@ int rpn_search (ZServerInfo *zi, return zi->errCode; count_set (rset, hits); resultSetAdd (zi, setname, 1, rset); + if (zi->errCode) + logf (LOG_DEBUG, "search error: %d", zi->errCode); return zi->errCode; } +static struct scan_entry *scan_list; +static ODR scan_odr; +static int scan_before, scan_after; +static ISAM scan_isam; +static char scan_prefix[20]; + +static int scan_handle (Dict_char *name, const char *info, int pos) +{ + int len_prefix, idx; + ISAM_P isam_p; + RSET rset; + + rset_isam_parms parms; + + len_prefix = strlen(scan_prefix); + if (memcmp (name, scan_prefix, len_prefix)) + return 1; + if (pos > 0) + idx = scan_after - pos + scan_before; + else + idx = - pos - 1; + scan_list[idx].term = odr_malloc (scan_odr, strlen(name + len_prefix)+1); + strcpy (scan_list[idx].term, name + len_prefix); + assert (*info == sizeof(isam_p)); + memcpy (&isam_p, info+1, sizeof(isam_p)); + parms.is = scan_isam; + parms.pos = isam_p; +#if 1 + rset = rset_create (rset_kind_isam, &parms); + count_set (rset, &scan_list[idx].occurrences); + rset_delete (rset); +#else + scan_list[idx].occurrences = 1; +#endif + logf (LOG_DEBUG, "pos=%3d idx=%3d name=%s", pos, idx, name); + return 0; +} + +int rpn_scan (ZServerInfo *zi, ODR odr, Z_AttributesPlusTerm *zapt, + int *position, int *num_entries, struct scan_entry **list) +{ + int i, j, sizez; + int pos = *position; + int num = *num_entries; + int before; + int after; + char termz[IT_MAX_WORD+20]; + AttrType use; + int use_value; + Z_Term *term = zapt->term; + + logf (LOG_DEBUG, "scan, position = %d, num = %d", pos, num); + scan_before = before = pos-1; + scan_after = after = 1+num-pos; + scan_odr = odr; + + logf (LOG_DEBUG, "scan, before = %d, after = %d", before, after); + + scan_isam = zi->wordIsam; + scan_list = *list = odr_malloc (odr, (before+after)*sizeof(**list)); + for (j = 0; ju.general->len; + if (sizez > IT_MAX_WORD) + sizez = IT_MAX_WORD; + for (j = 0; ju.general->buf[j]); + termz[j+i] = '\0'; + + dict_scan (zi->wordDict, termz, &before, &after, scan_handle); + + if (zi->errCode) + logf (LOG_DEBUG, "search error: %d", zi->errCode); + return 0; +} +