X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fretrieve.c;h=175a1abb22b01d3c53d11520f21075a096885bd0;hb=59f0ad65b51f783ba61b63b0c97e6003bafa84b3;hp=ea16718db4722c184a9d44ced259d751112d0518;hpb=a1f5729d06659c681dfd68d56c756478bbdcdf99;p=idzebra-moved-to-github.git

diff --git a/index/retrieve.c b/index/retrieve.c
index ea16718..175a1ab 100644
--- a/index/retrieve.c
+++ b/index/retrieve.c
@@ -1,4 +1,4 @@
-/* $Id: retrieve.c,v 1.81 2007-12-05 09:29:52 adam Exp $
+/* $Id: retrieve.c,v 1.84 2008-01-24 16:17:29 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -80,6 +80,7 @@ static int zebra_create_record_stream(ZebraHandle zh,
 struct index_spec {
     const char *index_name;
     const char *index_type;
+    const char *extra;
     struct index_spec *next;
 };
 
@@ -103,6 +104,7 @@ struct index_spec *parse_index_spec(const char *elem, NMEM nmem,
             struct index_spec *spec = nmem_malloc(nmem, sizeof(*spec));
             spec->index_type = 0;
             spec->next = 0;
+            spec->extra = 0;
 
             if (!first)
                 first = spec;
@@ -119,10 +121,19 @@ struct index_spec *parse_index_spec(const char *elem, NMEM nmem,
                 cp++;
                 cp0 = cp;
                 
-                while (*cp != '\0' && *cp != ',')
+                while (*cp != '\0' && *cp != ',' && *cp != ':')
                     cp++;
                 spec->index_type = nmem_strdupn(nmem, cp0, cp - cp0);
             }
+            if (*cp == ':') /* extra arguments */
+            {
+                cp++;
+                cp0 = cp;
+                
+                while (*cp != '\0' && *cp != ',' && *cp != ':')
+                    cp++;
+                spec->extra = nmem_strdupn(nmem, cp0, cp - cp0);
+            }
             if (*cp != ',')
                 break;
         }
@@ -383,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");
+
                     }
                     
                 }
@@ -710,7 +720,6 @@ static ZEBRA_RES facet_fetch(ZebraHandle zh, const char *setname,
     zint *pos_array;
     int i;
     int num_recs = 10; /* number of records to analyze */
-    int no_collect_terms = 20; /* number of term candidates */
     ZebraMetaRecord *poset;
     ZEBRA_RES ret = ZEBRA_OK;
     int *ord_array;
@@ -779,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++)
@@ -837,15 +847,24 @@ 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)
         {
             int j;
             NMEM nmem = nmem_create();
-            struct term_collect *col = term_collect_create(map_array[i], 
-                                                           no_collect_terms,
-                                                           nmem);
+            struct term_collect *col;
+            int no_collect_terms = 20;
+
+            if (spec->extra)
+                no_collect_terms = atoi(spec->extra);
+            if (no_collect_terms < 1)
+                no_collect_terms = 1;
+            col = term_collect_create(map_array[i], no_collect_terms, nmem);
             term_collect_freq(zh, col, no_collect_terms, ord_array[i],
                               resultSetRef(zh, setname));
             
@@ -889,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);