X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=index%2Fretrieve.c;h=34f0dc0171b0e5b67b9b2cd53cb3561be7b9b98d;hb=eb2b742588ce07fb4516bbca22c93b938b13e433;hp=8e7aeca8ae7c2778ed44a15a13dafba654d76b90;hpb=edff0b159ebbd0f26f58dda840f36ee400faab0c;p=idzebra-moved-to-github.git

diff --git a/index/retrieve.c b/index/retrieve.c
index 8e7aeca..34f0dc0 100644
--- a/index/retrieve.c
+++ b/index/retrieve.c
@@ -4,7 +4,25 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: retrieve.c,v $
- * Revision 1.6  1999-02-18 15:01:25  adam
+ * Revision 1.12  2000-03-15 15:00:30  adam
+ * First work on threaded version.
+ *
+ * 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
+ * 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
@@ -57,37 +75,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;
@@ -109,22 +127,25 @@ 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);
+    rec = rec_get (zh->service->records, sysno);
     if (!rec)
     {
         logf (LOG_DEBUG, "rec_get fail on sysno=%d", sysno);
+	*basenamep = 0;
         return 14;
     }
-    recordAttr = rec_init_attr (zh->zei, rec);
+    recordAttr = rec_init_attr (zh->service->zei, rec);
 
     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->service->recTypes,
+			       file_type, subType, &clientData)))
     {
         logf (LOG_WARN, "Retrieve: Cannot handle type %s",  file_type);
 	return 14;
@@ -190,12 +211,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 */
@@ -232,10 +253,11 @@ int zebra_record_fetch (ZebraHandle zh, int sysno, int score, ODR stream,
     retrieveCtrl.input_format = retrieveCtrl.output_format = input_format;
     retrieveCtrl.comp = comp;
     retrieveCtrl.diagnostic = 0;
-    retrieveCtrl.dh = zh->dh;
-    (*rt->retrieve)(&retrieveCtrl);
+    retrieveCtrl.dh = zh->service->dh;
+    retrieveCtrl.res = zh->service->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);