Renamed function zebra_snippets_rec_keys to zebra_rec_keys_to_snippets.
authorAdam Dickmeiss <adam@indexdata.dk>
Thu, 9 Nov 2006 14:39:24 +0000 (14:39 +0000)
committerAdam Dickmeiss <adam@indexdata.dk>
Thu, 9 Nov 2006 14:39:24 +0000 (14:39 +0000)
Factor storedata retrieval out of zebra_record_fetch.

index/extract.c
index/index.h
index/retrieve.c

index f4d53de..c490210 100644 (file)
@@ -1,4 +1,4 @@
-/* $Id: extract.c,v 1.234 2006-11-02 10:47:05 adam Exp $
+/* $Id: extract.c,v 1.235 2006-11-09 14:39:24 adam Exp $
    Copyright (C) 1995-2006
    Index Data ApS
 
@@ -1271,9 +1271,9 @@ void extract_flushWriteKeys (ZebraHandle zh, int final)
     zh->reg->key_buf_used = 0;
 }
 
-ZEBRA_RES zebra_snippets_rec_keys(ZebraHandle zh,
-                                 zebra_rec_keys_t reckeys,
-                                 zebra_snippets *snippets)
+ZEBRA_RES zebra_rec_keys_to_snippets(ZebraHandle zh,
+                                     zebra_rec_keys_t reckeys,
+                                     zebra_snippets *snippets)
 {
     NMEM nmem = nmem_create();
     if (zebra_rec_keys_rewind(reckeys)) 
index f04b623..d323286 100644 (file)
@@ -1,4 +1,4 @@
-/* $Id: index.h,v 1.180 2006-10-29 17:20:01 adam Exp $
+/* $Id: index.h,v 1.181 2006-11-09 14:39:24 adam Exp $
    Copyright (C) 1995-2006
    Index Data ApS
 
@@ -392,8 +392,8 @@ YAZ_EXPORT void zebra_create_stream_fd(struct ZebraRecStream *stream,
                                        int fd, off_t start_offset);
 void print_rec_keys(ZebraHandle zh, zebra_rec_keys_t reckeys);
 
-ZEBRA_RES zebra_snippets_rec_keys(ZebraHandle zh, zebra_rec_keys_t reckeys,
-                                 zebra_snippets *snippets);
+ZEBRA_RES zebra_rec_keys_to_snippets(ZebraHandle zh, zebra_rec_keys_t reckeys,
+                                     zebra_snippets *snippets);
 ZEBRA_RES zebra_snippets_hit_vector(ZebraHandle zh, const char *setname,
                                    zint sysno, zebra_snippets *snippets);
 
index e59ccaa..ca3cc74 100644 (file)
@@ -1,4 +1,4 @@
-/* $Id: retrieve.c,v 1.45 2006-09-15 10:45:13 adam Exp $
+/* $Id: retrieve.c,v 1.46 2006-11-09 14:39:24 adam Exp $
    Copyright (C) 1995-2006
    Index Data ApS
 
@@ -33,23 +33,74 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #endif
 
 #include "index.h"
+#include <yaz/diagbib1.h>
 #include <direntz.h>
 
-int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score,
-                       zebra_snippets *hit_snippet, ODR odr,
-                       oid_value input_format, Z_RecordComposition *comp,
-                       oid_value *output_format, char **rec_bufp,
-                       int *rec_lenp, char **basenamep,
-                       char **addinfo)
+int zebra_storedata_fetch(ZebraHandle zh, SYSNO sysno, ODR odr,
+                          Record rec,
+                          const char *element_set,
+                          oid_value input_format,
+                          oid_value *output_format,
+                          char **rec_bufp, int *rec_lenp)
+{
+    WRBUF wrbuf = wrbuf_alloc();
+    zebra_rec_keys_t keys = zebra_rec_keys_open();
+    zebra_rec_keys_set_buf(keys,
+                           rec->info[recInfo_delKeys],
+                           rec->size[recInfo_delKeys],
+                           0);
+    if (zebra_rec_keys_rewind(keys))
+    {
+        size_t slen;
+        const char *str;
+        struct it_key key_in;
+        while(zebra_rec_keys_read(keys, &str, &slen, &key_in))
+        {
+            int i;
+            int ord = CAST_ZINT_TO_INT(key_in.mem[0]);
+            int index_type;
+            const char *db = 0;
+            const char *string_index = 0;
+            char dst_buf[IT_MAX_WORD];
+            
+            zebraExplain_lookup_ord(zh->reg->zei, ord, &index_type, &db,
+                                    &string_index);
+            
+            if (string_index)
+                wrbuf_printf(wrbuf, "%s", string_index);
+            
+            zebra_term_untrans(zh, index_type, dst_buf, str);
+            wrbuf_printf(wrbuf, " %s", dst_buf);
+            
+            for (i = 1; i < key_in.len; i++)
+                wrbuf_printf(wrbuf, " " ZINT_FORMAT, key_in.mem[i]);
+            wrbuf_printf(wrbuf, "\n");
+            
+        }
+    }
+    *output_format = VAL_SUTRS;
+    *rec_lenp = wrbuf_len(wrbuf);
+    *rec_bufp = odr_malloc(odr, *rec_lenp);
+    memcpy(*rec_bufp, wrbuf_buf(wrbuf), *rec_lenp);
+    wrbuf_free(wrbuf, 1);
+    zebra_rec_keys_close(keys);
+    return 0;
+}
+                          
+int zebra_record_fetch(ZebraHandle zh, SYSNO sysno, int score,
+                       zebra_snippets *hit_snippet, ODR odr,
+                       oid_value input_format, Z_RecordComposition *comp,
+                       oid_value *output_format,
+                       char **rec_bufp, int *rec_lenp, char **basenamep,
+                       char **addinfo)
 {
     Record rec;
     char *fname, *file_type, *basename;
-    RecType rt;
-    struct recRetrieveCtrl retrieveCtrl;
     struct ZebraRecStream stream;
     RecordAttr *recordAttr;
     void *clientData;
     int raw_mode = 0;
+    int return_code = 0;
 
     *basenamep = 0;
     *addinfo = 0;
@@ -69,7 +120,7 @@ int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score,
     {
         yaz_log (YLOG_DEBUG, "rec_get fail on sysno=" ZINT_FORMAT, sysno);
         *basenamep = 0;
-        return 14;
+        return YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS;
     }
     recordAttr = rec_init_attr (zh->reg->zei, rec);
 
@@ -79,86 +130,31 @@ int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score,
     *basenamep = (char *) odr_malloc (odr, strlen(basename)+1);
     strcpy (*basenamep, basename);
 
-    if (comp && comp->which == Z_RecordComp_simple &&
-        comp->u.simple->which == Z_ElementSetNames_generic && 
-        !strcmp (comp->u.simple->u.generic, "_storekeys_"))
+    if (comp && comp->which == Z_RecordComp_simple 
+        && comp->u.simple->which == Z_ElementSetNames_generic 
+        && strncmp(comp->u.simple->u.generic, "zebra:", 6) == 0)
     {
-       WRBUF wrbuf = wrbuf_alloc();
-       zebra_rec_keys_t keys = zebra_rec_keys_open();
-       zebra_rec_keys_set_buf(keys,
-                              rec->info[recInfo_delKeys],
-                              rec->size[recInfo_delKeys],
-                              0);
-       if (zebra_rec_keys_rewind(keys))
-       {
-           size_t slen;
-           const char *str;
-           struct it_key key_in;
-           while(zebra_rec_keys_read(keys, &str, &slen, &key_in))
-           {
-               int i;
-               int ord = CAST_ZINT_TO_INT(key_in.mem[0]);
-               int index_type;
-               const char *db = 0;
-               int set = 0;
-               int use = 0;
-               const char *string_index = 0;
-               char dst_buf[IT_MAX_WORD];
-               
-               zebraExplain_lookup_ord(zh->reg->zei, ord, &index_type, &db,
-                                       &string_index);
-
-               if (string_index)
-                   wrbuf_printf(wrbuf, "%s", string_index);
-               else
-                   wrbuf_printf(wrbuf, "set=%d,use=%d", set, use);
+        int r = zebra_storedata_fetch(zh, sysno, odr, rec,
+                                      comp->u.simple->u.generic,
+                                      input_format, output_format,
+                                      rec_bufp, rec_lenp);
 
-               zebra_term_untrans(zh, index_type, dst_buf, str);
-               wrbuf_printf(wrbuf, " %s", dst_buf);
-
-               for (i = 1; i < key_in.len; i++)
-                   wrbuf_printf(wrbuf, " " ZINT_FORMAT, key_in.mem[i]);
-               wrbuf_printf(wrbuf, "\n");
-
-           }
-       }
-       *output_format = VAL_SUTRS;
-       *rec_lenp = wrbuf_len(wrbuf);
-       *rec_bufp = odr_malloc(odr, *rec_lenp);
-       memcpy(*rec_bufp, wrbuf_buf(wrbuf), *rec_lenp);
-       wrbuf_free(wrbuf, 1);
-       zebra_rec_keys_close(keys);
-       return 0;
+        rec_free(&rec);
+        return r;
     }
+
     if (comp && comp->which == Z_RecordComp_simple &&
         comp->u.simple->which == Z_ElementSetNames_generic && 
         !strcmp (comp->u.simple->u.generic, "R"))
     {
        raw_mode = 1;
     }
-    if (!(rt = recType_byName (zh->reg->recTypes, zh->res,
-                              file_type, &clientData)))
-    {
-        yaz_log (YLOG_WARN, "Retrieve: Cannot handle type %s",  file_type);
-       return 14;
-    }
-    yaz_log (YLOG_DEBUG, "retrieve localno=" ZINT_FORMAT " score=%d", sysno,score);
-    retrieveCtrl.stream = &stream;
-    retrieveCtrl.fname = fname;
+    yaz_log (YLOG_DEBUG, "retrieve localno=" ZINT_FORMAT " score=%d",
+             sysno, score);
     if (rec->size[recInfo_storeData] > 0)
     {
         zebra_create_stream_mem(&stream, rec->info[recInfo_storeData],
                                 rec->size[recInfo_storeData]);
-       if (raw_mode)
-       {
-            *output_format = VAL_SUTRS;
-            *rec_lenp = rec->size[recInfo_storeData];
-                   *rec_bufp = (char *) odr_malloc(odr, *rec_lenp);
-           memcpy(*rec_bufp, rec->info[recInfo_storeData], *rec_lenp);
-            rec_free(&rec);
-            stream.destroy(&stream);
-           return 0;
-       }
     }
     else
     {
@@ -179,54 +175,52 @@ int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score,
             yaz_log (YLOG_WARN|YLOG_ERRNO, "Retrieve fail; missing file: %s",
                  full_rep);
             rec_free(&rec);
-            stream.destroy(&stream);
             return 14;
         }
-
         zebra_create_stream_fd(&stream, fd, recordAttr->recordOffset);
-       if (raw_mode)
-       {
-            *output_format = VAL_SUTRS;
-            *rec_lenp = recordAttr->recordSize;
-                   *rec_bufp = (char *) odr_malloc(odr, *rec_lenp);
-            stream.readf(&stream, *rec_bufp, *rec_lenp);
-            rec_free(&rec);
-            stream.destroy(&stream);
-            return 0;
-       }
     }
-    retrieveCtrl.localno = sysno;
-    retrieveCtrl.staticrank = recordAttr->staticrank;
-    retrieveCtrl.score = score;
-    retrieveCtrl.recordSize = recordAttr->recordSize;
-    retrieveCtrl.odr = odr;
-    retrieveCtrl.input_format = retrieveCtrl.output_format = input_format;
-    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();
-    
-    if (1)
+
+    if (raw_mode)
+    {
+        *output_format = VAL_SUTRS;
+        *rec_lenp = recordAttr->recordSize;
+        *rec_bufp = (char *) odr_malloc(odr, *rec_lenp);
+        stream.readf(&stream, *rec_bufp, *rec_lenp);
+    }
+    else
     {
        /* snippets code */
        zebra_snippets *snippet;
-
        zebra_rec_keys_t reckeys = zebra_rec_keys_open();
-       
+        RecType rt;
+        struct recRetrieveCtrl retrieveCtrl;
+
+        retrieveCtrl.stream = &stream;
+        retrieveCtrl.fname = fname;
+        retrieveCtrl.localno = sysno;
+        retrieveCtrl.staticrank = recordAttr->staticrank;
+        retrieveCtrl.score = score;
+        retrieveCtrl.recordSize = recordAttr->recordSize;
+        retrieveCtrl.odr = odr;
+        retrieveCtrl.input_format = retrieveCtrl.output_format = input_format;
+        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();
+
        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_to_snippets(zh, reckeys, retrieveCtrl.doc_snippet);
        zebra_rec_keys_close(reckeys);
 
-
 #if 0
        /* for debugging purposes */
        yaz_log(YLOG_LOG, "DOC SNIPPET:");
@@ -242,27 +236,29 @@ int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score,
        yaz_log(YLOG_LOG, "WINDOW SNIPPET:");
        zebra_snippets_log(snippet, YLOG_LOG);
 #endif
-       (*rt->retrieve)(clientData, &retrieveCtrl);
 
+        if (!(rt = recType_byName (zh->reg->recTypes, zh->res,
+                                   file_type, &clientData)))
+        {
+            return_code = YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS;
+        }
+        else
+        {
+            (*rt->retrieve)(clientData, &retrieveCtrl);
+            return_code = retrieveCtrl.diagnostic;
+
+            *output_format = retrieveCtrl.output_format;
+            *rec_bufp = (char *) retrieveCtrl.rec_buf;
+            *rec_lenp = retrieveCtrl.rec_len;
+            *addinfo = retrieveCtrl.addinfo;
+        }
        zebra_snippets_destroy(snippet);
+        zebra_snippets_destroy(retrieveCtrl.doc_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;
-
     stream.destroy(&stream);
-
     rec_free(&rec);
 
-    *addinfo = retrieveCtrl.addinfo;
-    return retrieveCtrl.diagnostic;
+    return return_code;
 }
 
 /*