* Sebastian Hammer, Adam Dickmeiss
*
* $Log: zrpn.c,v $
- * Revision 1.20 1995-10-06 11:06:33 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
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 int scan_prefix;
static ISAM scan_isam;
+static char scan_prefix[20];
static int scan_handle (Dict_char *name, const char *info, int pos)
{
- int idx;
+ 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 + scan_prefix)+1);
- strcpy (scan_list[idx].term, name + scan_prefix);
+ 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;
}
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;
- scan_prefix = i = index_word_prefix (termz, 1, use_value);
+ 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;
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;
}