From 8878d0d82a59aaa49bdf9b225cdd64a3d1ba1557 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 3 Jul 2015 11:55:27 +0200
Subject: [PATCH] ID facet term map tested

---
 src/client.c  |    3 ++-
 src/session.c |   22 ++++++++++++++++------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/client.c b/src/client.c
index e446632..644e42d 100644
--- a/src/client.c
+++ b/src/client.c
@@ -1381,7 +1381,8 @@ static int apply_limit(struct client *cl,
                 for (i = 0; i < num; i++)
                 {
                     const char *id = session_lookup_id_facet(cl->session,
-                                                             cl, p, values[i]);
+                                                             cl, name,
+                                                             values[i]);
                     if (id)
                         values[i] = nmem_strdup(nmem_tmp, id);
                 }
diff --git a/src/session.c b/src/session.c
index 6b95835..e8ef2d4 100644
--- a/src/session.c
+++ b/src/session.c
@@ -212,18 +212,21 @@ struct facet_id {
 };
 
 static void session_add_id_facet(struct session *s, struct client *cl,
-                          const char *type,
-                          const char *id,
-                          const char *term)
+                                 const char *type,
+                                 const char *id,
+                                 size_t id_len,
+                                 const char *term)
 {
     struct facet_id *t = nmem_malloc(s->session_nmem, sizeof(*t));
 
     t->client_id = nmem_strdup(s->session_nmem, client_get_id(cl));
     t->type = nmem_strdup(s->session_nmem, type);
-    t->id = nmem_strdup(s->session_nmem, id);
+    t->id = nmem_strdupn(s->session_nmem, id, id_len);
     t->term = nmem_strdup(s->session_nmem, term);
     t->next = s->facet_id_list;
     s->facet_id_list = t;
+    yaz_log(YLOG_LOG, "session_add_id_facet cl=%s type=%s id=%s term=%s",
+            client_get_id(cl), type, id, term);
 }
 
 
@@ -232,10 +235,16 @@ const char *session_lookup_id_facet(struct session *s, struct client *cl,
                                     const char *term)
 {
     struct facet_id *t = s->facet_id_list;
+    yaz_log(YLOG_LOG, "session_lookup_id_facet cl=%s type=%s term=%s",
+            client_get_id(cl), type, term);
     for (; t; t = t->next)
-        if (!strcmp(client_get_id(cl), t->id) &&
+        if (!strcmp(client_get_id(cl), t->client_id) &&
             !strcmp(t->type, type) && !strcmp(t->term, term))
+        {
+            yaz_log(YLOG_LOG, " returns id=%s", t->id);
             return t->id;
+        }
+    yaz_log(YLOG_LOG, " returns 0");
     return 0;
 }
 
@@ -280,7 +289,8 @@ void add_facet(struct session *s, const char *type, const char *value, int count
         termlist_insert((*tp)->termlist, wrbuf_cstr(display_wrbuf),
                         wrbuf_cstr(facet_wrbuf), id, id_len, count);
         if (id)
-            session_add_id_facet(s, cl, type, id, wrbuf_cstr(display_wrbuf));
+            session_add_id_facet(s, cl, type, id, id_len,
+                                 wrbuf_cstr(display_wrbuf));
     }
     wrbuf_destroy(facet_wrbuf);
     wrbuf_destroy(display_wrbuf);
-- 
1.7.10.4