Bug fixes. Handler may abort further scanning.

[idzebra-moved-to-github.git] / index / zrpn.c

diff --git a/index/zrpn.c b/index/zrpn.c
index 9d12e03..4f50db2 100644 (file)
--- a/index/zrpn.c
+++ b/index/zrpn.c
@@ -4,7 +4,19 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zrpn.c,v $
- * Revision 1.17  1995-10-04 12:55:17  adam
+ * 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 +358,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 +409,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 +422,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)
@@ -693,6 +681,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; j<before+after; j++)
+        scan_list[j].term = "------";
+    attr_init (&use, zapt, 1);
+    use_value = attr_find (&use);
+    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_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_handle);
+
+    if (zi->errCode)
+        logf (LOG_DEBUG, "search error: %d", zi->errCode);
+    return 0;
+}
+