projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug fixes.
[idzebra-moved-to-github.git]
/
index
/
zrpn.c
diff --git
a/index/zrpn.c
b/index/zrpn.c
index
cc1893d
..
ec7b8a3
100644
(file)
--- a/
index/zrpn.c
+++ b/
index/zrpn.c
@@
-4,7
+4,13
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: zrpn.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: zrpn.c,v $
- * Revision 1.12 1995-09-15 14:45:21 adam
+ * 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.
*
* Retrieve control.
* Work on truncation.
*
@@
-241,7
+247,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);
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;
}
{
return NULL;
}
@@
-254,6
+260,7
@@
static RSET rset_trunc (ISAM isam, ISAM_P *isam_p, int from, int to,
RSFD rsfd;
rset_temp_parms parms;
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);
parms.key_size = sizeof (struct it_key);
result = rset_create (rset_kind_temp, &parms);
rsfd = rset_open (result, 1);
@@
-279,6
+286,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);
is_pt_free (ispt[i]);
rset_close (result, rsfd);
heap_close (ti);
+ xfree (ispt);
return result;
}
}
return result;
}
}
@@
-347,7
+355,7
@@
static int trunc_term (ZServerInfo *zi, Z_AttributesPlusTerm *zapt,
zi->errCode = 120;
return -1;
case 101: /* process # in term */
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] == '#')
term_dict[j++] = term_sub[i];
for (; term_sub[i]; i++)
if (term_sub[i] == '#')
@@
-390,10
+398,11
@@
static RSET rpn_search_APT_relevance (ZServerInfo *zi,
zi->errCode = 124;
return NULL;
}
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;
if (sizez > IT_MAX_WORD)
sizez = IT_MAX_WORD;
- for (i = 0; i<sizez; i++)
+ for ( ; i < sizez; i++)
termz[i] = index_char_cvt (term->u.general->buf[i]);
termz[i] = '\0';
termz[i] = index_char_cvt (term->u.general->buf[i]);
termz[i] = '\0';
@@
-435,10
+444,11
@@
static RSET rpn_search_APT_word (ZServerInfo *zi,
zi->errCode = 124;
return NULL;
}
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;
if (sizez > IT_MAX_WORD)
sizez = IT_MAX_WORD;
- for (i = 0; i<sizez; i++)
+ for ( ; i < sizez; i++)
termz[i] = index_char_cvt (term->u.general->buf[i]);
termz[i] = '\0';
termz[i] = index_char_cvt (term->u.general->buf[i]);
termz[i] = '\0';
@@
-454,7
+464,7
@@
static RSET rpn_search_APT_word (ZServerInfo *zi,
return rset_create (rset_kind_isam, &parms);
}
else
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,
}
static RSET rpn_search_APT_phrase (ZServerInfo *zi,
@@
-472,10
+482,11
@@
static RSET rpn_search_APT_phrase (ZServerInfo *zi,
zi->errCode = 124;
return NULL;
}
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;
if (sizez > IT_MAX_WORD)
sizez = IT_MAX_WORD;
- for (i = 0; i<sizez; i++)
+ for ( ; i < sizez; i++)
termz[i] = index_char_cvt (term->u.general->buf[i]);
termz[i] = '\0';
termz[i] = index_char_cvt (term->u.general->buf[i]);
termz[i] = '\0';