X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fretrieve.c;h=175a1abb22b01d3c53d11520f21075a096885bd0;hb=7b2fe71e5eb87d3c8563d6f2e7c5999770c89350;hp=ff3bced3d0cbdd74a44d7fe08be345a6648b3c59;hpb=8d18c2ba52018f0a4149abb5e2bd2bb2c75fe14e;p=idzebra-moved-to-github.git

diff --git a/index/retrieve.c b/index/retrieve.c
index ff3bced..175a1ab 100644
--- a/index/retrieve.c
+++ b/index/retrieve.c
@@ -1,4 +1,4 @@
-/* $Id: retrieve.c,v 1.82 2007-12-05 09:55:57 adam Exp $
+/* $Id: retrieve.c,v 1.84 2008-01-24 16:17:29 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -394,36 +394,35 @@ int zebra_special_index_fetch(ZebraHandle zh, zint sysno, ODR odr,
                 if (retrieval_type == 0 
                     || !strcmp(retrieval_type_cstr, index_type))
                 {
-                    zebra_term_untrans(zh, index_type, dst_buf, str);
-                    if (strlen(dst_buf))
+                    if (zebra_term_untrans(zh, index_type, dst_buf, str))
+                        *dst_buf = '\0'; /* untrans failed */
+
+                    if (!oid_oidcmp(input_format, yaz_oid_recsyn_xml))
                     {
-                        if (!oid_oidcmp(input_format, yaz_oid_recsyn_xml))
-                        {
-                            wrbuf_printf(wrbuf, "  <index name=\"%s\"", 
-                                         string_index);
-                            
-                            wrbuf_printf(wrbuf, " type=\"%s\"", index_type);
-                            
-                            wrbuf_printf(wrbuf, " seq=\"" ZINT_FORMAT "\">", 
-                                         key_in.mem[key_in.len -1]);
+                        wrbuf_printf(wrbuf, "  <index name=\"%s\"", 
+                                     string_index);
                         
-                            wrbuf_xmlputs(wrbuf, dst_buf);
-                            wrbuf_printf(wrbuf, "</index>\n");
-                        }
-                        else 
-                        {
-                            wrbuf_printf(wrbuf, "%s ", string_index);
-                            
-                            wrbuf_printf(wrbuf, "%s", index_type);
-                            
-                            for (i = 1; i < key_in.len; i++)
-                                wrbuf_printf(wrbuf, " " ZINT_FORMAT, 
+                        wrbuf_printf(wrbuf, " type=\"%s\"", index_type);
+                        
+                        wrbuf_printf(wrbuf, " seq=\"" ZINT_FORMAT "\">", 
+                                     key_in.mem[key_in.len -1]);
+                        wrbuf_xmlputs(wrbuf, dst_buf);
+                        wrbuf_printf(wrbuf, "</index>\n");
+                    }
+                    else 
+                    {
+                        wrbuf_printf(wrbuf, "%s ", string_index);
+                        
+                        wrbuf_printf(wrbuf, "%s", index_type);
+                        
+                        for (i = 1; i < key_in.len; i++)
+                            wrbuf_printf(wrbuf, " " ZINT_FORMAT, 
                                              key_in.mem[i]);
-                            
-                            wrbuf_printf(wrbuf, " %s", dst_buf);
                         
-                            wrbuf_printf(wrbuf, "\n");
-                        }
+                        wrbuf_printf(wrbuf, " %s", dst_buf);
+                        
+                        wrbuf_printf(wrbuf, "\n");
+
                     }
                     
                 }
@@ -789,6 +788,7 @@ static ZEBRA_RES facet_fetch(ZebraHandle zh, const char *setname,
     }
     else
     {
+        yaz_timing_t timing = yaz_timing_create();
         zebra_strmap_t *map_array
             = odr_malloc(odr, sizeof *map_array * no_ord);
         for (i = 0; i < no_ord; i++)
@@ -847,6 +847,10 @@ static ZEBRA_RES facet_fetch(ZebraHandle zh, const char *setname,
                 rec_free(&rec);
             }
         }
+        yaz_timing_stop(timing);
+        yaz_log(YLOG_LOG, "facet first phase real=%4.2f",
+                yaz_timing_get_real(timing));
+        yaz_timing_start(timing);
         if (use_xml)
             wrbuf_puts(wr, "<facets>\n");
         for (spec = spec_list, i = 0; i < no_ord; i++, spec = spec->next)
@@ -904,9 +908,11 @@ static ZEBRA_RES facet_fetch(ZebraHandle zh, const char *setname,
             wrbuf_puts(wr, "</facets>\n");
         for (i = 0; i < no_ord; i++)
             zebra_strmap_destroy(map_array[i]);
+        yaz_timing_stop(timing);
+        yaz_log(YLOG_LOG, "facet second phase real=%4.2f",
+                yaz_timing_get_real(timing));
+        yaz_timing_destroy(&timing);
     }
-    
-
     *rec_bufp = odr_strdup(odr, wrbuf_cstr(wr));
     wrbuf_destroy(wr);
     *rec_lenp = strlen(*rec_bufp);