From: Dennis Schafroth <dennis@indexdata.com>
Date: Fri, 4 Nov 2011 12:05:30 +0000 (+0100)
Subject: fix merge
X-Git-Tag: mobile-beta-1~18^2~1
X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=commitdiff_plain;h=c61b8edfe5b60d9394f4db7e26d6c08fec9d1452;hp=672e5173cc31fc94a8f03ab97693895961c01a16;p=pazpar2-moved-to-github.git

fix merge
---

diff --git a/src/client.c b/src/client.c
index b5ef75d..5df785d 100644
--- a/src/client.c
+++ b/src/client.c
@@ -180,6 +180,7 @@ void client_set_state(struct client *cl, enum client_state st)
         if (no_active == 0) {
             session_alert_watch(cl->session, SESSION_WATCH_SHOW);
             session_alert_watch(cl->session, SESSION_WATCH_BYTARGET);
+            session_alert_watch(cl->session, SESSION_WATCH_TERMLIST);
             session_alert_watch(cl->session, SESSION_WATCH_SHOW_PREF);
         }
     }
@@ -551,6 +552,7 @@ void client_got_records(struct client *cl)
         client_unlock(cl);
         session_alert_watch(se, SESSION_WATCH_SHOW);
         session_alert_watch(se, SESSION_WATCH_BYTARGET);
+        session_alert_watch(se, SESSION_WATCH_TERMLIST);
         session_alert_watch(se, SESSION_WATCH_RECORD);
         client_lock(cl);
     }
diff --git a/src/http_command.c b/src/http_command.c
index 6f04346..1d1f48a 100644
--- a/src/http_command.c
+++ b/src/http_command.c
@@ -534,7 +534,8 @@ static void termlist_response(struct http_channel *c)
 
 static void termlist_result_ready(void *data)
 {
-    struct http_channel *c = (struct http_channel *) data;
+    struct http_channel *c = (struct http_channel) data;
+    yaz_log(c->http_sessions->log_level, "termlist watch released");
     termlist_response(c);
 }
 
@@ -573,7 +574,7 @@ static void cmd_termlist(struct http_channel *c)
 
 size_t session_get_memory_status(struct session *session);
 
-static void session_status(struct http_channel *c, struct http_session *s)
+static void         (struct http_channel *c, struct http_session *s)
 {
     size_t session_nmem;
     wrbuf_printf(c->wrbuf, "<http_count>%u</http_count>\n", s->activity_counter);
@@ -940,7 +941,7 @@ static void cmd_record(struct http_channel *c)
 static void cmd_record_ready(void *data)
 {
     struct http_channel *c = (struct http_channel *) data;
-
+    yaz_log(c->http_sessions->log_level, "record watch released");
     cmd_record(c);
 }
 
@@ -1022,7 +1023,7 @@ static void show_records(struct http_channel *c, int active)
 static void show_records_ready(void *data)
 {
     struct http_channel *c = (struct http_channel *) data;
-
+    yaz_log(c->http_sessions->log_level, "show watch released");
     show_records(c, -1);
 }