Implemented TCL filter. Updated recctrl system.

[idzebra-moved-to-github.git] / index / retrieve.c

diff --git a/index/retrieve.c b/index/retrieve.c
index dcc17b9..eb2331a 100644 (file)
--- a/index/retrieve.c
+++ b/index/retrieve.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: retrieve.c,v $
- * Revision 1.7  1999-03-02 16:15:43  quinn
+ * 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
@@ -112,6 +118,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)
@@ -127,7 +134,7 @@ int zebra_record_fetch (ZebraHandle zh, int sysno, int score, ODR stream,
     *basenamep = 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;
@@ -193,12 +200,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 */
@@ -237,7 +244,7 @@ int zebra_record_fetch (ZebraHandle zh, int sysno, int score, ODR stream,
     retrieveCtrl.diagnostic = 0;
     retrieveCtrl.dh = zh->dh;
     retrieveCtrl.res = zh->res;
-    (*rt->retrieve)(&retrieveCtrl);
+    (*rt->retrieve)(clientData, &retrieveCtrl);
     *output_format = retrieveCtrl.output_format;
     *rec_bufp = retrieveCtrl.rec_buf;
     *rec_lenp = retrieveCtrl.rec_len;