Using WRBUF for additional info stuff for retrieval

diff --git a/index/retrieve.c b/index/retrieve.c
index fcf6c76..aed2060 100644 (file)
--- a/index/retrieve.c
+++ b/index/retrieve.c
@@ -302,7 +302,7 @@ int zebra_special_sort_fetch(
     }
 }
                             
-int zebra_special_index_fetch(
+static int special_index_fetch(
     struct special_fetch_s *fi, const char *elemsetname,
     const Odr_oid *input_format,
     const Odr_oid **output_format,
@@ -613,7 +613,7 @@ struct term_collect {
     zint set_occur;
 };
 
-zint freq_term(ZebraHandle zh, int ord, const char *term, RSET rset_set)
+static zint freq_term(ZebraHandle zh, int ord, const char *term, RSET rset_set)
 {
     struct rset_key_control *kc = zebra_key_control_create(zh);
     char ord_buf[IT_MAX_WORD];
@@ -646,7 +646,7 @@ zint freq_term(ZebraHandle zh, int ord, const char *term, RSET rset_set)
     return hits;
 }
 
-int term_qsort_handle(const void *a, const void *b)
+static int term_qsort_handle(const void *a, const void *b)
 {
     const struct term_collect *l = a;
     const struct term_collect *r = b;
@@ -662,9 +662,9 @@ int term_qsort_handle(const void *a, const void *b)
     }
 }
 
-void term_collect_freq(ZebraHandle zh,
-                       struct term_collect *col, int no_terms_collect,
-                       int ord, RSET rset)
+static void term_collect_freq(ZebraHandle zh,
+                              struct term_collect *col, int no_terms_collect,
+                              int ord, RSET rset)
 {
     int i;
     for (i = 0; i < no_terms_collect; i++)
@@ -675,9 +675,9 @@ void term_collect_freq(ZebraHandle zh,
     qsort(col, no_terms_collect, sizeof(*col), term_qsort_handle);
 }
 
-struct term_collect *term_collect_create(zebra_strmap_t sm, 
-                                         int no_terms_collect,
-                                         NMEM nmem)
+static struct term_collect *term_collect_create(zebra_strmap_t sm, 
+                                                int no_terms_collect,
+                                                NMEM nmem)
 {
     const char *term;
     void *data_buf;
@@ -717,7 +717,7 @@ struct term_collect *term_collect_create(zebra_strmap_t sm,
     return col;
 }
 
-static ZEBRA_RES facet_fetch(
+static int facet_fetch(
     struct special_fetch_s *fi, const char *elemsetname,
     const Odr_oid *input_format,
     const Odr_oid **output_format,
@@ -748,23 +748,13 @@ static ZEBRA_RES facet_fetch(
               
     if (!spec_list || error)
     {
-        zebra_setError(
-            zh, 
-            YAZ_BIB1_SPECIFIED_ELEMENT_SET_NAME_NOT_VALID_FOR_SPECIFIED_,
-            0);
-        return ZEBRA_FAIL;
+        return YAZ_BIB1_SPECIFIED_ELEMENT_SET_NAME_NOT_VALID_FOR_SPECIFIED_;
     }          
   
     for (spec = spec_list; spec; spec = spec->next)
     {
         if (!spec->index_type)
-        {
-            zebra_setError(
-                zh, 
-                YAZ_BIB1_SPECIFIED_ELEMENT_SET_NAME_NOT_VALID_FOR_SPECIFIED_,
-                0);
-            return ZEBRA_FAIL;
-        }
+            return YAZ_BIB1_SPECIFIED_ELEMENT_SET_NAME_NOT_VALID_FOR_SPECIFIED_;
         no_ord++;
     }
 
@@ -778,11 +768,7 @@ static ZEBRA_RES facet_fetch(
                                                spec->index_name);
         if (ord == -1)
         {
-            zebra_setError(
-                zh, 
-                YAZ_BIB1_SPECIFIED_ELEMENT_SET_NAME_NOT_VALID_FOR_SPECIFIED_,
-                0);
-            return ZEBRA_FAIL;
+            return YAZ_BIB1_SPECIFIED_ELEMENT_SET_NAME_NOT_VALID_FOR_SPECIFIED_;
         }
         ord_array[i] = ord;
     }
@@ -792,9 +778,8 @@ static ZEBRA_RES facet_fetch(
     poset = zebra_meta_records_create(zh, fi->setname, num_recs, pos_array);
     if (!poset)
     {
-       zebra_setError(zh, YAZ_BIB1_SPECIFIED_RESULT_SET_DOES_NOT_EXIST,
-                      fi->setname);
-       ret = ZEBRA_FAIL;
+        wrbuf_puts(addinfo, fi->setname);
+       return YAZ_BIB1_SPECIFIED_RESULT_SET_DOES_NOT_EXIST;
     }
     else
     {
@@ -933,12 +918,11 @@ static ZEBRA_RES facet_fetch(
 }
 
 
-int zebra_special_fetch(
+static int zebra_special_fetch(
     void *handle, const char *elemsetname,
     const Odr_oid *input_format,
     const Odr_oid **output_format,
-    WRBUF result, WRBUF addinfo
-    )
+    WRBUF result, WRBUF addinfo)
 {
     Record rec = 0;
     struct special_fetch_s *fi = (struct special_fetch_s *) handle;
@@ -1088,7 +1072,7 @@ int zebra_special_fetch(
     /* processing special elementsetnames zebra::index:: */
     if (elemsetname && 0 == strncmp(elemsetname, "index", 5))
     {
-        int ret = zebra_special_index_fetch(
+        int ret = special_index_fetch(
             fi, elemsetname + 5,
             input_format, output_format,
             result, addinfo, rec);

diff --git a/index/zebraapi.c b/index/zebraapi.c
index b4026fd..f656af4 100644 (file)
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -1123,11 +1123,18 @@ ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream,
     }
     else
     {
-       for (i = 0; i<num_recs; i++)
+        WRBUF addinfo_w = wrbuf_alloc();
+       for (i = 0; i < num_recs; i++)
        {
+            recs[i].errCode = 0;
+            recs[i].errString = 0;
+            recs[i].format = 0;
+            recs[i].len = 0;
+            recs[i].buf = 0;
+            recs[i].base = 0;
+            recs[i].sysno = poset[i].term;
            if (poset[i].term)
            {
-               recs[i].errCode = 0;
                recs[i].format = yaz_oid_recsyn_sutrs;
                recs[i].len = strlen(poset[i].term);
                recs[i].buf = poset[i].term;
@@ -1145,13 +1152,17 @@ ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream,
                zebra_snippets_hit_vector(zh, setname, poset[i].sysno, 
                                          hit_snippet);
 #endif
+                wrbuf_rewind(addinfo_w);
                recs[i].errCode =
                    zebra_record_fetch(zh, setname,
                                        poset[i].sysno, poset[i].score,
                                       stream, input_format, comp,
                                       &recs[i].format, &buf, &len,
-                                      &recs[i].base, &recs[i].errString);
+                                      &recs[i].base, addinfo_w);
                
+                if (wrbuf_len(addinfo_w))
+                    recs[i].errString =
+                        odr_strdup(stream, wrbuf_cstr(addinfo_w));
                recs[i].len = len;
                if (len > 0)
                {
@@ -1161,7 +1172,6 @@ ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream,
                else
                    recs[i].buf = buf;
                 recs[i].score = poset[i].score;
-                recs[i].sysno = poset[i].sysno;
                zebra_snippets_destroy(hit_snippet);
            }
            else
@@ -1175,14 +1185,10 @@ ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream,
                    ret = ZEBRA_FAIL;
                    break;
                }
-               recs[i].buf = 0;  /* no record and no error issued */
-               recs[i].len = 0;
-               recs[i].errCode = 0;
-               recs[i].format = 0;
-               recs[i].sysno = 0;
            }
        }
        zebra_meta_records_destroy(zh, poset, num_recs);
+        wrbuf_destroy(addinfo_w);
     }
     zebra_end_read(zh);
     xfree(pos_array);