X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fretrieve.c;h=26279985967edf10f2a6e1fb9bb9f148df25b25f;hb=4e67b823f05b521f193af096a40c0f64758c5fc1;hp=1d9988341b676cea66eb3096ff21be471e63edc8;hpb=775bf7d99438335ba135b673dfb3e19fe9bcba24;p=idzebra-moved-to-github.git

diff --git a/index/retrieve.c b/index/retrieve.c
index 1d99883..2627998 100644
--- a/index/retrieve.c
+++ b/index/retrieve.c
@@ -1,4 +1,4 @@
-/* $Id: retrieve.c,v 1.64 2007-02-02 12:16:38 adam Exp $
+/* $Id: retrieve.c,v 1.67 2007-03-19 21:50:39 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -208,7 +208,7 @@ int zebra_special_sort_fetch(ZebraHandle zh, zint sysno, ODR odr,
         *rec_lenp = wrbuf_len(wrbuf);
         *rec_bufp = odr_malloc(odr, *rec_lenp);
         memcpy(*rec_bufp, wrbuf_buf(wrbuf), *rec_lenp);
-        wrbuf_free(wrbuf, 1);
+        wrbuf_destroy(wrbuf);
         return 0;
     }
 }
@@ -224,8 +224,8 @@ int zebra_special_index_fetch(ZebraHandle zh, zint sysno, ODR odr,
     size_t retrieval_index_len; 
     const char *retrieval_type;
     size_t retrieval_type_len;
-    WRBUF wrbuf = 0;
     zebra_rec_keys_t keys;
+    int ret_code = 0;
     
     /* set output variables before processing possible error states */
     /* *rec_lenp = 0; */
@@ -271,12 +271,18 @@ int zebra_special_index_fetch(ZebraHandle zh, zint sysno, ODR odr,
     zebra_rec_keys_set_buf(keys, rec->info[recInfo_delKeys],
                            rec->size[recInfo_delKeys], 0);
 
-    wrbuf = wrbuf_alloc();
-    if (zebra_rec_keys_rewind(keys)){
+    if (!zebra_rec_keys_rewind(keys))
+    {
+        ret_code = 
+            YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS;
+    }
+    else
+    {
         size_t slen;
         const char *str;
         struct it_key key_in;
-
+        WRBUF wrbuf = wrbuf_alloc();
+    
         if (input_format == VAL_TEXT_XML)
         {
             *output_format = VAL_TEXT_XML;
@@ -350,13 +356,13 @@ int zebra_special_index_fetch(ZebraHandle zh, zint sysno, ODR odr,
         }
         if (input_format == VAL_TEXT_XML)
             wrbuf_printf(wrbuf, "</record>\n");
+        *rec_lenp = wrbuf_len(wrbuf);
+        *rec_bufp = odr_malloc(odr, *rec_lenp);
+        memcpy(*rec_bufp, wrbuf_buf(wrbuf), *rec_lenp);
+        wrbuf_destroy(wrbuf);
     }
-    *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;
+    return ret_code;
 }
 
 
@@ -422,10 +428,10 @@ int zebra_special_fetch(ZebraHandle zh, zint sysno, int score, ODR odr,
         }
 	*rec_lenp = wrbuf_len(wrbuf);
         if (*rec_lenp)
-            *rec_bufp = odr_strdup(odr, wrbuf_buf(wrbuf));
+            *rec_bufp = odr_strdup(odr, wrbuf_cstr(wrbuf));
         else
             ret = YAZ_BIB1_NO_SYNTAXES_AVAILABLE_FOR_THIS_REQUEST;
-        wrbuf_free(wrbuf, 1);
+        wrbuf_destroy(wrbuf);
         return ret;
     }
 
@@ -521,11 +527,11 @@ int zebra_special_fetch(ZebraHandle zh, zint sysno, int score, ODR odr,
         }
 	*rec_lenp = wrbuf_len(wrbuf);
         if (*rec_lenp)
-            *rec_bufp = odr_strdup(odr, wrbuf_buf(wrbuf));
+            *rec_bufp = odr_strdup(odr, wrbuf_cstr(wrbuf));
         else
             ret = YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS;
 
-        wrbuf_free(wrbuf, 1);
+        wrbuf_destroy(wrbuf);
         rec_free(&rec);
         return ret;
     }
@@ -596,10 +602,10 @@ int zebra_record_fetch(ZebraHandle zh, zint sysno, int score,
     yaz_log(YLOG_DEBUG, "retrieve localno=" ZINT_FORMAT " score=%d",
             sysno, score);
 
-    zebra_create_record_stream(zh, &rec, &stream);
-    
+    return_code = zebra_create_record_stream(zh, &rec, &stream);
+
+    if (rec)
     {
-	/* snippets code */
 	zebra_snippets *snippet;
 	zebra_rec_keys_t reckeys = zebra_rec_keys_open();
         RecType rt;
@@ -671,10 +677,10 @@ int zebra_record_fetch(ZebraHandle zh, zint sysno, int score,
 
 	zebra_snippets_destroy(snippet);
         zebra_snippets_destroy(retrieveCtrl.doc_snippet);
-     }
 
-    stream.destroy(&stream);
-    rec_free(&rec);
+        stream.destroy(&stream);
+        rec_free(&rec);
+    }
 
     return return_code;
 }