Fix leak for rset_key_control

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

diff --git a/index/retrieve.c b/index/retrieve.c
index b25a3ae..d60a989 100644 (file)
--- a/index/retrieve.c
+++ b/index/retrieve.c
@@ -1,6 +1,6 @@
-/* $Id: retrieve.c,v 1.26 2004-11-19 10:27:03 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $Id: retrieve.c,v 1.36 2005-10-28 07:25:30 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -27,7 +27,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #ifdef WIN32
 #include <io.h>
 #include <process.h>
-#else
+#endif
+#if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
@@ -82,10 +83,12 @@ void zebra_record_int_end (void *fh, off_t off)
     fc->offset_end = off;
 }
 
-int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score, ODR stream,
+int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score,
+                       zebra_snippets *hit_snippet, ODR stream,
                        oid_value input_format, Z_RecordComposition *comp,
                        oid_value *output_format, char **rec_bufp,
-                       int *rec_lenp, char **basenamep)
+                       int *rec_lenp, char **basenamep,
+                       char **addinfo)
 {
     Record rec;
     char *fname, *file_type, *basename;
@@ -96,6 +99,19 @@ int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score, ODR stream,
     void *clientData;
     int raw_mode = 0;
 
+    *basenamep = 0;
+    *addinfo = 0;
+    if (comp && comp->which == Z_RecordComp_simple &&
+        comp->u.simple->which == Z_ElementSetNames_generic && 
+        !strcmp (comp->u.simple->u.generic, "_sysno_"))
+    {
+       char rec_str[60];
+       sprintf(rec_str, ZINT_FORMAT, sysno);
+       *output_format = VAL_SUTRS;
+       *rec_lenp = strlen(rec_str);
+       *rec_bufp = odr_strdup(stream, rec_str);
+       return 0;
+    }
     rec = rec_get (zh->reg->records, sysno);
     if (!rec)
     {
@@ -112,10 +128,10 @@ int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score, ODR stream,
     strcpy (*basenamep, basename);
 
     if (comp && comp->which == Z_RecordComp_simple &&
-        comp->u.simple->which == Z_ElementSetNames_generic)
+        comp->u.simple->which == Z_ElementSetNames_generic && 
+        !strcmp (comp->u.simple->u.generic, "R"))
     {
-        if (!strcmp (comp->u.simple->u.generic, "R"))
-           raw_mode = 1;
+       raw_mode = 1;
     }
     if (!(rt = recType_byName (zh->reg->recTypes, zh->res,
                               file_type, &clientData)))
@@ -192,12 +208,62 @@ int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score, ODR stream,
     retrieveCtrl.comp = comp;
     retrieveCtrl.encoding = zh->record_encoding;
     retrieveCtrl.diagnostic = 0;
+    retrieveCtrl.addinfo = 0;
     retrieveCtrl.dh = zh->reg->dh;
     retrieveCtrl.res = zh->res;
     retrieveCtrl.rec_buf = 0;
     retrieveCtrl.rec_len = -1;
+    retrieveCtrl.hit_snippet = hit_snippet;
+    retrieveCtrl.doc_snippet = zebra_snippets_create();
     
-    (*rt->retrieve)(clientData, &retrieveCtrl);
+    if (1)
+    {
+       /* snippets code */
+       zebra_snippets *snippet;
+
+#if NEW_REC_KEYS
+       zebra_rec_keys_t reckeys = zebra_rec_keys_open();
+       
+       zebra_rec_keys_set_buf(reckeys,
+                              rec->info[recInfo_delKeys],
+                              rec->size[recInfo_delKeys], 
+                              0);
+       zebra_snippets_rec_keys(zh, reckeys, retrieveCtrl.doc_snippet);
+       zebra_rec_keys_close(reckeys);
+#else
+       struct recKeys reckeys;
+       reckeys.buf = rec->info[recInfo_delKeys];
+       reckeys.buf_used = rec->size[recInfo_delKeys];
+       zebra_snippets_rec_keys(zh, &reckeys, retrieveCtrl.doc_snippet);
+#endif
+
+
+#if 0
+       /* for debugging purposes */
+       yaz_log(YLOG_LOG, "DOC SNIPPET:");
+       zebra_snippets_log(retrieveCtrl.doc_snippet, YLOG_LOG);
+       yaz_log(YLOG_LOG, "HIT SNIPPET:");
+       zebra_snippets_log(retrieveCtrl.hit_snippet, YLOG_LOG);
+#endif
+       snippet = zebra_snippets_window(retrieveCtrl.doc_snippet,
+                                       retrieveCtrl.hit_snippet,
+                                       10);
+#if 0
+       /* for debugging purposes */
+       yaz_log(YLOG_LOG, "WINDOW SNIPPET:");
+       zebra_snippets_log(snippet, YLOG_LOG);
+#endif
+       (*rt->retrieve)(clientData, &retrieveCtrl);
+
+       zebra_snippets_destroy(snippet);
+    }
+    else
+    {
+       (*rt->retrieve)(clientData, &retrieveCtrl);
+    }
+
+    zebra_snippets_destroy(retrieveCtrl.doc_snippet);
+
     *output_format = retrieveCtrl.output_format;
     *rec_bufp = (char *) retrieveCtrl.rec_buf;
     *rec_lenp = retrieveCtrl.rec_len;
@@ -205,5 +271,6 @@ int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score, ODR stream,
         close (fc.fd);
     rec_rm (&rec);
 
+    *addinfo = retrieveCtrl.addinfo;
     return retrieveCtrl.diagnostic;
 }