X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fsession.c;h=ce5c635f67a23742ca464ab79ab8ac7ba80d831b;hb=b7c5f432169f9b532ad006c369e28631cdf3c8ce;hp=94ffdd299187d69f579ef68b8191825d4f79a121;hpb=8ffa7e44afe1ae74ec07278d0bcc93b388c39871;p=pazpar2-moved-to-github.git

diff --git a/src/session.c b/src/session.c
index 94ffdd2..ce5c635 100644
--- a/src/session.c
+++ b/src/session.c
@@ -359,7 +359,7 @@ static int prepare_map(struct session *se, struct session_database *sdb)
             }
         }
         sdb->map = normalize_cache_get(se->normalize_cache,
-                                       se->service, s);
+                                       se->service->server->config, s);
         if (!sdb->map)
             return -1;
     }
@@ -462,16 +462,24 @@ static void select_targets_callback(void *context, struct session_database *db)
 
 static void session_remove_clients(struct session *se)
 {
-    struct client_list *l = se->clients;
+    struct client_list *l;
+
+    session_enter(se);
+    l = se->clients;
+    se->clients = 0;
+    session_leave(se);
+
     while (l)
     {
         struct client_list *l_next = l->next;
+        client_lock(l->client);
         client_set_session(l->client, 0);
+        client_set_database(l->client, 0);
+        client_unlock(l->client);
         client_destroy(l->client);
         xfree(l);
         l = l_next;
     }
-    se->clients = 0;
 }
 
 // Associates a set of clients with a session;
@@ -479,7 +487,6 @@ static void session_remove_clients(struct session *se)
 // setting overrides
 static int select_targets(struct session *se, const char *filter)
 {
-    session_remove_clients(se);
     return session_grep_databases(se, filter, select_targets_callback);
 }
 
@@ -510,12 +517,14 @@ enum pazpar2_error_code search(struct session *se,
     yaz_log(YLOG_DEBUG, "Search");
 
     *addinfo = 0;
+
+    session_remove_clients(se);
     
     session_enter(se);
     reclist_destroy(se->reclist);
     se->reclist = 0;
-    nmem_reset(se->nmem);
     relevance_destroy(&se->relevance);
+    nmem_reset(se->nmem);
     se->total_records = se->total_hits = se->total_merged = 0;
     se->num_termlists = 0;
     live_channels = select_targets(se, filter);
@@ -529,14 +538,14 @@ enum pazpar2_error_code search(struct session *se,
     for (l = se->clients; l; l = l->next)
     {
         struct client *cl = l->client;
+
         if (maxrecs)
             client_set_maxrecs(cl, atoi(maxrecs));
         if (startrecs)
             client_set_startrecs(cl, atoi(startrecs));
         if (prepare_session_database(se, client_get_database(cl)) < 0)
-            continue;
-        // Parse query for target
-        if (client_parse_query(cl, query) < 0)
+            ;
+        else if (client_parse_query(cl, query) < 0)
             no_failed++;
         else
         {
@@ -660,6 +669,7 @@ void destroy_session(struct session *s)
 {
     struct session_database *sdb;
 
+    yaz_log(YLOG_DEBUG, "%p Pazpar2 session destroy", s);
     session_remove_clients(s);
 
     for (sdb = s->databases; sdb; sdb = sdb->next)
@@ -679,7 +689,7 @@ struct session *new_session(NMEM nmem, struct conf_service *service,
     int i;
     struct session *session = nmem_malloc(nmem, sizeof(*session));
 
-    yaz_log(YLOG_DEBUG, "New Pazpar2 session");
+    yaz_log(YLOG_DEBUG, "%p New Pazpar2 session", session);
 
     session->service = service;
     session->relevance = 0;
@@ -1127,7 +1137,7 @@ int ingest_record(struct client *cl, const char *rec,
                   int record_no, NMEM nmem)
 {
     struct session *se = client_get_session(cl);
-    int ret;
+    int ret = 0;
     struct session_database *sdb = client_get_database(cl);
     struct conf_service *service = se->service;
     xmlDoc *xdoc = normalize_record(sdb, service, rec, nmem);
@@ -1154,9 +1164,14 @@ int ingest_record(struct client *cl, const char *rec,
         xmlFreeDoc(xdoc);
         return -1;
     }
+    client_unlock(cl);
     session_enter(se);
-    ret = ingest_to_cluster(cl, xdoc, root, record_no, mergekey_norm);
+    client_lock(cl);
+    if (client_get_session(cl) == se)
+        ret = ingest_to_cluster(cl, xdoc, root, record_no, mergekey_norm);
+    client_unlock(cl);
     session_leave(se);
+    client_lock(cl);
     
     xmlFreeDoc(xdoc);
     return ret;