X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fsession.c;h=2adb1ebe1842bc2058241b42fe1de19fa77b9f32;hb=5cdddaf1ba96608fcbd221421503b609ded909bf;hp=c0006a53f588435ab8273a485fcb1bd6991fedb6;hpb=457c6599b5dae1fb9e06b1c1a2f58a0922de5851;p=pazpar2-moved-to-github.git

diff --git a/src/session.c b/src/session.c
index c0006a5..2adb1eb 100644
--- a/src/session.c
+++ b/src/session.c
@@ -98,6 +98,7 @@ struct client_list {
 /* session counting (1) , disable client counting (0) */
 static YAZ_MUTEX g_session_mutex = 0;
 static int no_sessions = 0;
+static int no_session_total = 0;
 
 static int session_use(int delta)
 {
@@ -106,6 +107,8 @@ static int session_use(int delta)
         yaz_mutex_create(&g_session_mutex);
     yaz_mutex_enter(g_session_mutex);
     no_sessions += delta;
+    if (delta > 0)
+        no_session_total += delta;
     sessions = no_sessions;
     yaz_mutex_leave(g_session_mutex);
     yaz_log(YLOG_DEBUG, "%s sesions=%d", delta == 0 ? "" : (delta > 0 ? "INC" : "DEC"), no_sessions);
@@ -116,6 +119,17 @@ int sessions_count(void) {
     return session_use(0);
 }
 
+int  session_count_total(void) {
+    int total = 0;
+    if (!g_session_mutex)
+        return 0;
+    yaz_mutex_enter(g_session_mutex);
+    total = no_session_total;
+    yaz_mutex_leave(g_session_mutex);
+    return total;
+}
+
+
 static void log_xml_doc(xmlDoc *doc)
 {
     FILE *lf = yaz_log_file();
@@ -474,7 +488,7 @@ int session_set_watch(struct session *s, int what,
         ret = 0;
     }
     session_leave(s);
-    return 0;
+    return ret;
 }
 
 void session_alert_watch(struct session *s, int what)
@@ -576,12 +590,11 @@ int session_is_preferred_clients_ready(struct session *s)
     return res == 0;
 }
 
-
-
 enum pazpar2_error_code search(struct session *se,
                                const char *query,
                                const char *startrecs, const char *maxrecs,
                                const char *filter,
+                               const char *limit,
                                const char **addinfo)
 {
     int live_channels = 0;
@@ -589,6 +602,7 @@ enum pazpar2_error_code search(struct session *se,
     int no_failed = 0;
     struct client_list *l;
     struct timeval tval;
+    facet_limits_t facet_limits;
 
     session_log(se, YLOG_DEBUG, "Search");
 
@@ -615,6 +629,13 @@ enum pazpar2_error_code search(struct session *se,
     
     tval.tv_sec += 5;
 
+    facet_limits = facet_limits_create(limit);
+    if (!facet_limits)
+    {
+        *addinfo = "limit";
+        session_leave(se);
+        return PAZPAR2_MALFORMED_PARAMETER_VALUE;
+    }
     for (l = se->clients; l; l = l->next)
     {
         struct client *cl = l->client;
@@ -625,7 +646,7 @@ enum pazpar2_error_code search(struct session *se,
             client_set_startrecs(cl, atoi(startrecs));
         if (prepare_session_database(se, client_get_database(cl)) < 0)
             ;
-        else if (client_parse_query(cl, query) < 0)
+        else if (client_parse_query(cl, query, facet_limits) < 0)
             no_failed++;
         else
         {
@@ -637,6 +658,7 @@ enum pazpar2_error_code search(struct session *se,
                 client_start_search(cl);
         }
     }
+    facet_limits_destroy(facet_limits);
     session_leave(se);
     if (no_working == 0)
     {
@@ -746,8 +768,7 @@ void session_apply_setting(struct session *se, char *dbname, char *setting,
     }
 }
 
-void destroy_session(struct session *se)
-{
+void session_destroy(struct session *se) {
     struct session_database *sdb;
     session_log(se, YLOG_DEBUG, "Destroying");
     session_use(-1);
@@ -761,7 +782,12 @@ void destroy_session(struct session *se)
     nmem_destroy(se->nmem);
     service_destroy(se->service);
     yaz_mutex_destroy(&se->session_mutex);
-    wrbuf_destroy(se->wrbuf);
+}
+
+/* Depreciated: use session_destroy */
+void destroy_session(struct session *se)
+{
+    session_destroy(se);
 }
 
 size_t session_get_memory_status(struct session *session) {
@@ -798,7 +824,6 @@ struct session *new_session(NMEM nmem, struct conf_service *service,
     session->clients = 0;
     session->session_nmem = nmem;
     session->nmem = nmem_create();
-    session->wrbuf = wrbuf_alloc();
     session->databases = 0;
     for (i = 0; i <= SESSION_WATCH_MAX; i++)
     {
@@ -839,14 +864,16 @@ struct hitsbytarget *hitsbytarget(struct session *se, int *count, NMEM nmem)
         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);
-        res[*count].settings_xml = w;
+        res[*count].settings_xml = nmem_strdup(nmem, wrbuf_cstr(w));
+        wrbuf_destroy(w);
         (*count)++;
     }
     session_leave(se);
     return res;
 }
 
-struct termlist_score **termlist(struct session *se, const char *name, int *num)
+struct termlist_score **get_termlist_score(struct session *se,
+                                           const char *name, int *num)
 {
     int i;
     struct termlist_score **tl = 0;
@@ -1242,6 +1269,7 @@ static int ingest_to_cluster(struct client *cl,
     \param nmem working NMEM
     \retval 0 OK
     \retval -1 failure
+    \retval -2 Filtered
 */
 int ingest_record(struct client *cl, const char *rec,
                   int record_no, NMEM nmem)
@@ -1261,10 +1289,10 @@ int ingest_record(struct client *cl, const char *rec,
     
     if (!check_record_filter(root, sdb))
     {
-        session_log(se, YLOG_WARN, "Filtered out record no %d from %s",
+        session_log(se, YLOG_LOG, "Filtered out record no %d from %s",
                     record_no, sdb->database->url);
         xmlFreeDoc(xdoc);
-        return -1;
+        return -2;
     }
     
     mergekey_norm = get_mergekey(xdoc, cl, record_no, service, nmem);
@@ -1482,7 +1510,6 @@ static int ingest_to_cluster(struct client *cl,
             // construct facets ... unless the client already has reported them
             if (ser_md->termlist && !client_has_facet(cl, (char *) type))
             {
-
                 if (ser_md->type == Metadata_type_year)
                 {
                     char year[64];