-/* $Id: extract.c,v 1.202 2006-02-09 08:31:02 adam Exp $
+/* $Id: extract.c,v 1.206 2006-03-30 09:52:15 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
if (!recType)
{
- yaz_log (YLOG_WARN, "No such record type: %s", zh->m_record_type);
+ yaz_log (YLOG_WARN, "No such record type: %s", recordType);
return ZEBRA_FAIL;
}
if (zh->m_staticrank) /* rank config enabled ? */
{
+ if (staticrank < 0)
+ {
+ yaz_log(YLOG_WARN, "staticrank = %ld. Setting to 0",
+ (long) staticrank);
+ staticrank = 0;
+ }
*keyp++ = staticrank;
key_out.len = 4;
}
ord = key.mem[0];
zebraExplain_lookup_ord(zh->reg->zei, ord, &index_type,
- 0/* db */, 0/* set */, 0/* use */);
+ 0/* db */, 0/* set */, 0/* use */,
+ 0 /* string index */);
assert(index_type);
zebra_term_untrans_iconv(zh, nmem, index_type,
&dst_term, str);
assert(key.len <= 4 && key.len > 2);
zebraExplain_lookup_ord(zh->reg->zei,
- key.mem[0], &index_type, &db, 0, 0);
+ key.mem[0], &index_type, &db, 0, 0, 0);
seqno = (int) key.mem[key.len-1];
i->prevcmd=-1;
i->keylen=0;
i->encode_handle = iscz1_start();
+ i->decode_handle = iscz1_start();
}
#define OLDENCODE 1
/* and copy & align key so we can mangle */
memcpy (&key, k+1, sizeof(struct it_key)); /* *k is insert/delete */
+#if 0
+ /* debugging */
+ key_logdump_txt(YLOG_LOG, &key, *k ? "i" : "d");
+#endif
+ assert(key.mem[0] >= 0);
+
bp0 = bp++;
iscz1_encode(i->encode_handle, &bp, &src);
+
*bp0 = (*k * 128) + bp - bp0 - 1; /* length and insert/delete combined */
if (fwrite (i->buf, bp - i->buf, 1, outf) != 1)
{
yaz_log (YLOG_FATAL|YLOG_ERRNO, "fwrite");
exit (1);
}
+
+#if 0
+ /* debugging */
+ if (1)
+ {
+ struct it_key key2;
+ const char *src = bp0+1;
+ char *dst = (char*) &key2;
+ iscz1_decode(i->decode_handle, &dst, &src);
+
+ key_logdump_txt(YLOG_LOG, &key2, *k ? "i" : "d");
+
+ assert(key2.mem[1]);
+ }
+#endif
}
void encode_key_flush (struct encode_info *i, FILE *outf)
-{ /* dummy routine */
+{
iscz1_stop(i->encode_handle);
+ iscz1_stop(i->decode_handle);
}
#else