Towards snippets/high-light of matched terms in records. Added

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

diff --git a/index/retrieve.c b/index/retrieve.c
index a029fce..acdbb79 100644 (file)
--- a/index/retrieve.c
+++ b/index/retrieve.c
@@ -1,6 +1,6 @@
-/* $Id: retrieve.c,v 1.27 2004-11-29 21:45:11 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $Id: retrieve.c,v 1.30 2005-05-31 13:01:37 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -97,7 +97,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)
     {
@@ -114,10 +126,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)))
@@ -199,7 +211,15 @@ int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score, ODR stream,
     retrieveCtrl.res = zh->res;
     retrieveCtrl.rec_buf = 0;
     retrieveCtrl.rec_len = -1;
-    
+
+    if (1)
+    {
+       struct recKeys reckeys;
+       reckeys.buf = rec->info[recInfo_delKeys];
+       reckeys.buf_used = rec->size[recInfo_delKeys];
+
+       print_rec_keys(zh, &reckeys);
+    }
     (*rt->retrieve)(clientData, &retrieveCtrl);
     *output_format = retrieveCtrl.output_format;
     *rec_bufp = (char *) retrieveCtrl.rec_buf;