New member in recRetrieveCtrl: diagnostic.

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

diff --git a/index/zrpn.c b/index/zrpn.c
index 744f3dc..f801b0d 100644 (file)
--- a/index/zrpn.c
+++ b/index/zrpn.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zrpn.c,v $
- * Revision 1.13  1995-09-18 14:17:50  adam
+ * 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
@@ -383,7 +389,7 @@ 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;
+    size_t sizez, i, j;
 
     parms.key_size = sizeof(struct it_key);
     parms.max_rec = 100;
@@ -395,11 +401,12 @@ static RSET rpn_search_APT_relevance (ZServerInfo *zi,
         zi->errCode = 124;
         return NULL;
     }
-    sizez = term->u.general->len;
+    i = index_word_prefix (termz, 1, 1016);
+    sizez = i + 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]);
+    for (j = 0; i < sizez; i++, j++)
+        termz[i] = index_char_cvt (term->u.general->buf[j]);
     termz[i] = '\0';
 
     isam_p_indx = 0;  /* global, set by trunc_term - see below */
@@ -433,18 +440,20 @@ static RSET rpn_search_APT_word (ZServerInfo *zi,
 
     char termz[IT_MAX_WORD+1];
     Z_Term *term = zapt->term;
-    size_t sizez, i;
+    size_t sizez, i, j;
 
     if (term->which != Z_Term_general)
     {
         zi->errCode = 124;
         return NULL;
     }
-    sizez = term->u.general->len;
+    i = index_word_prefix (termz, 1, 1016);
+    logf (LOG_DEBUG, "i=%d", i);
+    sizez = i + 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]);
+    for (j = 0; i < sizez; i++, j++)
+        termz[i] = index_char_cvt (term->u.general->buf[j]);
     termz[i] = '\0';
 
     isam_p_indx = 0;  /* global, set by trunc_term - see below */
@@ -470,18 +479,19 @@ static RSET rpn_search_APT_phrase (ZServerInfo *zi,
 
     char termz[IT_MAX_WORD+1];
     Z_Term *term = zapt->term;
-    size_t sizez, i;
+    size_t sizez, i, j;
 
     if (term->which != Z_Term_general)
     {
         zi->errCode = 124;
         return NULL;
     }
-    sizez = term->u.general->len;
+    i = index_word_prefix (termz, 1, 1016);
+    sizez = i + 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]);
+    for (j = 0 ; i < sizez; i++, j++)
+        termz[i] = index_char_cvt (term->u.general->buf[j]);
     termz[i] = '\0';
 
     isam_p_indx = 0;  /* global, set by trunc_term - see below */