X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fsession.c;h=f3e71fe92e13ca58aafac0142853fe975950785a;hb=0a70ba6da785b09a4bb1a2a0db5576c157a5dae7;hp=fa4b4a6c88e17fee80a97539de3f66ba26716e82;hpb=05043348d67c1af41483e140829811ed9f6aeb5c;p=pazpar2-moved-to-github.git

diff --git a/src/session.c b/src/session.c
index fa4b4a6..f3e71fe 100644
--- a/src/session.c
+++ b/src/session.c
@@ -148,14 +148,18 @@ static void log_xml_doc(xmlDoc *doc)
     xmlFree(result);
 }
 
-static void session_enter(struct session *s)
+static void session_enter(struct session *s, const char *caller)
 {
+    if (caller)
+        session_log(s, YLOG_DEBUG, "Session lock by %s", caller);
     yaz_mutex_enter(s->session_mutex);
 }
 
-static void session_leave(struct session *s)
+static void session_leave(struct session *s, const char *caller)
 {
     yaz_mutex_leave(s->session_mutex);
+    if (caller)
+        session_log(s, YLOG_DEBUG, "Session unlock by %s", caller);
 }
 
 static void session_normalize_facet(struct session *s, const char *type,
@@ -252,8 +256,7 @@ static xmlDoc *record_to_xml(struct session *se,
 
     if (!rdoc)
     {
-        session_log(se, YLOG_FATAL, "Non-wellformed XML received from %s",
-                    db->id);
+        session_log(se, YLOG_WARN, "Non-wellformed XML");
         return 0;
     }
 
@@ -346,8 +349,7 @@ static xmlDoc *normalize_record(struct session *se,
 
         if (normalize_record_transform(sdb->map, &rdoc, (const char **)parms))
         {
-            session_log(se, YLOG_WARN, "Normalize failed from %s",
-                        sdb->database->id);
+            session_log(se, YLOG_WARN, "Normalize failed");
         }
         else
         {
@@ -462,7 +464,7 @@ int session_set_watch(struct session *s, int what,
                       struct http_channel *chan)
 {
     int ret;
-    session_enter(s);
+    session_enter(s, "session_set_watch");
     if (s->watchlist[what].fun)
         ret = -1;
     else
@@ -474,14 +476,14 @@ int session_set_watch(struct session *s, int what,
                                                    session_watch_cancel);
         ret = 0;
     }
-    session_leave(s);
+    session_leave(s, "session_set_watch");
     return ret;
 }
 
 void session_alert_watch(struct session *s, int what)
 {
     assert(s);
-    session_enter(s);
+    session_enter(s, "session_alert_watch");
     if (s->watchlist[what].fun)
     {
         /* our watch is no longer associated with http_channel */
@@ -498,13 +500,13 @@ void session_alert_watch(struct session *s, int what)
         s->watchlist[what].data = 0;
         s->watchlist[what].obs = 0;
 
-        session_leave(s);
+        session_leave(s, "session_alert_watch");
         session_log(s, YLOG_DEBUG,
                     "Alert Watch: %d calling function: %p", what, fun);
         fun(data);
     }
     else
-        session_leave(s);
+        session_leave(s,"session_alert_watch");
 }
 
 //callback for grep_databases
@@ -544,10 +546,10 @@ static void session_reset_active_clients(struct session *se,
 {
     struct client_list *l;
 
-    session_enter(se);
+    session_enter(se, "session_reset_active_clients");
     l = se->clients_active;
     se->clients_active = new_list;
-    session_leave(se);
+    session_leave(se, "session_reset_active_clients");
 
     while (l)
     {
@@ -568,10 +570,10 @@ static void session_remove_cached_clients(struct session *se)
 
     session_reset_active_clients(se, 0);
 
-    session_enter(se);
+    session_enter(se, "session_remove_cached_clients");
     l = se->clients_cached;
     se->clients_cached = 0;
-    session_leave(se);
+    session_leave(se, "session_remove_cached_clients");
 
     while (l)
     {
@@ -642,7 +644,7 @@ static void session_clear_set(struct session *se, struct reclist_sortparms *sp)
     se->reclist = reclist_create(se->nmem);
 }
 
-void session_sort(struct session *se, struct reclist_sortparms *sp)
+static void session_sort_unlocked(struct session *se, struct reclist_sortparms *sp)
 {
     struct reclist_sortparms *sr;
     struct client_list *l;
@@ -650,7 +652,6 @@ void session_sort(struct session *se, struct reclist_sortparms *sp)
     int increasing = sp->increasing;
     int type  = sp->type;
     int clients_research = 0;
-    session_enter(se);
 
     yaz_log(YLOG_LOG, "session_sort field=%s increasing=%d type=%d", field, increasing, type);
     /* see if we already have sorted for this criteria */
@@ -663,7 +664,6 @@ void session_sort(struct session *se, struct reclist_sortparms *sp)
     {
         session_log(se, YLOG_DEBUG, "search_sort: field=%s increasing=%d type=%d already fetched",
                     field, increasing, type);
-        session_leave(se);
         return;
     }
     session_log(se, YLOG_DEBUG, "search_sort: field=%s increasing=%d type=%d must fetch",
@@ -692,8 +692,10 @@ void session_sort(struct session *se, struct reclist_sortparms *sp)
         sr->type = type;
         sr->next = se->sorted_results;
         se->sorted_results = sr;
+        session_log(se, YLOG_DEBUG, "No research/ingesting done");
+        return ;
     }
-    // yaz_log(YLOG_DEBUG, "Restarting search or re-ingesting for clients due to change in sort order");
+    session_log(se, YLOG_DEBUG, "Re- search/ingesting for clients due to change in sort order");
 
     for (l = se->clients_active; l; l = l->next)
     {
@@ -704,14 +706,20 @@ void session_sort(struct session *se, struct reclist_sortparms *sp)
             client_start_search(cl);
         }
         else {
-            yaz_log(YLOG_DEBUG, "Client %s: Not re-start/ingest in show. Wrong client state: %d",
+            yaz_log(YLOG_DEBUG, "Client %s: No re-start/ingest in show. Wrong client state: %d",
                         client_get_id(cl), client_get_state(cl));
         }
 
     }
-    session_leave(se);
 }
 
+void session_sort(struct session *se, struct reclist_sortparms *sp) {
+    //session_enter(se, "session_sort");
+    session_sort_unlocked(se, sp);
+    //session_leave(se, "session_sort");
+}
+
+
 enum pazpar2_error_code session_search(struct session *se,
                                        const char *query,
                                        const char *startrecs,
@@ -733,12 +741,13 @@ enum pazpar2_error_code session_search(struct session *se,
 
     *addinfo = 0;
 
-    if (se->settings_modified)
+    if (se->settings_modified) {
         session_remove_cached_clients(se);
+    }
     else
         session_reset_active_clients(se, 0);
 
-    session_enter(se);
+    session_enter(se, "session_search");
     se->settings_modified = 0;
 
     if (se->sorted_results) {
@@ -751,7 +760,7 @@ enum pazpar2_error_code session_search(struct session *se,
     live_channels = select_targets(se, filter);
     if (!live_channels)
     {
-        session_leave(se);
+        session_leave(se, "session_search");
         return PAZPAR2_NO_TARGETS;
     }
 
@@ -759,13 +768,13 @@ enum pazpar2_error_code session_search(struct session *se,
     if (!facet_limits)
     {
         *addinfo = "limit";
-        session_leave(se);
+        session_leave(se, "session_search");
         return PAZPAR2_MALFORMED_PARAMETER_VALUE;
     }
 
     l0 = se->clients_active;
     se->clients_active = 0;
-    session_leave(se);
+    session_leave(se, "session_search");
 
     for (l = l0; l; l = l->next)
     {
@@ -931,9 +940,9 @@ size_t session_get_memory_status(struct session *session) {
     size_t session_nmem;
     if (session == 0)
         return 0;
-    session_enter(session);
+    session_enter(session, "session_get_memory_status");
     session_nmem = nmem_total(session->nmem);
-    session_leave(session);
+    session_leave(session, "session_get_memory_status");
     return session_nmem;
 }
 
@@ -1005,7 +1014,8 @@ static struct hitsbytarget *hitsbytarget_nb(struct session *se,
         res[*count].records = client_get_num_records(cl);
         res[*count].filtered = client_get_num_records_filtered(cl);
         res[*count].diagnostic =
-            client_get_diagnostic(cl, &res[*count].addinfo);
+            client_get_diagnostic(cl, &res[*count].message,
+                                  &res[*count].addinfo);
         res[*count].state = client_get_state_str(cl);
         res[*count].connected  = client_get_connection(cl) ? 1 : 0;
         session_settings_dump(se, client_get_database(cl), w);
@@ -1022,9 +1032,9 @@ static struct hitsbytarget *hitsbytarget_nb(struct session *se,
 struct hitsbytarget *get_hitsbytarget(struct session *se, int *count, NMEM nmem)
 {
     struct hitsbytarget *p;
-    session_enter(se);
+    session_enter(se, "get_hitsbytarget");
     p = hitsbytarget_nb(se, count, nmem);
-    session_leave(se);
+    session_leave(se, "get_hitsbytarget");
     return p;
 }
 
@@ -1107,7 +1117,7 @@ void perform_termlist(struct http_channel *c, struct session *se,
 
     nmem_strsplit(nmem_tmp, ",", name, &names, &num_names);
 
-    session_enter(se);
+    session_enter(se, "perform_termlist");
 
     for (j = 0; j < num_names; j++)
     {
@@ -1170,7 +1180,7 @@ void perform_termlist(struct http_channel *c, struct session *se,
             wrbuf_puts(c->wrbuf, "\"/>\n");
         }
     }
-    session_leave(se);
+    session_leave(se, "perform_termlist");
     nmem_destroy(nmem_tmp);
 }
 
@@ -1193,7 +1203,7 @@ struct record_cluster *show_single_start(struct session *se, const char *id,
 {
     struct record_cluster *r = 0;
 
-    session_enter(se);
+    session_enter(se, "show_single_start");
     *prev_r = 0;
     *next_r = 0;
     if (se->reclist)
@@ -1211,13 +1221,13 @@ struct record_cluster *show_single_start(struct session *se, const char *id,
         reclist_leave(se->reclist);
     }
     if (!r)
-        session_leave(se);
+        session_leave(se, "show_single_start");
     return r;
 }
 
 void show_single_stop(struct session *se, struct record_cluster *rec)
 {
-    session_leave(se);
+    session_leave(se, "show_single_stop");
 }
 
 struct record_cluster **show_range_start(struct session *se,
@@ -1230,7 +1240,7 @@ struct record_cluster **show_range_start(struct session *se,
 #if USE_TIMING
     yaz_timing_t t = yaz_timing_create();
 #endif
-    session_enter(se);
+    session_enter(se, "show_range_start");
     recs = nmem_malloc(se->nmem, *num * sizeof(struct record_cluster *));
     if (!se->relevance)
     {
@@ -1293,7 +1303,7 @@ struct record_cluster **show_range_start(struct session *se,
 
 void show_range_stop(struct session *se, struct record_cluster **recs)
 {
-    session_leave(se);
+    session_leave(se, "show_range_stop");
 }
 
 void statistics(struct session *se, struct statistics *stat)
@@ -1600,15 +1610,55 @@ int ingest_record(struct client *cl, const char *rec,
         xmlFreeDoc(xdoc);
         return -1;
     }
-    session_enter(se);
+    session_enter(se, "ingest_record");
     if (client_get_session(cl) == se)
         ret = ingest_to_cluster(cl, xdoc, root, record_no, mergekey_norm);
-    session_leave(se);
+    session_leave(se, "ingest_record");
 
     xmlFreeDoc(xdoc);
     return ret;
 }
 
+static int match_metadata_local(struct record *record,
+                                struct conf_service *service,
+                                int md_field_id,
+                                char **values, int num_v)
+{
+    int i;
+    struct conf_metadata *ser_md = &service->metadata[md_field_id];
+    struct record_metadata *rec_md = record->metadata[md_field_id];
+    for (i = 0; i < num_v; )
+    {
+        if (rec_md)
+        {
+            if (ser_md->type == Metadata_type_year
+                || ser_md->type == Metadata_type_date)
+            {
+                int y = atoi(values[i]);
+                if (y >= rec_md->data.number.min
+                    && y <= rec_md->data.number.max)
+                    break;
+            }
+            else
+            {
+                yaz_log(YLOG_DEBUG, "cmp: '%s' '%s'", rec_md->data.text.disp, values[i]);
+                if (!strcmp(rec_md->data.text.disp, values[i]))
+                {
+                    // Value equals, should not be filtered.
+                    break;
+                }
+            }
+            rec_md = rec_md->next;
+        }
+        else
+        {
+            rec_md = record->metadata[md_field_id];
+            i++;
+        }
+    }
+    return i < num_v ? 1 : 0;
+}
+
 // Skip record on non-zero
 static int check_limit_local(struct client *cl,
                              struct record *record,
@@ -1622,13 +1672,12 @@ static int check_limit_local(struct client *cl,
     int l = 0;
     while (!skip_record)
     {
-        struct conf_metadata *ser_md = 0;
-        struct record_metadata *rec_md = 0;
         int md_field_id;
         char **values = 0;
-        int i, num_v = 0;
-
-        const char *name = client_get_facet_limit_local(cl, sdb, &l, nmem_tmp, &num_v, &values);
+        int num_v = 0;
+        const char *name =
+            client_get_facet_limit_local(cl, sdb, &l, nmem_tmp,
+                                         &num_v, &values);
         if (!name)
             break;
 
@@ -1638,40 +1687,8 @@ static int check_limit_local(struct client *cl,
             skip_record = 1;
             break;
         }
-        ser_md = &service->metadata[md_field_id];
-        rec_md = record->metadata[md_field_id];
-        yaz_log(YLOG_DEBUG, "check limit local %s", name);
-        for (i = 0; i < num_v; )
-        {
-            if (rec_md)
-            {
-                if (ser_md->type == Metadata_type_year
-                    || ser_md->type == Metadata_type_date)
-                {
-                    int y = atoi(values[i]);
-                    if (y >= rec_md->data.number.min
-                        && y <= rec_md->data.number.max)
-                        break;
-                }
-                else
-                {
-                    yaz_log(YLOG_DEBUG, "cmp: '%s' '%s'", rec_md->data.text.disp, values[i]);
-                    if (!strcmp(rec_md->data.text.disp, values[i]))
-                    {
-                        // Value equals, should not be filtered.
-                        break;
-                    }
-                }
-                rec_md = rec_md->next;
-            }
-            else
-            {
-                rec_md = record->metadata[md_field_id];
-                i++;
-            }
-        }
-        // At end , not match
-        if (i == num_v)
+        if (!match_metadata_local(record, service, md_field_id,
+                                  values, num_v))
         {
             skip_record = 1;
             break;