X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fzoom-c.c;h=383b344f3e8d72a034af63df7ee9cb636794e238;hb=a91467db0bbbaefbaf64410b657a9439104997e0;hp=28eb79820e754efa502f978772b2da8aa8c8c998;hpb=dd016baf50d8cd02a1a32d1fd10b5544cae6ff96;p=yaz-moved-to-github.git

diff --git a/src/zoom-c.c b/src/zoom-c.c
index 28eb798..383b344 100644
--- a/src/zoom-c.c
+++ b/src/zoom-c.c
@@ -686,8 +686,9 @@ ZOOM_resultset ZOOM_resultset_create(void)
     r->connection = 0;
     r->databaseNames = 0;
     r->num_databaseNames = 0;
-    r->facets = 0;
-    r->num_facets = 0;
+    r->req_facets = 0;
+    r->res_facets = 0;
+    r->num_res_facets = 0;
     r->facets_names = 0;
     r->mutex = 0;
     yaz_mutex_create(&r->mutex);
@@ -723,7 +724,7 @@ ZOOM_API(ZOOM_resultset)
     const char *cp;
     ZOOM_task task;
     int start, count;
-    const char *syntax, *elementSetName, *schema;
+    const char *syntax, *elementSetName, *schema, *facets;
     yaz_log(c->log_api, "%p ZOOM_connection_search set %p query %p", c, r, q);
     r->r_sort_spec = ZOOM_query_get_sortspec(q);
     r->query = q;
@@ -731,6 +732,8 @@ ZOOM_API(ZOOM_resultset)
 
     r->options = ZOOM_options_create_with_parent(c->options);
 
+    r->req_facets = odr_strdup_null(r->odr, 
+                                    ZOOM_options_get(r->options, "facets"));
     start = ZOOM_options_get_int(r->options, "start", 0);
     count = ZOOM_options_get_int(r->options, "count", 0);
     {
@@ -980,14 +983,14 @@ ZOOM_API(void)
 ZOOM_API(size_t)
     ZOOM_resultset_facets_size(ZOOM_resultset r)
 {
-    return r->num_facets;
+    return r->num_res_facets;
 }
 
 ZOOM_API(ZOOM_facet_field)
     ZOOM_resultset_get_facet_field(ZOOM_resultset r, const char *name)
 {
-    int num = r->num_facets;
-    ZOOM_facet_field *facets = r->facets;
+    int num = r->num_res_facets;
+    ZOOM_facet_field *facets = r->res_facets;
     int i;
     for (i = 0; i < num; i++)
         if (!strcmp(facets[i]->facet_name, name))
@@ -998,8 +1001,8 @@ ZOOM_API(ZOOM_facet_field)
 ZOOM_API(ZOOM_facet_field)
     ZOOM_resultset_get_facet_field_by_index(ZOOM_resultset r, int idx)
 {
-    int num = r->num_facets;
-    ZOOM_facet_field *facets = r->facets;
+    int num = r->num_res_facets;
+    ZOOM_facet_field *facets = r->res_facets;
     if (idx >= 0 && idx < num)
         return facets[idx];
     return 0;
@@ -1008,7 +1011,7 @@ ZOOM_API(ZOOM_facet_field)
 ZOOM_API(ZOOM_facet_field *)
     ZOOM_resultset_facets(ZOOM_resultset r)
 {
-    return r->facets;
+    return r->res_facets;
 }
 
 ZOOM_API(const char**)