-/* $Id: extract.c,v 1.161 2004-09-14 14:38:07 quinn Exp $
+/* $Id: extract.c,v 1.162 2004-09-15 08:13:51 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
struct recKeys *reckeys,
int attrSetS, int attrUseS)
{
-#if IT_KEY_NEW
-/* #error searchRecordKey does not work yet in this mode.. */
static const char *ws[32];
void *decode_handle = iscz1_start();
int off = 0;
iscz1_stop(decode_handle);
assert (off == reckeys->buf_used);
return ws;
-#else
- static const char *ws[32];
- int off = 0;
- int startSeq = -1;
- int i;
- int seqno = 0;
-#if SU_SCHEME
- int chS, ch;
-#else
- short attrUse;
- char attrSet;
-#endif
-
- for (i = 0; i<32; i++)
- ws[i] = NULL;
-
-#if SU_SCHEME
- chS = zebraExplain_lookupSU (zh->reg->zei, attrSetS, attrUseS);
- if (chS < 0)
- return ws;
-#endif
- while (off < reckeys->buf_used)
- {
-
- const char *src = reckeys->buf + off;
- const char *wstart;
- int lead;
-
- lead = *src++;
-#if SU_SCHEME
- if ((lead & 3)<3)
- {
- memcpy (&ch, src, sizeof(ch));
- src += sizeof(ch);
- }
-#else
- if (!(lead & 1))
- {
- memcpy (&attrSet, src, sizeof(attrSet));
- src += sizeof(attrSet);
- }
- if (!(lead & 2))
- {
- memcpy (&attrUse, src, sizeof(attrUse));
- src += sizeof(attrUse);
- }
-#endif
- wstart = src;
- while (*src++)
- ;
- if (lead & 60)
- seqno += ((lead>>2) & 15)-1;
- else
- {
- memcpy (&seqno, src, sizeof(seqno));
- src += sizeof(seqno);
- }
- if (
-#if SU_SCHEME
- ch == chS
-#else
- attrUseS == attrUse && attrSetS == attrSet
-#endif
- )
- {
- int woff;
-
-
- if (startSeq == -1)
- startSeq = seqno;
- woff = seqno - startSeq;
- if (woff >= 0 && woff < 31)
- ws[woff] = wstart;
- }
-
- off = src - reckeys->buf;
- }
- assert (off == reckeys->buf_used);
- return ws;
-#endif
}
struct file_read_info {
void create_rec_keys_codec(struct recKeys *keys)
{
keys->buf_used = 0;
-#if IT_KEY_NEW
iscz1_reset(keys->codec_handle);
-#else
- keys->prevAttrUse = -1;
- keys->prevAttrSet = -1;
- keys->prevSeqNo = 0;
-#endif
}
static int file_extract_record(ZebraHandle zh,
void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno,
int cmd, struct recKeys *reckeys)
{
-#if IT_KEY_NEW
void *decode_handle = iscz1_start();
-#else
- int seqno = 0;
-#if SU_SCHEME
-#else
- unsigned char attrSet = (unsigned char) -1;
- unsigned short attrUse = (unsigned short) -1;
-#endif
-#endif
int off = 0;
int ch = 0;
ZebraExplainInfo zei = zh->reg->zei;
zh->reg->key_file_no = 0;
}
zebraExplain_recordCountIncrement (zei, cmd ? 1 : -1);
-#if IT_KEY_NEW
+
while (off < reckeys->buf_used)
{
const char *src = reckeys->buf + off;
(zh->reg->key_buf_used) += sizeof(key);
off = src - reckeys->buf;
}
-#else
- while (off < reckeys->buf_used)
- {
- const char *src = reckeys->buf + off;
- struct it_key key;
- int lead;
-
- lead = *src++;
-
-#if SU_SCHEME
- if ((lead & 3) < 3)
- {
- memcpy (&ch, src, sizeof(ch));
- src += sizeof(ch);
- }
-#else
- if (!(lead & 1))
- {
- memcpy (&attrSet, src, sizeof(attrSet));
- src += sizeof(attrSet);
- }
- if (!(lead & 2))
- {
- memcpy (&attrUse, src, sizeof(attrUse));
- src += sizeof(attrUse);
- }
-#endif
- if (zh->reg->key_buf_used + 1024 >
- (zh->reg->ptr_top -zh->reg->ptr_i)*sizeof(char*))
- extract_flushWriteKeys (zh,0);
- assert(zh->reg->ptr_i >= 0);
- ++(zh->reg->ptr_i);
- assert(zh->reg->ptr_i > 0);
- (zh->reg->key_buf)[zh->reg->ptr_top - zh->reg->ptr_i] =
- (char*)zh->reg->key_buf + zh->reg->key_buf_used;
-#if SU_SCHEME
-#else
- ch = zebraExplain_lookupSU (zei, attrSet, attrUse);
- if (ch < 0)
- ch = zebraExplain_addSU (zei, attrSet, attrUse);
-#endif
- assert (ch > 0);
- zh->reg->key_buf_used +=
- key_SU_encode (ch,((char*)zh->reg->key_buf) +
- zh->reg->key_buf_used);
-
- while (*src)
- ((char*)zh->reg->key_buf) [(zh->reg->key_buf_used)++] = *src++;
- src++;
- ((char*)(zh->reg->key_buf))[(zh->reg->key_buf_used)++] = '\0';
- ((char*)(zh->reg->key_buf))[(zh->reg->key_buf_used)++] = cmd;
-
- if (lead & 60)
- seqno += ((lead>>2) & 15)-1;
- else
- {
- memcpy (&seqno, src, sizeof(seqno));
- src += sizeof(seqno);
- }
- key.seqno = seqno;
- key.sysno = sysno;
- memcpy ((char*)zh->reg->key_buf + zh->reg->key_buf_used, &key, sizeof(key));
- (zh->reg->key_buf_used) += sizeof(key);
- off = src - reckeys->buf;
- }
-#endif
assert (off == reckeys->buf_used);
-#if IT_KEY_NEW
iscz1_stop(decode_handle);
-#endif
}
void extract_flushWriteKeys (ZebraHandle zh, int final)
char *dst;
ZebraHandle zh = p->extractCtrl->handle;
struct recKeys *keys = &zh->reg->keys;
-#if IT_KEY_NEW
struct it_key key;
const char *src = (char*) &key;
-#else
- unsigned char attrSet;
- unsigned short attrUse;
- int lead = 0;
- int diff = 0;
- int *pseqno = &p->seqno;
- ZebraExplainInfo zei = zh->reg->zei;
-#endif
if (keys->buf_used+1024 > keys->buf_max)
{
}
dst = keys->buf + keys->buf_used;
-#if IT_KEY_NEW
key.len = 3;
key.mem[0] = p->attrSet;
key.mem[1] = p->attrUse;
memcpy (dst, str, length);
dst += length;
*dst++ = '\0';
-#else
- /* leader byte is encoded as follows:
- bit 0 : 1 if attrset is unchanged; 0 if attrset is changed
- bit 1 : 1 if attruse is unchanged; 0 if attruse is changed
- */
- attrSet = p->attrSet;
- if (keys->buf_used > 0 && keys->prevAttrSet == attrSet)
- lead |= 1;
- else
- keys->prevAttrSet = attrSet;
- attrUse = p->attrUse;
- if (keys->buf_used > 0 && keys->prevAttrUse == attrUse)
- lead |= 2;
- else
- keys->prevAttrUse = attrUse;
-
- diff = 1 + *pseqno - keys->prevSeqNo;
- if (diff >= 1 && diff <= 15)
- lead |= (diff << 2);
- else
- diff = 0;
-
- keys->prevSeqNo = *pseqno;
-
- *dst++ = lead;
-
-#if SU_SCHEME
- if ((lead & 3) < 3)
- {
- int ch = zebraExplain_lookupSU (zei, attrSet, attrUse);
- if (ch < 0)
- {
- ch = zebraExplain_addSU (zei, attrSet, attrUse);
- yaz_log (LOG_DEBUG, "addSU set=%d use=%d SU=%d",
- attrSet, attrUse, ch);
- }
- assert (ch > 0);
- memcpy (dst, &ch, sizeof(ch));
- dst += sizeof(ch);
- }
-#else
- if (!(lead & 1))
- {
- memcpy (dst, &attrSet, sizeof(attrSet));
- dst += sizeof(attrSet);
- }
- if (!(lead & 2))
- {
- memcpy (dst, &attrUse, sizeof(attrUse));
- dst += sizeof(attrUse);
- }
-#endif
- *dst++ = p->reg_type;
- memcpy (dst, str, length);
- dst += length;
- *dst++ = '\0';
-
- if (!diff)
- {
- memcpy (dst, pseqno, sizeof(*pseqno));
- dst += sizeof(*pseqno);
- }
-#endif
keys->buf_used = dst - keys->buf;
}
{
if (i >= IT_MAX_WORD)
break;
-yaz_log(LOG_DEBUG, "Adding string to index '%d'", *map);
+ yaz_log(LOG_DEBUG, "Adding string to index '%d'", **map);
while (i < IT_MAX_WORD && *cp)
buf[i++] = *(cp++);
}
i->prevseq=0;
i->prevcmd=-1;
i->keylen=0;
-#if IT_KEY_NEW
i->encode_handle = iscz1_start();
-#endif
-}
-
-#if IT_KEY_NEW
-#else
-char *encode_key_int (int d, char *bp)
-{
- if (d <= 63)
- *bp++ = d;
- else if (d <= 16383)
- {
- *bp++ = 64 + (d>>8);
- *bp++ = d & 255;
- }
- else if (d <= 4194303)
- {
- *bp++ = 128 + (d>>16);
- *bp++ = (d>>8) & 255;
- *bp++ = d & 255;
- }
- else
- {
- *bp++ = 192 + (d>>24);
- *bp++ = (d>>16) & 255;
- *bp++ = (d>>8) & 255;
- *bp++ = d & 255;
- }
- return bp;
}
-#endif
#define OLDENCODE 1
;
/* and copy & align key so we can mangle */
memcpy (&key, k+1, sizeof(struct it_key)); /* *k is insert/delete */
-#if IT_KEY_NEW
+
bp0 = bp++;
iscz1_encode(i->encode_handle, &bp, &src);
*bp0 = (*k * 128) + bp - bp0 - 1; /* length and insert/delete combined */
-#else
- bp = encode_key_int ( (key.sysno - i->sysno) * 2 + *k, bp);
- if (i->sysno != key.sysno)
- {
- i->sysno = key.sysno;
- i->seqno = 0;
- }
- else if (!i->seqno && !key.seqno && i->cmd == *k)
- return;
- bp = encode_key_int (key.seqno - i->seqno, bp);
- i->seqno = key.seqno;
- i->cmd = *k;
-#endif
if (fwrite (i->buf, bp - i->buf, 1, outf) != 1)
{
logf (LOG_FATAL|LOG_ERRNO, "fwrite");
void encode_key_flush (struct encode_info *i, FILE *outf)
{ /* dummy routine */
-#if IT_KEY_NEW
iscz1_stop(i->encode_handle);
-#endif
}
#else
-/* $Id: index.h,v 1.119 2004-09-09 10:08:04 heikki Exp $
+/* $Id: index.h,v 1.120 2004-09-15 08:13:51 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
#define IT_MAX_WORD 256
-#define IT_KEY_NEW 1
-
-#if IT_KEY_NEW
-
-#endif
-
-#if IT_KEY_NEW
#define IT_KEY_LEVEL_MAX 4
struct it_key {
int len;
zint mem[IT_KEY_LEVEL_MAX];
};
-#else
-struct it_key {
- int sysno;
- int seqno;
-};
-#endif
-
enum dirsKind { dirs_dir, dirs_file };
int prevseq;
int prevcmd;
int keylen; /* tells if we have an unwritten key in buf, and how long*/
-#if IT_KEY_NEW
void *encode_handle;
-#endif
char buf[ENCODE_BUFLEN];
};
int buf_used;
int buf_max;
char *buf;
-#if IT_KEY_NEW
void *codec_handle;
-#else
- int prevSeqNo;
- char prevAttrSet;
- short prevAttrUse;
-#endif
};
struct sortKeys {
-/* $Id: invstat.c,v 1.40 2004-09-09 10:08:05 heikki Exp $
+/* $Id: invstat.c,v 1.41 2004-09-15 08:13:51 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
while (isams_pp_read(pp, &key))
{
occurx++;
-#if IT_KEY_NEW
-#else
- stat_info->cksum = stat_info->cksum * 65509 +
- key.sysno + 11 * key.seqno;
- if (-1==firstsys)
- {
- firstseq=key.seqno;
- firstsys=key.sysno;
- }
- lastsys=key.sysno;
- lastseq=key.seqno;
-#endif
}
assert (occurx == occur);
stat_info->no_isam_entries[0] += occur;
while (isc_pp_read(pp, &key))
{
occurx++;
-#if IT_KEY_NEW
-#else
- stat_info->cksum = stat_info->cksum * 65509 +
- key.sysno + 11 * key.seqno;
- if (-1==firstsys)
- {
- firstseq=key.seqno;
- firstsys=key.sysno;
- }
- lastsys=key.sysno;
- lastseq=key.seqno;
-#endif
}
assert (occurx == occur);
stat_info->no_isam_entries[isc_type(isam_p)] += occur;
while (isamb_pp_read(pp, &key))
{
occur++;
-#if IT_KEY_NEW
-#else
- stat_info->cksum = stat_info->cksum * 65509 +
- key.sysno + 11 * key.seqno;
- if (-1==firstsys)
- {
- firstseq=key.seqno;
- firstsys=key.sysno;
- }
- lastsys=key.sysno;
- lastseq=key.seqno;
-#endif
}
isamb_pp_close_x (pp, &size, &blocks);
stat_info->isamb_blocks[cat] += blocks;
-/* $Id: kcompare.c,v 1.51 2004-09-01 15:01:32 heikki Exp $
+/* $Id: kcompare.c,v 1.52 2004-09-15 08:13:51 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
#include "index.h"
-#if IT_KEY_NEW
-#define INT_CODEC_NEW 1
-#else
-#define INT_CODEC_NEW 0
-#endif
-
#ifdef __GNUC__
#define CODEC_INLINE inline
#else
struct it_key key;
if (p)
{
-#if IT_KEY_NEW
char formstr[128];
int i;
strcat(formstr, " ");
}
logf (logmask, "%s %s", formstr, txt);
-#else
-/* !IT_KEY_NEW */
- memcpy (&key, p, sizeof(key));
- logf (logmask, "%7d:%-4d %s", key.sysno, key.seqno, txt);
-#endif
}
else
logf(logmask, " (null) %s",txt);
int key_compare_it (const void *p1, const void *p2)
{
-#if IT_KEY_NEW
int i, l = ((struct it_key *) p1)->len;
if (((struct it_key *) p2)->len > l)
l = ((struct it_key *) p2)->len;
return i-l;
}
}
-#else
- if (((struct it_key *) p1)->sysno != ((struct it_key *) p2)->sysno)
- {
- if (((struct it_key *) p1)->sysno > ((struct it_key *) p2)->sysno)
- return 2;
- else
- return -2;
- }
- if (((struct it_key *) p1)->seqno != ((struct it_key *) p2)->seqno)
- {
- if (((struct it_key *) p1)->seqno > ((struct it_key *) p2)->seqno)
- return 1;
- else
- return -1;
- }
-#endif
return 0;
}
char *key_print_it (const void *p, char *buf)
{
-#if IT_KEY_NEW
strcpy(buf, "");
-#else
- const struct it_key *i = p;
- sprintf (buf, "%d:%d", i->sysno, i->seqno);
-#endif
return buf;
}
int key_compare (const void *p1, const void *p2)
{
struct it_key i1, i2;
-#if IT_KEY_NEW
int i, l;
-#endif
memcpy (&i1, p1, sizeof(i1));
memcpy (&i2, p2, sizeof(i2));
-#if IT_KEY_NEW
l = i1.len;
if (i2.len > l)
l = i2.len;
return i-l;
}
}
-#else
- if (i1.sysno != i2.sysno)
- {
- if (i1.sysno > i2.sysno)
- return 2;
- else
- return -2;
- }
- if (i1.seqno != i2.seqno)
- {
- if (i1.seqno > i2.seqno)
- return 1;
- else
- return -1;
- }
-#endif
return 0;
}
{
struct it_key k;
memcpy (&k, p, sizeof(k));
-#if IT_KEY_NEW
return k.mem[k.len-1];
-#else
- return k.seqno;
-#endif
}
int key_qsort_compare (const void *p1, const void *p2)
return p;
}
-#if IT_KEY_NEW
void key_init(struct it_key *key)
{
int i;
for (i = 0; i<IT_KEY_LEVEL_MAX; i++)
key->mem[i] = 0;
}
-#endif
void iscz1_reset (void *vp)
{
struct iscz1_code_info *p = (struct iscz1_code_info *) vp;
-#if IT_KEY_NEW
int i;
p->key.len = 0;
for (i = 0; i< IT_KEY_LEVEL_MAX; i++)
p->key.mem[i] = 0;
-#else
- p->key.sysno = 0;
- p->key.seqno = 0;
-#endif
}
void iscz1_stop (void *p)
xfree (p);
}
-#if INT_CODEC_NEW
/* small encoder that works with unsigneds of any length */
static CODEC_INLINE void iscz1_encode_int (zint d, char **dst)
{
d += ((zint) c << r);
return d;
}
-#else
-/* ! INT_CODEC_NEW */
-
-/* old encoder that works with unsigneds up to 30 bits */
-static CODEC_INLINE void iscz1_encode_int (unsigned d, char **dst)
-{
- unsigned char *bp = (unsigned char*) *dst;
-
- if (d <= 63)
- *bp++ = d;
- else if (d <= 16383)
- {
- *bp++ = 64 | (d>>8);
- *bp++ = d & 255;
- }
- else if (d <= 4194303)
- {
- *bp++ = 128 | (d>>16);
- *bp++ = (d>>8) & 255;
- *bp++ = d & 255;
- }
- else
- {
- *bp++ = 192 | (d>>24);
- *bp++ = (d>>16) & 255;
- *bp++ = (d>>8) & 255;
- *bp++ = d & 255;
- }
- *dst = (char *) bp;
-}
-
-/* old decoder that works with unsigneds up to 30 bits */
-static CODEC_INLINE int iscz1_decode_int (unsigned char **src)
-{
- unsigned c = *(*src)++;
- switch (c & 192)
- {
- case 0:
- return c;
- case 64:
- return ((c & 63) << 8) + *(*src)++;
- case 128:
- c = ((c & 63) << 8) + *(*src)++;
- c = (c << 8) + *(*src)++;
- return c;
- }
- if (c&32) /* expand sign bit to high bits */
- c = ((c | 63) << 8) + *(*src)++;
- else
- c = ((c & 63) << 8) + *(*src)++;
- c = (c << 8) + *(*src)++;
- c = (c << 8) + *(*src)++;
-
- return c;
-}
-#endif
void iscz1_encode (void *vp, char **dst, const char **src)
{
struct iscz1_code_info *p = (struct iscz1_code_info *) vp;
struct it_key tkey;
-#if IT_KEY_NEW
zint d;
int i;
-#else
- int d;
-#endif
/* 1
3, 2, 9, 12
if diff is non-zero, then _may_ be more
*/
memcpy (&tkey, *src, sizeof(struct it_key));
-#if IT_KEY_NEW
+
/* deal with leader + delta encoding .. */
d = 0;
assert(tkey.len > 0 && tkey.len <= 4);
p->key.mem[i] = tkey.mem[i];
}
(*src) += sizeof(struct it_key);
-#else
- d = tkey.sysno - p->key.sysno;
- if (d)
- {
- iscz1_encode_int (2*tkey.seqno + 1, dst);
- iscz1_encode_int (d, dst);
- p->key.sysno += d;
- p->key.seqno = tkey.seqno;
- }
- else
- {
- iscz1_encode_int (2*(tkey.seqno - p->key.seqno), dst);
- p->key.seqno = tkey.seqno;
- }
- (*src) += sizeof(struct it_key);
-#endif
}
void iscz1_decode (void *vp, char **dst, const char **src)
{
struct iscz1_code_info *p = (struct iscz1_code_info *) vp;
-#if IT_KEY_NEW
int i;
-#else
- int d;
-#endif
-
-#if IT_KEY_NEW
+
int leader = (int) iscz1_decode_int ((unsigned char **) src);
i = leader & 7;
if (leader & 64)
p->key.mem[i] = iscz1_decode_int ((unsigned char **) src);
memcpy (*dst, &p->key, sizeof(struct it_key));
(*dst) += sizeof(struct it_key);
-#else
- d = iscz1_decode_int ((unsigned char **) src);
- if (d & 1)
- {
- p->key.seqno = d>>1;
- p->key.sysno += iscz1_decode_int ((unsigned char **) src);
- }
- else
- p->key.seqno += d>>1;
- memcpy (*dst, &p->key, sizeof(struct it_key));
- (*dst) += sizeof(struct it_key);
-#endif
}
ISAMS_M *key_isams_m (Res res, ISAMS_M *me)
-/* $Id: kdump.c,v 1.25 2004-08-04 08:35:23 adam Exp $
+/* $Id: kdump.c,v 1.26 2004-09-15 08:13:51 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
char *prog;
-#if IT_KEY_NEW
int main(int argc, char **argv)
{
exit(0);
}
-#else
+
+#if 0
+/* old kdumper.. must be updated to use new codec .. */
int key_file_decode (FILE *f)
{
int c, d;
-/* $Id: kinput.c,v 1.61 2004-08-06 13:14:46 adam Exp $
+/* $Id: kinput.c,v 1.62 2004-09-15 08:13:51 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
size_t chunk; /* number of bytes allocated */
size_t buf_ptr; /* current position in buffer */
char *prev_name; /* last word read */
-#if IT_KEY_NEW
void *decode_handle;
-#else
- int sysno; /* last sysno */
- int seqno; /* last seqno */
-#endif
off_t length; /* length of file */
/* handler invoked in each read */
void (*readHandler)(struct key_file *keyp, void *rinfo);
void key_file_destroy (struct key_file *f)
{
-#if IT_KEY_NEW
iscz1_stop(f->decode_handle);
-#endif
xfree (f->buf);
xfree (f->prev_name);
xfree (f);
f = (struct key_file *) xmalloc (sizeof(*f));
f->res = res;
-#if IT_KEY_NEW
f->decode_handle = iscz1_start();
-#else
- f->sysno = 0;
- f->seqno = 0;
-#endif
f->no = no;
f->chunk = chunk;
f->offset = 0;
{
int i, c;
char srcbuf[128];
-#if IT_KEY_NEW
const char *src = srcbuf;
char *dst;
int j;
-#else
- struct it_key itkey;
- int d;
-#endif
c = key_file_getc (f);
if (c == 0)
while ((key[i++] = key_file_getc (f)))
;
strcpy (f->prev_name, key);
-#if IT_KEY_NEW
iscz1_reset(f->decode_handle);
-#endif
}
-#if IT_KEY_NEW
c = key_file_getc(f); /* length + insert/delete combined */
key[i++] = c & 128;
c = c & 127;
dst = key + i;
iscz1_decode(f->decode_handle, &dst, &src);
return i + sizeof(struct it_key);
-#else
- d = key_file_decode (f);
- key[i++] = d & 1;
- d = d >> 1;
- itkey.sysno = d + f->sysno;
- if (d)
- {
- f->sysno = itkey.sysno;
- f->seqno = 0;
- }
- d = key_file_decode (f);
- itkey.seqno = d + f->seqno;
- f->seqno = itkey.seqno;
- memcpy (key + i, &itkey, sizeof(struct it_key));
- return i + sizeof (struct it_key);
-#endif
}
struct heap_info {
-/* $Id: zebraapi.c,v 1.131 2004-09-13 09:02:16 adam Exp $
+/* $Id: zebraapi.c,v 1.132 2004-09-15 08:13:51 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
reg->keys.buf_max = 0;
reg->keys.buf = 0;
-#if IT_KEY_NEW
reg->keys.codec_handle = iscz1_start();
-#endif
reg->sortKeys.buf = 0;
reg->sortKeys.buf_max = 0;
xfree (reg->sortKeys.buf);
xfree (reg->keys.buf);
-#if IT_KEY_NEW
if (reg->keys.codec_handle)
iscz1_stop(reg->keys.codec_handle);
-#endif
-
xfree (reg->key_buf);
xfree (reg->name);
xfree (reg);
-/* $Id: zrpn.c,v 1.152 2004-09-14 14:38:07 quinn Exp $
+/* $Id: zrpn.c,v 1.153 2004-09-15 08:13:51 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
sys = atoi(termz);
if (sys <= 0)
sys = 1;
-#if IT_KEY_NEW
key.mem[0] = sys;
key.mem[1] = 1;
key.len = 2;
-#else
- key.sysno = sys;
- key.seqno = 1;
- if (key.sysno <= 0)
- key.sysno = 1;
-#endif
rset_write (rsfd, &key);
rset_close (rsfd);
return result;
rfd = rset_open (r, RSETF_READ);
while (rset_read (rfd, &key))
{
-#if IT_KEY_NEW
if (key.mem[0] != psysno)
{
psysno = key.mem[0];
(*count)++;
}
-#else
- if (key.sysno != psysno)
- {
- psysno = key.sysno;
- (*count)++;
- }
-#endif
kno++;
}
rset_close (rfd);
-/* $Id: zsets.c,v 1.61 2004-09-13 09:02:16 adam Exp $
+/* $Id: zsets.c,v 1.62 2004-09-15 08:13:51 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
rfd = rset_open (rset, RSETF_READ);
while (num_i < num && rset_read (rfd, &key))
{
-#if IT_KEY_NEW
zint this_sys = key.mem[0];
-#else
- zint this_sys = key.sysno;
-#endif
if (this_sys != psysno)
{
psysno = this_sys;
rfd = rset_open (rset, RSETF_READ);
while (rset_read (rfd, &key))
{
-#if IT_KEY_NEW
zint this_sys = key.mem[0];
-#else
- zint this_sys = key.sysno;
-#endif
if (this_sys != psysno)
{
(sset->hits)++;
if (rset_read (rfd, &key))
{
-#if IT_KEY_NEW
zint psysno = key.mem[0];
-#else
- zint psysno = key.sysno;
-#endif
int score;
void *handle =
(*rc->begin) (zh->reg, rank_class->class_handle, rset);
est=-1; /* can not do */
do
{
-#if IT_KEY_NEW
zint this_sys = key.mem[0];
-#else
- zint this_sys = key.sysno;
-#endif
kno++;
if (this_sys != psysno)
{
-/* $Id: tstcodec.c,v 1.2 2004-08-04 08:35:26 adam Exp $
+/* $Id: tstcodec.c,v 1.3 2004-09-15 08:13:51 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
{
const char *src = (const char *) &key;
-#if IT_KEY_NEW
key.len = 2;
key.mem[0] = i >> 8;
key.mem[1] = i & 255;
-#else
- key.sysno = num;
- key.seqno = 1;
-#endif
iscz1_encode (codec_handle, &dst, &src);
if (dst > dst_buf + num*10)
{
const char *src0 = src;
iscz1_decode(codec_handle, &dst, &src);
-#if IT_KEY_NEW
if (key.len != 2)
{
printf ("%s: i=%d key.len=%d expected 2\n", prog,
printf ("\n");
return 4;
}
-#else
-
-#endif
}
}