X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fretrieve.c;h=00d1d9ec1a5d66fc784afc8b4d9df924146b8803;hb=3726bf6622da6a8b983bb4cbb7d654e84c3216d7;hp=43661f279eca6441560c3e502c746914502bc334;hpb=6e044d5a523bb4363d07af757ebf1bcfe0ad6c04;p=idzebra-moved-to-github.git

diff --git a/index/retrieve.c b/index/retrieve.c
index 43661f2..00d1d9e 100644
--- a/index/retrieve.c
+++ b/index/retrieve.c
@@ -4,7 +4,22 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: retrieve.c,v $
- * Revision 1.5  1999-02-17 11:29:56  adam
+ * 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
+ * More work on SDRKit integration.
+ *
+ * Revision 1.7  1999/03/02 16:15:43  quinn
+ * Added "tagsysno" and "tagrank" directives to zebra.cfg.
+ *
+ * Revision 1.6  1999/02/18 15:01:25  adam
+ * Minor changes.
+ *
+ * Revision 1.5  1999/02/17 11:29:56  adam
  * Fixed in record_fetch. Minor updates to API.
  *
  * Revision 1.4  1999/02/02 14:51:07  adam
@@ -54,37 +69,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;
@@ -106,6 +121,7 @@ int zebra_record_fetch (ZebraHandle zh, int sysno, int score, ODR stream,
     char subType[128];
     struct fetch_control fc;
     RecordAttr *recordAttr;
+    void *clientData;
 
     rec = rec_get (zh->records, sysno);
     if (!rec)
@@ -118,10 +134,10 @@ 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)))
+    if (!(rt = recType_byName (zh->recTypes, file_type, subType, &clientData)))
     {
         logf (LOG_WARN, "Retrieve: Cannot handle type %s",  file_type);
 	return 14;
@@ -187,12 +203,12 @@ int zebra_record_fetch (ZebraHandle zh, int sysno, int score, ODR stream,
 	    recordAttr->recordOffset);
 	if (fc.record_int_len > 180)
 	{
-	    logf (LOG_LOG, "%0.70s", fc.record_int_buf);
-	    logf (LOG_LOG, "%0.70s", fc.record_int_buf +
+	    logf (LOG_LOG, "%.70s", fc.record_int_buf);
+	    logf (LOG_LOG, "%.70s", fc.record_int_buf +
 		(fc.record_int_len - 70));
 	}
 	else
-	    logf (LOG_LOG, "%0.*s",
+	    logf (LOG_LOG, "%.*s",
 		fc.record_int_len, fc.record_int_buf);
 
 	/* the following two lines makes rec_rm delete buf */
@@ -230,11 +246,11 @@ int zebra_record_fetch (ZebraHandle zh, int sysno, int score, ODR stream,
     retrieveCtrl.comp = comp;
     retrieveCtrl.diagnostic = 0;
     retrieveCtrl.dh = zh->dh;
-    (*rt->retrieve)(&retrieveCtrl);
+    retrieveCtrl.res = zh->res;
+    (*rt->retrieve)(clientData, &retrieveCtrl);
     *output_format = retrieveCtrl.output_format;
+    *rec_bufp = (char *) retrieveCtrl.rec_buf;
     *rec_lenp = retrieveCtrl.rec_len;
-    *rec_bufp = odr_malloc (stream, *rec_lenp);
-    memcpy (*rec_bufp, retrieveCtrl.rec_buf, *rec_lenp);
     if (fc.fd != -1)
         close (fc.fd);
     rec_rm (&rec);