/*
- * Copyright (C) 1994-2000, Index Data
+ * Copyright (C) 1994-2001, Index Data
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: extract.c,v $
- * Revision 1.106 2000-12-05 12:22:53 adam
+ * Revision 1.108 2001-06-14 11:44:56 adam
+ * Bug fix: default storeKeys setting wasn't read when group was specified.
+ *
+ * Revision 1.107 2001/05/28 13:58:48 adam
+ * Call flushSortKeys when record is skipped to fix bad re-use of
+ * sort keys to whatever next record that comes in.
+ *
+ * Revision 1.106 2000/12/05 12:22:53 adam
* Termlist source implemented (so that we can index values of XML/SGML
* attributes).
*
while (sk)
{
struct sortKey *sk_next = sk->next;
- sortIdx_type (sortIdx, sk->attrUse);
- sortIdx_add (sortIdx, sk->string, sk->length);
+ if (cmd >= 0)
+ {
+ sortIdx_type (sortIdx, sk->attrUse);
+ sortIdx_add (sortIdx, sk->string, sk->length);
+ }
xfree (sk->string);
xfree (sk);
sk = sk_next;
{
logf (LOG_LOG, "skipped %s %s " PRINTF_OFF_T, rGroup->recordType,
fname, recordOffset);
+ flushSortKeys (*sysno, -1);
rec_rm (&rec);
logRecord (0);
return 1;
const char *sval;
sprintf (ext_res, "%sstoreKeys.%s", gprefix, ext);
- if (!(sval = res_get (common_resource, ext_res)))
+ sval = res_get (common_resource, ext_res);
+ if (!sval)
{
sprintf (ext_res, "%sstoreKeys", gprefix);
sval = res_get (common_resource, ext_res);
}
+ if (!sval)
+ sval = res_get (common_resource, "storeKeys");
if (sval)
rGroup->flagStoreKeys = atoi (sval);
}