X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fretrieve.c;h=1600665e578bb106de823d48c75ce084e684f2e9;hb=fa07a1e944e47feeb9e58296659bb57c4c32bde7;hp=eb2331afc8b237ae95597ca53c5878e436e6fd77;hpb=4415da5dbbba04e50d4524347486d60113ed569c;p=idzebra-moved-to-github.git

diff --git a/index/retrieve.c b/index/retrieve.c
index eb2331a..1600665 100644
--- a/index/retrieve.c
+++ b/index/retrieve.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: retrieve.c,v $
- * Revision 1.9  1999-05-20 12:57:18  adam
+ * Revision 1.11  1999-10-29 10:00:00  adam
+ * Fixed minor bug where database name wasn't set in zebra_record_fetch.
+ *
+ * Revision 1.10  1999/05/26 07:49:13  adam
+ * C++ compilation.
+ *
+ * Revision 1.9  1999/05/20 12:57:18  adam
  * Implemented TCL filter. Updated recctrl system.
  *
  * Revision 1.8  1999/03/09 16:27:49  adam
@@ -66,37 +72,37 @@ struct fetch_control {
 
 static int record_ext_read (void *fh, char *buf, size_t count)
 {
-    struct fetch_control *fc = fh;
+    struct fetch_control *fc = (struct fetch_control *) fh;
     return read (fc->fd, buf, count);
 }
 
 static off_t record_ext_seek (void *fh, off_t offset)
 {
-    struct fetch_control *fc = fh;
+    struct fetch_control *fc = (struct fetch_control *) fh;
     return lseek (fc->fd, offset + fc->record_offset, SEEK_SET);
 }
 
 static off_t record_ext_tell (void *fh)
 {
-    struct fetch_control *fc = fh;
+    struct fetch_control *fc = (struct fetch_control *) fh;
     return lseek (fc->fd, 0, SEEK_CUR) - fc->record_offset;
 }
 
 static off_t record_int_seek (void *fh, off_t offset)
 {
-    struct fetch_control *fc = fh;
+    struct fetch_control *fc = (struct fetch_control *) fh;
     return (off_t) (fc->record_int_pos = offset);
 }
 
 static off_t record_int_tell (void *fh)
 {
-    struct fetch_control *fc = fh;
+    struct fetch_control *fc = (struct fetch_control *) fh;
     return (off_t) fc->record_int_pos;
 }
 
 static int record_int_read (void *fh, char *buf, size_t count)
 {
-    struct fetch_control *fc = fh;
+    struct fetch_control *fc = (struct fetch_control *) fh;
     int l = fc->record_int_len - fc->record_int_pos;
     if (l <= 0)
         return 0;
@@ -124,6 +130,7 @@ int zebra_record_fetch (ZebraHandle zh, int sysno, int score, ODR stream,
     if (!rec)
     {
         logf (LOG_DEBUG, "rec_get fail on sysno=%d", sysno);
+	*basenamep = 0;
         return 14;
     }
     recordAttr = rec_init_attr (zh->zei, rec);
@@ -131,7 +138,7 @@ int zebra_record_fetch (ZebraHandle zh, int sysno, int score, ODR stream,
     file_type = rec->info[recInfo_fileType];
     fname = rec->info[recInfo_filename];
     basename = rec->info[recInfo_databaseName];
-    *basenamep = odr_malloc (stream, strlen(basename)+1);
+    *basenamep = (char *) odr_malloc (stream, strlen(basename)+1);
     strcpy (*basenamep, basename);
 
     if (!(rt = recType_byName (zh->recTypes, file_type, subType, &clientData)))
@@ -246,7 +253,7 @@ int zebra_record_fetch (ZebraHandle zh, int sysno, int score, ODR stream,
     retrieveCtrl.res = zh->res;
     (*rt->retrieve)(clientData, &retrieveCtrl);
     *output_format = retrieveCtrl.output_format;
-    *rec_bufp = retrieveCtrl.rec_buf;
+    *rec_bufp = (char *) retrieveCtrl.rec_buf;
     *rec_lenp = retrieveCtrl.rec_len;
     if (fc.fd != -1)
         close (fc.fd);