X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzrpn.c;h=9f27ad587e65993245003e22ab2b5ae88c8e3ee6;hb=9ee84acdcad18fe55bced224f47e57eb057923f1;hp=9d12e038b4fde488c00192422cb528615e16222b;hpb=7e928bc31abe214023a0fc61d77b092f4ee9ba7e;p=idzebra-moved-to-github.git

diff --git a/index/zrpn.c b/index/zrpn.c
index 9d12e03..9f27ad5 100644
--- a/index/zrpn.c
+++ b/index/zrpn.c
@@ -4,7 +4,31 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zrpn.c,v $
- * Revision 1.17  1995-10-04 12:55:17  adam
+ * 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
@@ -67,6 +91,7 @@
 #include <unistd.h>
 
 #include "zserver.h"
+#include <attribute.h>
 
 #include <rsisam.h>
 #include <rstemp.h>
@@ -74,6 +99,19 @@
 #include <rsbool.h>
 #include <rsrel.h>
 
+int index_word_prefix_map (char *string, oid_value attrSet, int attrUse)
+{
+    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
  */
@@ -120,19 +158,26 @@ typedef struct {
     Z_AttributesPlusTerm *zapt;
 } AttrType;
 
-static int attr_find (AttrType *src)
+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];
 
+        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:
@@ -141,6 +186,13 @@ static int attr_find (AttrType *src)
                     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);
@@ -272,7 +324,7 @@ static RSET rset_trunc (ISAM isam, ISAM_P *isam_p, int from, int to,
         ispt = xmalloc (sizeof(*ispt) * (to-from));
         parms.key_size = sizeof (struct it_key);
         result = rset_create (rset_kind_temp, &parms);
-        rsfd = rset_open (result, 1);
+        rsfd = rset_open (result, RSETF_WRITE|RSETF_SORT_SYSNO);
 
         ti = heap_init (to-from, sizeof(struct it_key),
                         key_compare);
@@ -300,41 +352,44 @@ static RSET rset_trunc (ISAM isam, ISAM_P *isam_p, int from, int to,
     }
 }
 
-static ISAM_P *isam_p_buf = NULL;
-static int isam_p_size = 0;
-static int isam_p_indx;
+struct grep_info {
+    ISAM_P *isam_p_buf;
+    int isam_p_size;
+    int isam_p_indx;
+};
 
-static void add_isam_p (const char *info)
+static void add_isam_p (const char *info, struct grep_info *p)
 {
-    if (isam_p_indx == isam_p_size)
+    if (p->isam_p_indx == p->isam_p_size)
     {
         ISAM_P *new_isam_p_buf;
         
-        isam_p_size = 2*isam_p_size + 100;
+        p->isam_p_size = 2*p->isam_p_size + 100;
         new_isam_p_buf = xmalloc (sizeof(*new_isam_p_buf) *
-                                  isam_p_size);
-        if (isam_p_buf)
+                                  p->isam_p_size);
+        if (p->isam_p_buf)
         {
-            memcpy (new_isam_p_buf, isam_p_buf,
-                    isam_p_indx * sizeof(*isam_p_buf));
-            xfree (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);
         }
-        isam_p_buf = new_isam_p_buf;
+        p->isam_p_buf = new_isam_p_buf;
     }
-    assert (*info == sizeof(*isam_p_buf));
-    memcpy (isam_p_buf + isam_p_indx, info+1, sizeof(*isam_p_buf));
-    isam_p_indx++;
+    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)
+static int grep_handle (Dict_char *name, const char *info, void *p)
 {
     logf (LOG_DEBUG, "dict name: %s", name);
-    add_isam_p (info);
+    add_isam_p (info, p);
     return 0;
 }
 
 static int trunc_term (ZServerInfo *zi, Z_AttributesPlusTerm *zapt,
-                       const char *term_sub, ISAM_P **isam_ps)
+                       const char *term_sub,
+                       oid_value attributeSet, struct grep_info *grep_info)
 {
     char term_dict[2*IT_MAX_WORD+2];
     int i, j;
@@ -343,18 +398,24 @@ static int trunc_term (ZServerInfo *zi, Z_AttributesPlusTerm *zapt,
     int truncation_value;
     AttrType use;
     int use_value;
+    oid_value curAttributeSet = attributeSet;
 
     attr_init (&use, zapt, 1);
-    use_value = attr_find (&use);
-    logf (LOG_DEBUG, "use value %d", truncation_value);
+    use_value = attr_find (&use, &curAttributeSet);
+    logf (LOG_DEBUG, "use value %d", use_value);
     attr_init (&truncation, zapt, 5);
-    truncation_value = attr_find (&truncation);
+    truncation_value = attr_find (&truncation, NULL);
     logf (LOG_DEBUG, "truncation value %d", truncation_value);
 
     if (use_value == -1)
         use_value = 1016;
-    i = index_word_prefix (term_dict, 1, use_value);
-
+    i = index_word_prefix_map (term_dict, curAttributeSet, use_value);
+    if (i < 0)
+    {
+        zi->errCode = 114;
+        return -1;
+    }
+    
     switch (truncation_value)
     {
     case -1:         /* not specified */
@@ -362,12 +423,12 @@ static int trunc_term (ZServerInfo *zi, Z_AttributesPlusTerm *zapt,
         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);
+            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_handle);
+        dict_lookup_grep (zi->wordDict, term_dict, 0, grep_info, grep_handle);
         break;
     case 2:          /* left truncation */
     case 3:          /* left&right truncation */
@@ -385,41 +446,17 @@ static int trunc_term (ZServerInfo *zi, Z_AttributesPlusTerm *zapt,
             else
                 term_dict[j++] = term_sub[i];
         term_dict[j] = '\0';
-        dict_lookup_grep (zi->wordDict, term_dict, 0, grep_handle);
+        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_handle);
+        dict_lookup_grep (zi->wordDict, term_dict, 0, grep_info, grep_handle);
         break;
     }
-    *isam_ps = isam_p_buf;
-    logf (LOG_DEBUG, "%d positions", isam_p_indx);
+    logf (LOG_DEBUG, "%d positions", grep_info->isam_p_indx);
     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,29 +470,32 @@ 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)
+                                      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;
-    Z_Term *term = zapt->term;
+    RSET result;
 
     parms.key_size = sizeof(struct it_key);
     parms.max_rec = 100;
     parms.cmp = key_compare;
     parms.is = zi->wordIsam;
 
-    if (term->which != Z_Term_general)
+    if (zapt->term->which != Z_Term_general)
     {
         zi->errCode = 124;
         return NULL;
     }
     trans_term (zi, zapt, termz);
-    isam_p_indx = 0;  /* global, set by trunc_term - see below */
+    grep_info.isam_p_indx = 0;
+    grep_info.isam_p_size = 0;
+    grep_info.isam_p_buf = NULL;
     while (1)
     {
         if ((p1 = strchr (p0, ' ')))
@@ -465,75 +505,235 @@ static RSET rpn_search_APT_relevance (ZServerInfo *zi,
         }
         else
             strcpy (term_sub, p0);
-        if (trunc_term (zi, zapt, term_sub, &parms.isam_positions))
+        if (trunc_term (zi, zapt, term_sub, attributeSet, &grep_info))
             return NULL;
         if (!p1)
             break;
-        p0 = p1+1;
+        p0 = p1;
+        while (*++p0 == ' ')
+            ;
     }
-    parms.no_isam_positions = isam_p_indx;
-    if (isam_p_indx > 0)
-        return rset_create (rset_kind_relevance, &parms);
+    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
-        return rset_create (rset_kind_null, NULL);
+        result = rset_create (rset_kind_null, NULL);
+    xfree (grep_info.isam_p_buf);
+    return result;
 }
 
 static RSET rpn_search_APT_word (ZServerInfo *zi,
-                                 Z_AttributesPlusTerm *zapt)
+                                 Z_AttributesPlusTerm *zapt,
+                                 oid_value attributeSet)
 {
-    ISAM_P *isam_positions;
     rset_isam_parms parms;
-
     char termz[IT_MAX_WORD+1];
-    Z_Term *term = zapt->term;
+    struct grep_info grep_info;
+    RSET result;
 
-    if (term->which != Z_Term_general)
+    if (zapt->term->which != Z_Term_general)
     {
         zi->errCode = 124;
         return NULL;
     }
     trans_term (zi, zapt, termz);
-    isam_p_indx = 0;  /* global, set by trunc_term - see below */
-    if (trunc_term (zi, zapt, termz, &isam_positions))
+
+    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 (isam_p_indx < 1)
-        return rset_create (rset_kind_null, NULL);
-    else if (isam_p_indx == 1)
+    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 = *isam_positions;
-        return rset_create (rset_kind_isam, &parms);
+        parms.pos = *grep_info.isam_p_buf;
+        result = rset_create (rset_kind_isam, &parms);
     }
     else
-        return rset_trunc (zi->wordIsam, isam_positions, 0, isam_p_indx, 400);
+        result = rset_trunc (zi->wordIsam, grep_info.isam_p_buf, 0,
+                             grep_info.isam_p_indx, 400);
+    xfree (grep_info.isam_p_buf);
+    return result;
 }
 
-static RSET rpn_search_APT_phrase (ZServerInfo *zi,
-                                   Z_AttributesPlusTerm *zapt)
+static RSET rpn_prox (RSET *rset, int rset_no)
 {
-    ISAM_P *isam_positions;
-    rset_isam_parms parms;
+    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);
+    
+    for (i = 0; i<rset_no; i++)
+    {
+        buf[i] = xmalloc (sizeof(**buf));
+        rsfd[i] = rset_open (rset[i], RSETF_READ|RSETF_SORT_SYSNO);
+        more[i] = rset_read (rset[i], rsfd[i], buf[i]);
+    }
+    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<rset_no; i++)
+        {
+            int cmp;
+            
+            if (!more[i])
+            {
+                *more = 0;
+                break;
+            }
+            cmp = key_compare (buf[i], buf[i-1]);
+            if (cmp > 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; i<rset_no; i++)
+    {
+        rset_close (rset[i], rsfd[i]);
+        xfree (buf[i]);
+    }
+    rset_close (result, rsfd_result);
+    xfree (buf);
+    xfree (more);
+    xfree (rsfd);
+    return result;
+}
 
+static RSET rpn_search_APT_phrase (ZServerInfo *zi,
+                                   Z_AttributesPlusTerm *zapt,
+                                   oid_value attributeSet)
+{
     char termz[IT_MAX_WORD+1];
-    Z_Term *term = zapt->term;
+    char term_sub[IT_MAX_WORD+1];
+    char *p0 = termz, *p1 = NULL;
+    RSET rset[60], result;
+    int i, rset_no = 0;
+    struct grep_info grep_info;
 
-    if (term->which != Z_Term_general)
+    if (zapt->term->which != Z_Term_general)
     {
         zi->errCode = 124;
         return NULL;
     }
     trans_term (zi, zapt, termz);
-    isam_p_indx = 0;  /* global, set by trunc_term - see below */
-    if (trunc_term (zi, zapt, termz, &isam_positions))
-        return NULL;
-    if (isam_p_indx != 1)
+
+    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)
+        {
+            if (grep_info.isam_p_indx > 1)
+                rset[rset_no] = rset_trunc (zi->wordIsam,
+                                            grep_info.isam_p_buf, 0,
+                                            grep_info.isam_p_indx, 400);
+            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);
+            }
+            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);
-    parms.is = zi->wordIsam;
-    parms.pos = *isam_positions;
-    return rset_create (rset_kind_isam, &parms);
+    else if (rset_no == 1)
+        return (rset[0]);
+
+    result = rpn_prox (rset, rset_no);
+    for (i = 0; i<rset_no; i++)
+        rset_delete (rset[i]);
+    return result;
+}
+
+static RSET rpn_search_APT_local (ZServerInfo *zi, Z_AttributesPlusTerm *zapt,
+                                  oid_value attributeSet)
+{
+    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, 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)
+
+static RSET rpn_search_APT (ZServerInfo *zi, Z_AttributesPlusTerm *zapt,
+                            oid_value attributeSet)
 {
     AttrType relation;
     AttrType structure;
@@ -542,23 +742,23 @@ static RSET rpn_search_APT (ZServerInfo *zi, Z_AttributesPlusTerm *zapt)
     attr_init (&relation, zapt, 2);
     attr_init (&structure, zapt, 4);
     
-    relation_value = attr_find (&relation);
-    structure_value = attr_find (&structure);
+    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);
-        return rpn_search_APT_word (zi, zapt);
+            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);
-        return rpn_search_APT_phrase (zi, zapt);
+            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);
-        return rpn_search_APT_word (zi, zapt);
+            return rpn_search_APT_relevance (zi, zapt, attributeSet);
+        return rpn_search_APT_word (zi, zapt, attributeSet);
     case 3: /* key */
         break;
     case 4: /* year */
@@ -566,7 +766,7 @@ static RSET rpn_search_APT (ZServerInfo *zi, Z_AttributesPlusTerm *zapt)
     case 5: /* date - normalized */
         break;
     case 6: /* word list */
-        return rpn_search_APT_relevance (zi, zapt);
+        return rpn_search_APT_relevance (zi, zapt, attributeSet);
     case 100: /* date - un-normalized */
         break;
     case 101: /* name - normalized */
@@ -578,13 +778,13 @@ static RSET rpn_search_APT (ZServerInfo *zi, Z_AttributesPlusTerm *zapt)
     case 104: /* urx */
         break;
     case 105: /* free-form-text */
-        return rpn_search_APT_relevance (zi, zapt);
+        return rpn_search_APT_relevance (zi, zapt, attributeSet);
     case 106: /* document-text */
-        return rpn_search_APT_relevance (zi, zapt);
+        return rpn_search_APT_relevance (zi, zapt, attributeSet);
     case 107: /* local-number */
-        break;
+        return rpn_search_APT_local (zi, zapt, attributeSet);
     case 108: /* string */ 
-        return rpn_search_APT_word (zi, zapt);
+        return rpn_search_APT_word (zi, zapt, attributeSet);
     case 109: /* numeric string */
         break;
     }
@@ -601,17 +801,20 @@ 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_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);
+        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);
@@ -640,7 +843,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)
         {
@@ -667,7 +871,7 @@ static void count_set (RSET r, int *count)
 
     logf (LOG_DEBUG, "rpn_save_set");
     *count = 0;
-    rfd = rset_open (r, 0);
+    rfd = rset_open (r, RSETF_READ|RSETF_SORT_SYSNO);
     while (rset_read (r, rfd, &key))
     {
         if (key.sysno != psysno)
@@ -685,14 +889,138 @@ int rpn_search (ZServerInfo *zi,
                 const char *setname, int *hits)
 {
     RSET rset;
+    oident *attrset;
+    oid_value attributeSet;
 
     zi->errCode = 0;
     zi->errString = NULL;
-    rset = rpn_search_structure (zi, rpn->RPNStructure);
+    
+    attrset = oid_getentbyoid (rpn->attributeSetId);
+    attributeSet = attrset->value;
+
+    rset = rpn_search_structure (zi, rpn->RPNStructure, attributeSet);
     if (!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;
+}
+
+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; j<before+after; j++)
+        scan_info.list[j].term = NULL;
+    attr_init (&use, zapt, 1);
+    use_value = attr_find (&use, NULL);
+    logf (LOG_DEBUG, "use value %d", use_value);
+
+    if (use_value == -1)
+        use_value = 1016;
+    i = index_word_prefix (termz, 1, use_value);
+    strcpy (scan_info.prefix, termz);
+    sizez = term->u.general->len;
+    if (sizez > IT_MAX_WORD)
+        sizez = IT_MAX_WORD;
+    for (j = 0; j<sizez; j++)
+        termz[j+i] = index_char_cvt (term->u.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; i<scan_info.after; i++)
+        if (scan_info.list[scan_info.before+scan_info.after-i-1].term)
+            break;
+    *num_entries -= i;
+    if (i)
+        *status = BEND_SCAN_PARTIAL;
+
+    for (i = 0; i<scan_info.before; i++)
+        if (scan_info.list[i].term)
+            break;
+    if (i)
+        *status = BEND_SCAN_PARTIAL;
+    *position -= i;
+    *num_entries -= i;
+
+    *list = scan_info.list+i;       /* list is set to first 'real' entry */
+
+    if (*num_entries == 0)          /* signal 'unsupported use-attribute' */
+        zi->errCode = 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;
+}
+              
+
+