X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fretrieve.c;h=dffb20c4106a4e8d4fde4cde4cdb852a41c1076c;hb=a9eae0225b1a51b0257f80d9da9f95475dd04f53;hp=909c41f92b832f6fe76bfd444e0019ec4e448484;hpb=2e4e9c6def27f1e1463dcb6f205fab6a98054f38;p=idzebra-moved-to-github.git

diff --git a/index/retrieve.c b/index/retrieve.c
index 909c41f..dffb20c 100644
--- a/index/retrieve.c
+++ b/index/retrieve.c
@@ -1,4 +1,4 @@
-/* $Id: retrieve.c,v 1.22 2004-08-04 08:35:23 adam Exp $
+/* $Id: retrieve.c,v 1.25 2004-09-27 10:44:49 adam 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;
@@ -91,7 +91,6 @@ int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score, ODR stream,
     char *fname, *file_type, *basename;
     RecType rt;
     struct recRetrieveCtrl retrieveCtrl;
-    char subType[128];
     struct zebra_fetch_control fc;
     RecordAttr *recordAttr;
     void *clientData;
@@ -101,7 +100,7 @@ int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score, ODR stream,
     if (!rec)
     {
         logf (LOG_DEBUG, "rec_get fail on sysno=" ZINT_FORMAT, sysno);
-	*basenamep = 0;
+        *basenamep = 0;
         return 14;
     }
     recordAttr = rec_init_attr (zh->reg->zei, rec);
@@ -118,8 +117,8 @@ int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score, ODR stream,
         if (!strcmp (comp->u.simple->u.generic, "R"))
 	    raw_mode = 1;
     }
-    if (!(rt = recType_byName (zh->reg->recTypes,
-			       file_type, subType, &clientData)))
+    if (!(rt = recType_byName (zh->reg->recTypes, zh->res,
+			       file_type, &clientData)))
     {
         logf (LOG_WARN, "Retrieve: Cannot handle type %s",  file_type);
 	return 14;
@@ -185,7 +184,6 @@ int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score, ODR stream,
 	    return 0;
 	}
     }
-    retrieveCtrl.subType = subType;
     retrieveCtrl.localno = sysno;
     retrieveCtrl.score = score;
     retrieveCtrl.recordSize = recordAttr->recordSize;