Set default resulting record type in fetch.

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

diff --git a/index/zrpn.c b/index/zrpn.c
index cc1893d..f57400e 100644 (file)
--- a/index/zrpn.c
+++ b/index/zrpn.c
@@ -4,7 +4,19 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zrpn.c,v $
- * Revision 1.12  1995-09-15 14:45:21  adam
+ * 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.
  *
@@ -241,7 +253,7 @@ static RSET rset_trunc (ISAM isam, ISAM_P *isam_p, int from, int to,
                         int merge_chunk)
 {
     logf (LOG_DEBUG, "rset_trunc, range=%d-%d", from, to-1);
-    if (from - to > merge_chunk)
+    if (to - from > merge_chunk)
     {
         return NULL;
     }
@@ -254,6 +266,7 @@ static RSET rset_trunc (ISAM isam, ISAM_P *isam_p, int from, int to,
         RSFD rsfd;
         rset_temp_parms parms;
 
+        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);
@@ -279,6 +292,7 @@ static RSET rset_trunc (ISAM isam, ISAM_P *isam_p, int from, int to,
             is_pt_free (ispt[i]);
         rset_close (result, rsfd);
         heap_close (ti);
+        xfree (ispt);
         return result;
     }
 }
@@ -347,7 +361,7 @@ static int trunc_term (ZServerInfo *zi, Z_AttributesPlusTerm *zapt,
         zi->errCode = 120;
         return -1;
     case 101:        /* process # in term */
-        for (j = 0, i = 0; term_sub[i] && i < 3; i++)
+        for (j = 0, i = 0; term_sub[i] && i < 2; i++)
             term_dict[j++] = term_sub[i];
         for (; term_sub[i]; i++)
             if (term_sub[i] == '#')
@@ -370,6 +384,29 @@ static int trunc_term (ZServerInfo *zi, Z_AttributesPlusTerm *zapt,
     return 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';
+}
+
+
 static RSET rpn_search_APT_relevance (ZServerInfo *zi, 
                                       Z_AttributesPlusTerm *zapt)
 {
@@ -378,7 +415,6 @@ static RSET rpn_search_APT_relevance (ZServerInfo *zi,
     char term_sub[IT_MAX_WORD+1];
     char *p0 = termz, *p1 = NULL;
     Z_Term *term = zapt->term;
-    size_t sizez, i;
 
     parms.key_size = sizeof(struct it_key);
     parms.max_rec = 100;
@@ -390,13 +426,7 @@ static RSET rpn_search_APT_relevance (ZServerInfo *zi,
         zi->errCode = 124;
         return NULL;
     }
-    sizez = term->u.general->len;
-    if (sizez > IT_MAX_WORD)
-        sizez = IT_MAX_WORD;
-    for (i = 0; i<sizez; i++)
-        termz[i] = index_char_cvt (term->u.general->buf[i]);
-    termz[i] = '\0';
-
+    field_term (zi, zapt, termz);
     isam_p_indx = 0;  /* global, set by trunc_term - see below */
     while (1)
     {
@@ -428,20 +458,13 @@ static RSET rpn_search_APT_word (ZServerInfo *zi,
 
     char termz[IT_MAX_WORD+1];
     Z_Term *term = zapt->term;
-    size_t sizez, i;
 
     if (term->which != Z_Term_general)
     {
         zi->errCode = 124;
         return NULL;
     }
-    sizez = term->u.general->len;
-    if (sizez > IT_MAX_WORD)
-        sizez = IT_MAX_WORD;
-    for (i = 0; i<sizez; i++)
-        termz[i] = index_char_cvt (term->u.general->buf[i]);
-    termz[i] = '\0';
-
+    field_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;
@@ -454,7 +477,7 @@ static RSET rpn_search_APT_word (ZServerInfo *zi,
         return rset_create (rset_kind_isam, &parms);
     }
     else
-        return rset_trunc (zi->wordIsam, isam_positions, 0, isam_p_indx, 200);
+        return rset_trunc (zi->wordIsam, isam_positions, 0, isam_p_indx, 400);
 }
 
 static RSET rpn_search_APT_phrase (ZServerInfo *zi,
@@ -465,20 +488,13 @@ static RSET rpn_search_APT_phrase (ZServerInfo *zi,
 
     char termz[IT_MAX_WORD+1];
     Z_Term *term = zapt->term;
-    size_t sizez, i;
 
     if (term->which != Z_Term_general)
     {
         zi->errCode = 124;
         return NULL;
     }
-    sizez = term->u.general->len;
-    if (sizez > IT_MAX_WORD)
-        sizez = IT_MAX_WORD;
-    for (i = 0; i<sizez; i++)
-        termz[i] = index_char_cvt (term->u.general->buf[i]);
-    termz[i] = '\0';
-
+    field_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;