X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=test%2Fcodec%2Ftstcodec.c;h=af47b7d786220640c50ac7e84c91096cc66b0be6;hb=331f05f608e3d45c11adce71f767e38e173e8f40;hp=cf190562e6b699bfd53839c485271e13e430d470;hpb=2e4e9c6def27f1e1463dcb6f205fab6a98054f38;p=idzebra-moved-to-github.git

diff --git a/test/codec/tstcodec.c b/test/codec/tstcodec.c
index cf19056..af47b7d 100644
--- a/test/codec/tstcodec.c
+++ b/test/codec/tstcodec.c
@@ -1,4 +1,4 @@
-/* $Id: tstcodec.c,v 1.2 2004-08-04 08:35:26 adam Exp $
+/* $Id: tstcodec.c,v 1.4 2004-11-29 21:55:28 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -41,14 +41,9 @@ int tst_encode(int num)
     {
 	const char *src = (const char *) &key;
 
-#if IT_KEY_NEW
 	key.len = 2;
-	key.mem[0] = i >> 8;
+	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)
 	{
@@ -69,7 +64,6 @@ int tst_encode(int num)
 	    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,
@@ -82,7 +76,7 @@ int tst_encode(int num)
 		printf ("\n");
 		return 2;
 	    }
-	    if (key.mem[0] != (i>>8))
+	    if (key.mem[0] != (i<<8))
 	    {
 		printf ("%s: i=%d mem[0]=" ZINT_FORMAT " expected "
 			"%d\n", prog, i, key.mem[0], i>>8);
@@ -106,9 +100,6 @@ int tst_encode(int num)
 		printf ("\n");
 		return 4;
 	    }
-#else
-
-#endif
 	}
     }
 
@@ -117,6 +108,43 @@ int tst_encode(int num)
     return 0;
 }
 
+void tstcodec1()
+{
+    char buf[100];
+    char *dst = buf;
+    const char *src;
+    struct it_key key1, key2;
+    void *codec_handle =iscz1_start();
+
+    key1.len = 4;
+    key1.mem[0] = 4*65536+1016;
+    key1.mem[1] = 24339;
+    key1.mem[2] = 125060;
+    key1.mem[3] = 1;
+
+    src = (char*) &key1;
+    dst = buf;
+    iscz1_encode(codec_handle, &dst, &src);
+
+    iscz1_stop(codec_handle);
+
+    codec_handle =iscz1_start();
+
+    dst = (char*) &key2;
+    src = buf;
+    
+    iscz1_decode(codec_handle, &dst, &src);
+
+    iscz1_stop(codec_handle);
+
+    if (memcmp(&key1, &key2, sizeof(key1)))
+    {
+	printf ("keys differ in tstcodec1\n");
+	exit(1);
+    }
+}
+    
+
 int main(int argc, char **argv)
 {
     int num = 0;
@@ -125,6 +153,7 @@ int main(int argc, char **argv)
 	num = atoi(argv[1]);
     if (num < 1 || num > 100000000)
 	num = 10000;
+    tstcodec1();
     exit(tst_encode(num));
 }