Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2

diff --combined src/client.c
index d145dd8,2113f9d..b3500de
--- 1/src/client.c
--- 2/src/client.c
+++ b/src/client.c
@@@ -139,14 -139,12 +139,12 @@@ void client_set_state(struct client *cl
      cl->state = st;
      /* no need to check for all client being non-active if this one
         already is. Note that session_active_clients also LOCKS session */
- #if 0
      if (!client_is_active(cl) && cl->session)
      {
          int no_active = session_active_clients(cl->session);
          if (no_active == 0)
              session_alert_watch(cl->session, SESSION_WATCH_SHOW);
      }
- #endif
  }
  
  static void client_show_raw_error(struct client *cl, const char *addinfo);
@@@ -817,7 -815,6 +815,7 @@@ int client_parse_query(struct client *c
      else
          cl->cqlquery = 0;
  
 +    /* TODO FIX Not thread safe */
      if (!se->relevance)
      {
          // Initialize relevance structure with query terms