X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzrpn.c;h=fb9ad2e5a1167620429d3ac6a14c16b4c7b92b41;hb=2c7c2ca460fee75f3bebc0479b9787f0c401db03;hp=3a2491a4e09774694f0f977ffaab227c79f54c91;hpb=78391d3ac4af6f8cea3b73d8884b37d472c85c61;p=idzebra-moved-to-github.git diff --git a/index/zrpn.c b/index/zrpn.c index 3a2491a..fb9ad2e 100644 --- a/index/zrpn.c +++ b/index/zrpn.c @@ -4,7 +4,65 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: zrpn.c,v $ - * Revision 1.10 1995-09-11 15:23:26 adam + * Revision 1.29 1995-10-13 16:01:49 adam + * Work on relations. + * + * Revision 1.28 1995/10/13 12:26:43 adam + * Optimization of truncation. + * + * Revision 1.27 1995/10/12 17:07:22 adam + * Truncation works. + * + * Revision 1.26 1995/10/12 12:40:54 adam + * Bug fixes in rpn_prox. + * + * Revision 1.25 1995/10/10 13:59:24 adam + * Function rset_open changed its wflag parameter to general flags. + * + * Revision 1.24 1995/10/09 16:18:37 adam + * Function dict_lookup_grep got extra client data parameter. + * + * Revision 1.23 1995/10/06 16:33:37 adam + * Use attribute mappings. + * + * 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 + * Use attribute actually used in search requests. + * + * Revision 1.15 1995/10/02 15:18:52 adam + * New member in recRetrieveCtrl: diagnostic. + * + * Revision 1.14 1995/09/28 12:10:32 adam + * Bug fixes. Field prefix used in queries. + * + * Revision 1.13 1995/09/18 14:17:50 adam + * Minor changes. + * + * Revision 1.12 1995/09/15 14:45:21 adam + * Retrieve control. + * Work on truncation. + * + * Revision 1.11 1995/09/14 11:53:27 adam + * First work on regular expressions/truncations. + * + * Revision 1.10 1995/09/11 15:23:26 adam * More work on relevance search. * * Revision 1.9 1995/09/11 13:09:35 adam @@ -45,6 +103,7 @@ #include #include "zserver.h" +#include #include #include @@ -52,26 +111,568 @@ #include #include -int split_term (ZServerInfo *zi, Z_Term *term, ISAM_P **isam_ps, int *no) +int index_word_prefix_map (char *string, oid_value attrSet, int attrUse) { - static ISAM_P isam_p[16]; - int isam_p_indx = 0; - char termz[IT_MAX_WORD+1]; - char term_sub[IT_MAX_WORD+1]; - int sizez, i; - char *p0, *p1; - const char *info; - - if (term->which != Z_Term_general) - return 0; + attent *attp; + + logf (LOG_DEBUG, "oid_value attrSet = %d, attrUse = %d", attrSet, attrUse); + attp = att_getentbyatt (attrSet, attrUse); + if (!attp) + return -1; + logf (LOG_DEBUG, "ord=%d", attp->attset_ordinal); + return index_word_prefix (string, attp->attset_ordinal, + attp->local_attribute); +} + +/* + * attr_print: log attributes + */ +static void attr_print (Z_AttributesPlusTerm *t) +{ + int of, i; + for (of = 0; of < t->num_attributes; of++) + { + Z_AttributeElement *element; + element = t->attributeList[of]; + + switch (element->which) + { + case Z_AttributeValue_numeric: + logf (LOG_DEBUG, "attributeType=%d value=%d", + *element->attributeType, + *element->value.numeric); + break; + case Z_AttributeValue_complex: + logf (LOG_DEBUG, "attributeType=%d complex", + *element->attributeType); + for (i = 0; ivalue.complex->num_list; i++) + { + if (element->value.complex->list[i]->which == + Z_StringOrNumeric_string) + logf (LOG_DEBUG, " string: '%s'", + element->value.complex->list[i]->u.string); + else if (element->value.complex->list[i]->which == + Z_StringOrNumeric_numeric) + logf (LOG_DEBUG, " numeric: '%d'", + *element->value.complex->list[i]->u.numeric); + } + break; + default: + assert (0); + } + } +} + +typedef struct { + int type; + int major; + int minor; + Z_AttributesPlusTerm *zapt; +} AttrType; + +static int attr_find (AttrType *src, oid_value *attributeSetP) +{ + while (src->major < src->zapt->num_attributes) + { + Z_AttributeElement *element; + + element = src->zapt->attributeList[src->major]; + if (src->type == *element->attributeType) + { + switch (element->which) + { + case Z_AttributeValue_numeric: + ++(src->major); + if (element->attributeSet && attributeSetP) + { + oident *attrset; + + attrset = oid_getentbyoid (element->attributeSet); + *attributeSetP = attrset->value; + } + return *element->value.numeric; + break; + case Z_AttributeValue_complex: + if (src->minor >= element->value.complex->num_list || + element->value.complex->list[src->minor]->which != + Z_StringOrNumeric_numeric) + break; + ++(src->minor); + if (element->attributeSet && attributeSetP) + { + oident *attrset; + + attrset = oid_getentbyoid (element->attributeSet); + *attributeSetP = attrset->value; + } + return *element->value.complex->list[src->minor-1]->u.numeric; + default: + assert (0); + } + } + ++(src->major); + } + return -1; +} + +static void attr_init (AttrType *src, Z_AttributesPlusTerm *zapt, + int type) +{ + src->zapt = zapt; + src->type = type; + src->major = 0; + src->minor = 0; +} + +struct trunc_info { + int *ptr; + int *indx; + char **heap; + int heapnum; + int (*cmp)(const void *p1, const void *p2); + int keysize; + char *swapbuf; + char *tmpbuf; + char *buf; +}; + +static void heap_swap (struct trunc_info *ti, int i1, int i2) +{ + int swap; + + swap = ti->ptr[i1]; + ti->ptr[i1] = ti->ptr[i2]; + ti->ptr[i2] = swap; +} + +static void heap_delete (struct trunc_info *ti) +{ + int cur = 1, child = 2; + + heap_swap (ti, 1, ti->heapnum--); + while (child <= ti->heapnum) { + if (child < ti->heapnum && + (*ti->cmp)(ti->heap[ti->ptr[child]], + ti->heap[ti->ptr[1+child]]) > 0) + child++; + if ((*ti->cmp)(ti->heap[ti->ptr[cur]], + ti->heap[ti->ptr[child]]) > 0) + { + heap_swap (ti, cur, child); + cur = child; + child = 2*cur; + } + else + break; + } +} + +static void heap_insert (struct trunc_info *ti, const char *buf, int indx) +{ + int cur, parent; + + cur = ++(ti->heapnum); + memcpy (ti->heap[ti->ptr[cur]], buf, ti->keysize); + ti->indx[ti->ptr[cur]] = indx; + parent = cur/2; + while (parent && (*ti->cmp)(ti->heap[ti->ptr[parent]], + ti->heap[ti->ptr[cur]]) > 0) + { + heap_swap (ti, cur, parent); + cur = parent; + parent = cur/2; + } +} + +static +struct trunc_info *heap_init (int size, int key_size, + int (*cmp)(const void *p1, const void *p2)) +{ + struct trunc_info *ti = xmalloc (sizeof(*ti)); + int i; + + ++size; + ti->heapnum = 0; + ti->keysize = key_size; + ti->cmp = cmp; + ti->indx = xmalloc (size * sizeof(*ti->indx)); + ti->heap = xmalloc (size * sizeof(*ti->heap)); + ti->ptr = xmalloc (size * sizeof(*ti->ptr)); + ti->swapbuf = xmalloc (ti->keysize); + ti->tmpbuf = xmalloc (ti->keysize); + ti->buf = xmalloc (size * ti->keysize); + for (i = size; --i >= 0; ) + { + ti->ptr[i] = i; + ti->heap[i] = ti->buf + ti->keysize * i; + } + return ti; +} + +static void heap_close (struct trunc_info *ti) +{ + xfree (ti->ptr); + xfree (ti->indx); + xfree (ti->heap); + xfree (ti->swapbuf); + xfree (ti->tmpbuf); + xfree (ti); +} + +static RSET rset_trunc_r (ISAM isam, ISAM_P *isam_p, int from, int to, + int merge_chunk) +{ + RSET result; + RSFD result_rsfd; + rset_temp_parms parms; + + parms.key_size = sizeof(struct it_key); + result = rset_create (rset_kind_temp, &parms); + result_rsfd = rset_open (result, RSETF_WRITE|RSETF_SORT_SYSNO); + + if (to - from > merge_chunk) + { + RSFD *rsfd; + RSET *rset; + int i, i_add = (to-from)/merge_chunk + 1; + struct trunc_info *ti; + int rscur = 0; + int rsmax = (to-from)/i_add + 1; + + rset = xmalloc (sizeof(*rset) * rsmax); + rsfd = xmalloc (sizeof(*rsfd) * rsmax); + + for (i = from; i < to; i += i_add) + { + if (i_add <= to - i) + rset[rscur] = rset_trunc_r (isam, isam_p, i, i+i_add, + merge_chunk); + else + rset[rscur] = rset_trunc_r (isam, isam_p, i, to, + merge_chunk); + rscur++; + } + ti = heap_init (rscur, sizeof(struct it_key), key_compare); + for (i = rscur; --i >= 0; ) + { + rsfd[i] = rset_open (rset[i], RSETF_READ|RSETF_SORT_SYSNO); + if (rset_read (rset[i], rsfd[i], ti->tmpbuf)) + heap_insert (ti, ti->tmpbuf, i); + else + { + rset_close (rset[i], rsfd[i]); + rset_delete (rset[i]); + } + } + while (ti->heapnum) + { + int n = ti->indx[ti->ptr[1]]; + + rset_write (result, result_rsfd, ti->heap[ti->ptr[1]]); + + while (1) + { + if (!rset_read (rset[n], rsfd[n], ti->tmpbuf)) + { + heap_delete (ti); + rset_close (rset[n], rsfd[n]); + rset_delete (rset[n]); + break; + } + if ((*ti->cmp)(ti->tmpbuf, ti->heap[ti->ptr[1]]) > 1) + { + heap_delete (ti); + heap_insert (ti, ti->tmpbuf, n); + break; + } + } + } + xfree (rset); + xfree (rsfd); + heap_close (ti); + } + else + { + ISPT *ispt; + int i; + struct trunc_info *ti; + + ispt = xmalloc (sizeof(*ispt) * (to-from)); + + ti = heap_init (to-from, sizeof(struct it_key), + key_compare); + for (i = to-from; --i >= 0; ) + { + ispt[i] = is_position (isam, isam_p[from+i]); + if (is_readkey (ispt[i], ti->tmpbuf)) + heap_insert (ti, ti->tmpbuf, i); + else + is_pt_free (ispt[i]); + } + while (ti->heapnum) + { + int n = ti->indx[ti->ptr[1]]; + + rset_write (result, result_rsfd, ti->heap[ti->ptr[1]]); +#if 0 + heap_delete (ti); + if (is_readkey (ispt[n], ti->tmpbuf)) + heap_insert (ti, ti->tmpbuf, n); + else + is_pt_free (ispt[n]); +#else + while (1) + { + if (!is_readkey (ispt[n], ti->tmpbuf)) + { + heap_delete (ti); + is_pt_free (ispt[n]); + break; + } + if ((*ti->cmp)(ti->tmpbuf, ti->heap[ti->ptr[1]]) > 1) + { + heap_delete (ti); + heap_insert (ti, ti->tmpbuf, n); + break; + } + } +#endif + } + heap_close (ti); + xfree (ispt); + } + rset_close (result, result_rsfd); + return result; +} + +static int isam_trunc_cmp (const void *p1, const void *p2) +{ + ISAM_P i1 = *(ISAM_P*) p1; + ISAM_P i2 = *(ISAM_P*) p2; + int d; + + d = is_type (i1) - is_type (i2); + if (d) + return d; + return is_block (i1) - is_block (i2); +} + +static RSET rset_trunc (ISAM isam, ISAM_P *isam_p, int no) +{ + + qsort (isam_p, no, sizeof(*isam_p), isam_trunc_cmp); + return rset_trunc_r (isam, isam_p, 0, no, 100); +} + +struct grep_info { + ISAM_P *isam_p_buf; + int isam_p_size; + int isam_p_indx; +}; + +static void add_isam_p (const char *info, struct grep_info *p) +{ + if (p->isam_p_indx == p->isam_p_size) + { + ISAM_P *new_isam_p_buf; + + p->isam_p_size = 2*p->isam_p_size + 100; + new_isam_p_buf = xmalloc (sizeof(*new_isam_p_buf) * + p->isam_p_size); + if (p->isam_p_buf) + { + memcpy (new_isam_p_buf, p->isam_p_buf, + p->isam_p_indx * sizeof(*p->isam_p_buf)); + xfree (p->isam_p_buf); + } + p->isam_p_buf = new_isam_p_buf; + } + assert (*info == sizeof(*p->isam_p_buf)); + memcpy (p->isam_p_buf + p->isam_p_indx, info+1, sizeof(*p->isam_p_buf)); + (p->isam_p_indx)++; +} + +static int grep_handle (Dict_char *name, const char *info, void *p) +{ + logf (LOG_DEBUG, "dict name: %s", name); + add_isam_p (info, p); + return 0; +} + +static void gen_regular_ge (char *dst, int val) +{ + int dst_p = 0; + int w = 1; + int d; + int pos = 0; + int i; + + if (val < 0) + val = 0; + while ((d=(val % (w*10))/w)) + { + sprintf (dst + dst_p, "%d", val); + + dst_p = strlen(dst) - pos - 1; + + dst[dst_p++] = '['; + dst[dst_p++] = d +'1'; + dst[dst_p++] = '-'; + dst[dst_p++] = '9'; + dst[dst_p++] = ']'; + + for (i = 0; ierrCode = 114; + return -1; + } + switch (relation_value) + { + case 1: + case 2: + break; + case 4: + logf (LOG_LOG, "Relation ge"); + gen_regular_ge (term_dict + strlen(term_dict), atoi(term_sub)); + logf (LOG_LOG, "dict_lookup_grep: %s", term_dict); + dict_lookup_grep (zi->wordDict, term_dict, 0, grep_info, grep_handle); + logf (LOG_LOG, "%d positions", grep_info->isam_p_indx); + return 0; + case 5: + logf (LOG_LOG, "Relation gt"); + gen_regular_ge (term_dict + strlen(term_dict), atoi(term_sub)+1); + logf (LOG_LOG, "dict_lookup_grep: %s", term_dict); + dict_lookup_grep (zi->wordDict, term_dict, 0, grep_info, grep_handle); + logf (LOG_LOG, "%d positions", grep_info->isam_p_indx); + return 0; + } + switch (truncation_value) + { + case -1: /* not specified */ + case 100: /* do not truncate */ + strcat (term_dict, term_sub); + logf (LOG_DEBUG, "dict_lookup: %s", term_dict); + if ((info = dict_lookup (zi->wordDict, term_dict))) + add_isam_p (info, grep_info); + break; + case 1: /* right truncation */ + strcat (term_dict, term_sub); + strcat (term_dict, ".*"); + dict_lookup_grep (zi->wordDict, term_dict, 0, grep_info, grep_handle); + break; + case 2: /* left truncation */ + case 3: /* left&right truncation */ + zi->errCode = 120; + return -1; + case 101: /* process # in term */ + for (j = strlen(term_dict), i = 0; term_sub[i] && i < 2; i++) + term_dict[j++] = term_sub[i]; + for (; term_sub[i]; i++) + if (term_sub[i] == '#') + { + term_dict[j++] = '.'; + term_dict[j++] = '*'; + } + else + term_dict[j++] = term_sub[i]; + term_dict[j] = '\0'; + dict_lookup_grep (zi->wordDict, term_dict, 0, grep_info, grep_handle); + break; + case 102: /* regular expression */ + strcat (term_dict, term_sub); + dict_lookup_grep (zi->wordDict, term_dict, 0, grep_info, grep_handle); + break; + } + logf (LOG_LOG, "%d positions", grep_info->isam_p_indx); + return 0; +} + +static void trans_term (ZServerInfo *zi, Z_AttributesPlusTerm *zapt, + char *termz) +{ + size_t i, sizez; + Z_Term *term = zapt->term; + sizez = term->u.general->len; if (sizez > IT_MAX_WORD) sizez = IT_MAX_WORD; - for (i = 0; iu.general->buf[i]); termz[i] = '\0'; +} + +static RSET rpn_search_APT_relevance (ZServerInfo *zi, + Z_AttributesPlusTerm *zapt, + oid_value attributeSet) +{ + rset_relevance_parms parms; + char termz[IT_MAX_WORD+1]; + char term_sub[IT_MAX_WORD+1]; + struct grep_info grep_info; + char *p0 = termz, *p1 = NULL; + RSET result; + + parms.key_size = sizeof(struct it_key); + parms.max_rec = 100; + parms.cmp = key_compare; + parms.is = zi->wordIsam; - p0 = termz; + if (zapt->term->which != Z_Term_general) + { + zi->errCode = 124; + return NULL; + } + trans_term (zi, zapt, termz); + grep_info.isam_p_indx = 0; + grep_info.isam_p_size = 0; + grep_info.isam_p_buf = NULL; while (1) { if ((p1 = strchr (p0, ' '))) @@ -81,70 +682,301 @@ int split_term (ZServerInfo *zi, Z_Term *term, ISAM_P **isam_ps, int *no) } else strcpy (term_sub, p0); - logf (LOG_DEBUG, "dict_lookup: %s", term_sub); - if ((info = dict_lookup (zi->wordDict, term_sub))) - { - logf (LOG_DEBUG, " found"); - assert (*info == sizeof(*isam_p)); - memcpy (isam_p + isam_p_indx, info+1, sizeof(*isam_p)); - isam_p_indx++; - } + if (trunc_term (zi, zapt, term_sub, attributeSet, &grep_info)) + return NULL; if (!p1) break; - p0 = p1+1; - } - *isam_ps = isam_p; - *no = isam_p_indx; - logf (LOG_DEBUG, "%d positions", *no); - return 1; + p0 = p1; + while (*++p0 == ' ') + ; + } + parms.isam_positions = grep_info.isam_p_buf; + parms.no_isam_positions = grep_info.isam_p_indx; + if (grep_info.isam_p_indx > 0) + result = rset_create (rset_kind_relevance, &parms); + else + result = rset_create (rset_kind_null, NULL); + xfree (grep_info.isam_p_buf); + return result; } -static RSET rpn_search_APT_relevance (ZServerInfo *zi, - Z_AttributesPlusTerm *zapt) +static RSET rpn_search_APT_word (ZServerInfo *zi, + Z_AttributesPlusTerm *zapt, + oid_value attributeSet) { - rset_relevance_parms parms; + rset_isam_parms parms; + char termz[IT_MAX_WORD+1]; + struct grep_info grep_info; + RSET result; - parms.key_size = sizeof(struct it_key); - parms.max_rec = 10; - parms.cmp = key_compare; - parms.is = zi->wordIsam; - split_term (zi, zapt->term, &parms.isam_positions, - &parms.no_isam_positions); - if (parms.no_isam_positions > 0) - return rset_create (rset_kind_relevance, &parms); + if (zapt->term->which != Z_Term_general) + { + zi->errCode = 124; + return NULL; + } + trans_term (zi, zapt, termz); + + grep_info.isam_p_indx = 0; + grep_info.isam_p_size = 0; + grep_info.isam_p_buf = NULL; + + if (trunc_term (zi, zapt, termz, attributeSet, &grep_info)) + return NULL; + if (grep_info.isam_p_indx < 1) + result = rset_create (rset_kind_null, NULL); + else if (grep_info.isam_p_indx == 1) + { + parms.is = zi->wordIsam; + parms.pos = *grep_info.isam_p_buf; + result = rset_create (rset_kind_isam, &parms); + } else - return rset_create (rset_kind_null, NULL); + result = rset_trunc (zi->wordIsam, grep_info.isam_p_buf, + grep_info.isam_p_indx); + xfree (grep_info.isam_p_buf); + return result; } -static RSET rpn_search_APT (ZServerInfo *zi, Z_AttributesPlusTerm *zapt) +static RSET rpn_prox (RSET *rset, int rset_no) { -#if 0 - Z_Term *term = zapt->term; - char termz[IT_MAX_WORD+1]; - size_t sizez; - struct rset_isam_parms parms; - const char *info; int i; + RSFD *rsfd; + int *more; + struct it_key **buf; + RSFD rsfd_result; + RSET result; + rset_temp_parms parms; + + rsfd = xmalloc (sizeof(*rsfd)*rset_no); + more = xmalloc (sizeof(*more)*rset_no); + buf = xmalloc (sizeof(*buf)*rset_no); - if (term->which != Z_Term_general) - return NULL; - sizez = term->u.general->len; - if (sizez > IT_MAX_WORD) - sizez = IT_MAX_WORD; - for (i = 0; iu.general->buf[i]); - termz[i] = '\0'; - logf (LOG_DEBUG, "dict_lookup: %s", termz); - if (!(info = dict_lookup (zi->wordDict, termz))) + for (i = 0; i= 0) + { + rset_close (rset[i], rsfd[i]); + xfree (buf[i]); + --i; + } + xfree (rsfd); + xfree (more); + xfree (buf); + return rset_create (rset_kind_null, NULL); + } + } + parms.key_size = sizeof (struct it_key); + result = rset_create (rset_kind_temp, &parms); + rsfd_result = rset_open (result, RSETF_WRITE|RSETF_SORT_SYSNO); + + while (*more) + { + for (i = 1; i 1) + { + more[i-1] = rset_read (rset[i-1], rsfd[i-1], buf[i-1]); + 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]); + break; + } + } + else + { + more[i] = rset_read (rset[i], rsfd[i], buf[i]); + break; + } + } + if (i == rset_no) + { + rset_write (result, rsfd_result, buf[0]); + more[0] = rset_read (*rset, *rsfd, *buf); + } + } + + for (i = 0; iterm->which != Z_Term_general) + { + zi->errCode = 124; + return NULL; + } + trans_term (zi, zapt, termz); + + grep_info.isam_p_size = 0; + grep_info.isam_p_buf = NULL; + + while (1) + { + if ((p1 = strchr (p0, ' '))) + { + memcpy (term_sub, p0, p1-p0); + term_sub[p1-p0] = '\0'; + } + else + strcpy (term_sub, p0); + + grep_info.isam_p_indx = 0; + if (trunc_term (zi, zapt, term_sub, attributeSet, &grep_info)) + return NULL; + if (grep_info.isam_p_indx == 0) + rset[rset_no] = rset_create (rset_kind_null, NULL); + else if (grep_info.isam_p_indx > 1) + rset[rset_no] = rset_trunc (zi->wordIsam, + grep_info.isam_p_buf, + grep_info.isam_p_indx); + else + { + rset_isam_parms parms; + + parms.is = zi->wordIsam; + parms.pos = *grep_info.isam_p_buf; + rset[rset_no] = rset_create (rset_kind_isam, &parms); + } + assert (rset[rset_no]); + if (++rset_no >= sizeof(rset)/sizeof(*rset)) + break; + if (!p1) + break; + p0 = p1; + while (*++p0 == ' ') + ; + } + xfree (grep_info.isam_p_buf); + if (rset_no == 0) return rset_create (rset_kind_null, NULL); - assert (*info == sizeof(parms.pos)); - memcpy (&parms.pos, info+1, sizeof(parms.pos)); - parms.is = zi->wordIsam; - logf (LOG_DEBUG, "rset_create isam"); - return rset_create (rset_kind_isam, &parms); -#else - return rpn_search_APT_relevance (zi, zapt); -#endif + else if (rset_no == 1) + return (rset[0]); + + result = rpn_prox (rset, rset_no); + for (i = 0; iterm->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, RSETF_WRITE|RSETF_SORT_SYSNO); + + 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, + oid_value attributeSet) +{ + AttrType relation; + AttrType structure; + int relation_value, structure_value; + + attr_init (&relation, zapt, 2); + attr_init (&structure, zapt, 4); + + relation_value = attr_find (&relation, NULL); + structure_value = attr_find (&structure, NULL); + switch (structure_value) + { + case -1: + if (relation_value == 102) /* relevance relation */ + return rpn_search_APT_relevance (zi, zapt, attributeSet); + return rpn_search_APT_phrase (zi, zapt, attributeSet); + case 1: /* phrase */ + if (relation_value == 102) /* relevance relation */ + return rpn_search_APT_relevance (zi, zapt, attributeSet); + return rpn_search_APT_phrase (zi, zapt, attributeSet); + break; + case 2: /* word */ + if (relation_value == 102) /* relevance relation */ + return rpn_search_APT_relevance (zi, zapt, attributeSet); + return rpn_search_APT_word (zi, zapt, attributeSet); + case 3: /* key */ + break; + case 4: /* year */ + break; + case 5: /* date - normalized */ + break; + case 6: /* word list */ + return rpn_search_APT_relevance (zi, zapt, attributeSet); + case 100: /* date - un-normalized */ + break; + case 101: /* name - normalized */ + break; + case 102: /* date - un-normalized */ + break; + case 103: /* structure */ + break; + case 104: /* urx */ + break; + case 105: /* free-form-text */ + return rpn_search_APT_relevance (zi, zapt, attributeSet); + case 106: /* document-text */ + return rpn_search_APT_relevance (zi, zapt, attributeSet); + case 107: /* local-number */ + return rpn_search_APT_local (zi, zapt, attributeSet); + case 108: /* string */ + return rpn_search_APT_word (zi, zapt, attributeSet); + case 109: /* numeric string */ + break; + } + zi->errCode = 118; + return NULL; } static RSET rpn_search_ref (ZServerInfo *zi, Z_ResultSetId *resultSetId) @@ -156,15 +988,25 @@ static RSET rpn_search_ref (ZServerInfo *zi, Z_ResultSetId *resultSetId) return s->rset; } -static RSET rpn_search_structure (ZServerInfo *zi, Z_RPNStructure *zs) +static RSET rpn_search_structure (ZServerInfo *zi, Z_RPNStructure *zs, + oid_value attributeSet) { RSET r = NULL; if (zs->which == Z_RPNStructure_complex) { rset_bool_parms bool_parms; - bool_parms.rset_l = rpn_search_structure (zi, zs->u.complex->s1); - bool_parms.rset_r = rpn_search_structure (zi, zs->u.complex->s2); + bool_parms.rset_l = rpn_search_structure (zi, zs->u.complex->s1, + attributeSet); + if (bool_parms.rset_l == NULL) + return NULL; + bool_parms.rset_r = rpn_search_structure (zi, zs->u.complex->s2, + attributeSet); + if (bool_parms.rset_r == NULL) + { + rset_delete (bool_parms.rset_l); + return NULL; + } bool_parms.key_size = sizeof(struct it_key); bool_parms.cmp = key_compare; @@ -188,7 +1030,8 @@ static RSET rpn_search_structure (ZServerInfo *zi, Z_RPNStructure *zs) if (zs->u.simple->which == Z_Operand_APT) { logf (LOG_DEBUG, "rpn_search_APT"); - r = rpn_search_APT (zi, zs->u.simple->u.attributesPlusTerm); + r = rpn_search_APT (zi, zs->u.simple->u.attributesPlusTerm, + attributeSet); } else if (zs->u.simple->which == Z_Operand_resultSetId) { @@ -207,25 +1050,15 @@ static RSET rpn_search_structure (ZServerInfo *zi, Z_RPNStructure *zs) return r; } -static RSET rpn_save_set (RSET r, int *count) +static void count_set (RSET r, int *count) { -#if 0 - RSET d; - rset_temp_parms parms; -#endif int psysno = 0; struct it_key key; RSFD rfd; logf (LOG_DEBUG, "rpn_save_set"); *count = 0; -#if 0 - parms.key_size = sizeof(struct it_key); - d = rset_create (rset_kind_temp, &parms); - rset_open (d, 1); -#endif - - rfd = rset_open (r, 0); + rfd = rset_open (r, RSETF_READ|RSETF_SORT_SYSNO); while (rset_read (r, rfd, &key)) { if (key.sysno != psysno) @@ -233,35 +1066,148 @@ static RSET rpn_save_set (RSET r, int *count) psysno = key.sysno; (*count)++; } -#if 0 - rset_write (d, &key); -#endif } rset_close (r, rfd); -#if 0 - rset_close (d); -#endif logf (LOG_DEBUG, "%d distinct sysnos", *count); -#if 0 - return d; -#endif } int rpn_search (ZServerInfo *zi, Z_RPNQuery *rpn, int num_bases, char **basenames, const char *setname, int *hits) { - RSET rset, result_rset; + RSET rset; + oident *attrset; + oid_value attributeSet; - rset = rpn_search_structure (zi, rpn->RPNStructure); + zi->errCode = 0; + zi->errString = NULL; + + attrset = oid_getentbyoid (rpn->attributeSetId); + attributeSet = attrset->value; + + rset = rpn_search_structure (zi, rpn->RPNStructure, attributeSet); if (!rset) - return 0; - result_rset = rpn_save_set (rset, hits); -#if 0 - rset_delete (result_rset); + 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; +} + +struct scan_info { + struct scan_entry *list; + ODR odr; + int before, after; + ISAM isam; + char prefix[20]; +}; + +static int scan_handle (Dict_char *name, const char *info, int pos, + void *client) +{ + int len_prefix, idx; + ISAM_P isam_p; + RSET rset; + struct scan_info *scan_info = client; + + rset_isam_parms parms; + + len_prefix = strlen(scan_info->prefix); + if (memcmp (name, scan_info->prefix, len_prefix)) + return 1; + if (pos > 0) + idx = scan_info->after - pos + scan_info->before; + else + idx = - pos - 1; + scan_info->list[idx].term = odr_malloc (scan_info->odr, + strlen(name + len_prefix)+1); + strcpy (scan_info->list[idx].term, name + len_prefix); + assert (*info == sizeof(isam_p)); + memcpy (&isam_p, info+1, sizeof(isam_p)); + parms.is = scan_info->isam; + parms.pos = isam_p; +#if 1 + rset = rset_create (rset_kind_isam, &parms); + count_set (rset, &scan_info->list[idx].occurrences); + rset_delete (rset); +#else + scan_info->list[idx].occurrences = 1; #endif + logf (LOG_DEBUG, "pos=%3d idx=%3d name=%s", pos, idx, name); + return 0; +} - resultSetAdd (zi, setname, 1, rset); +int rpn_scan (ZServerInfo *zi, ODR odr, Z_AttributesPlusTerm *zapt, + int *position, int *num_entries, struct scan_entry **list, + int *status) +{ + 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; + struct scan_info scan_info; + + logf (LOG_DEBUG, "scan, position = %d, num = %d", pos, num); + scan_info.before = before = pos-1; + scan_info.after = after = 1+num-pos; + scan_info.odr = odr; + + logf (LOG_DEBUG, "scan, before = %d, after = %d", before, after); + + scan_info.isam = zi->wordIsam; + scan_info.list = odr_malloc (odr, (before+after)*sizeof(*scan_info.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_info, scan_handle); + + *status = BEND_SCAN_SUCCESS; + + for (i = 0; ierrCode = 114; /* if no entries was found */ + logf (LOG_DEBUG, "position = %d, num_entries = %d", + *position, *num_entries); + if (zi->errCode) + logf (LOG_DEBUG, "scan error: %d", zi->errCode); return 0; } + +