X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fretrieve.c;h=1f308511c1d2c0e451e7dd65f210e6d966ab7930;hb=b5eb8cd7ae4134d915ed8b4aec25ab90c8bd0dcb;hp=073be377526f70c7b371bec4afee0f9b458a6b01;hpb=8fd431ba43f7305bd59d97de86ac350cb9136ef5;p=idzebra-moved-to-github.git

diff --git a/index/retrieve.c b/index/retrieve.c
index 073be37..1f30851 100644
--- a/index/retrieve.c
+++ b/index/retrieve.c
@@ -1,4 +1,4 @@
-/* $Id: retrieve.c,v 1.21 2004-05-27 09:28:01 adam Exp $
+/* $Id: retrieve.c,v 1.24 2004-08-10 08:19:15 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -70,7 +70,7 @@ int zebra_record_int_read (void *fh, char *buf, size_t count)
     int l = fc->record_int_len - fc->record_int_pos;
     if (l <= 0)
         return 0;
-    l = (l < (int) count) ? l : count;
+    l = (l < (int) count) ? l : (int) count;
     memcpy (buf, fc->record_int_buf + fc->record_int_pos, l);
     fc->record_int_pos += l;
     return l;
@@ -82,7 +82,7 @@ void zebra_record_int_end (void *fh, off_t off)
     fc->offset_end = off;
 }
 
-int zebra_record_fetch (ZebraHandle zh, int sysno, int score, ODR stream,
+int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score, ODR stream,
 			oid_value input_format, Z_RecordComposition *comp,
 			oid_value *output_format, char **rec_bufp,
 			int *rec_lenp, char **basenamep)
@@ -100,8 +100,8 @@ int zebra_record_fetch (ZebraHandle zh, int sysno, int score, ODR stream,
     rec = rec_get (zh->reg->records, sysno);
     if (!rec)
     {
-        logf (LOG_DEBUG, "rec_get fail on sysno=%d", sysno);
-	*basenamep = 0;
+        logf (LOG_DEBUG, "rec_get fail on sysno=" ZINT_FORMAT, sysno);
+        *basenamep = 0;
         return 14;
     }
     recordAttr = rec_init_attr (zh->reg->zei, rec);
@@ -124,7 +124,7 @@ int zebra_record_fetch (ZebraHandle zh, int sysno, int score, ODR stream,
         logf (LOG_WARN, "Retrieve: Cannot handle type %s",  file_type);
 	return 14;
     }
-    logf (LOG_DEBUG, "retrieve localno=%d score=%d", sysno, score);
+    logf (LOG_DEBUG, "retrieve localno=" ZINT_FORMAT " score=%d", sysno,score);
     retrieveCtrl.fh = &fc;
     fc.fd = -1;
     retrieveCtrl.fname = fname;