X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fsession.c;h=4049360b248ea23eb2debe616039ffaedd8c9fe1;hb=3371e5ba3a8d62b6edbb338984ac333bec6df01b;hp=74495fc5feaa449bc09e315124e61655d9405b79;hpb=ab485834bd7708fbdd8e896a7548da22a33fed87;p=pazpar2-moved-to-github.git

diff --git a/src/session.c b/src/session.c
index 74495fc..4049360 100644
--- a/src/session.c
+++ b/src/session.c
@@ -622,34 +622,64 @@ int session_is_preferred_clients_ready(struct session *s)
     return res == 0;
 }
 
-void session_sort(struct session *se, const char *field, int increasing)
+static void session_clear_set(struct session *se,
+                              const char *sort_field, int increasing)
+{
+    reclist_destroy(se->reclist);
+    se->reclist = 0;
+    if (nmem_total(se->nmem))
+        session_log(se, YLOG_DEBUG, "NMEN operation usage %zd",
+                    nmem_total(se->nmem));
+    nmem_reset(se->nmem);
+    se->total_records = se->total_merged = 0;
+    se->num_termlists = 0;
+    
+    /* reset list of sorted results and clear to relevance search */
+    se->sorted_results = nmem_malloc(se->nmem, sizeof(*se->sorted_results));
+    se->sorted_results->field = nmem_strdup(se->nmem, sort_field);
+    se->sorted_results->increasing = increasing;
+    se->sorted_results->next = 0;
+    
+    se->reclist = reclist_create(se->nmem);
+}
+
+void session_sort(struct session *se, const char *field, int increasing,
+                  int clear_set)
 {
     struct session_sorted_results *sr;
     struct client_list *l;
 
     session_enter(se);
 
-    /* see if we already have sorted for this critieria */
-    for (sr = se->sorted_results; sr; sr = sr->next)
+    yaz_log(YLOG_LOG, "session_sort field=%s", field);
+    if (clear_set)
     {
-        if (!strcmp(field, sr->field) && increasing == sr->increasing)
-            break;
+        session_clear_set(se, field, increasing);
     }
-    if (sr)
+    else
     {
-        yaz_log(YLOG_LOG, "search_sort: field=%s increasing=%d already fetched",
-                field, increasing);
-        session_leave(se);
-        return;
+        /* see if we already have sorted for this critieria */
+        for (sr = se->sorted_results; sr; sr = sr->next)
+        {
+            if (!strcmp(field, sr->field) && increasing == sr->increasing)
+                break;
+        }
+        if (sr)
+        {
+            session_log(se, YLOG_DEBUG, "search_sort: field=%s increasing=%d already fetched",
+                        field, increasing);
+            session_leave(se);
+            return;
+        }
+        session_log(se, YLOG_DEBUG, "search_sort: field=%s increasing=%d must fetch",
+                    field, increasing);
+        sr = nmem_malloc(se->nmem, sizeof(*sr));
+        sr->field = nmem_strdup(se->nmem, field);
+        sr->increasing = increasing;
+        sr->next = se->sorted_results;
+        se->sorted_results = sr;
     }
-    yaz_log(YLOG_LOG, "search_sort: field=%s increasing=%d must fetch",
-            field, increasing);
-    sr = nmem_malloc(se->nmem, sizeof(*sr));
-    sr->field = nmem_strdup(se->nmem, field);
-    sr->increasing = increasing;
-    sr->next = se->sorted_results;
-    se->sorted_results = sr;
-    
+        
     for (l = se->clients_active; l; l = l->next)
     {
         struct client *cl = l->client;
@@ -688,29 +718,16 @@ enum pazpar2_error_code session_search(struct session *se,
         session_reset_active_clients(se, 0);
     
     session_enter(se);
-    reclist_destroy(se->reclist);
-    se->reclist = 0;
     se->settings_modified = 0;
+    session_clear_set(se, sort_field, increasing);
     relevance_destroy(&se->relevance);
-    if (nmem_total(se->nmem))
-        session_log(se, YLOG_DEBUG, "NMEN operation usage %zd", nmem_total(se->nmem));
-    nmem_reset(se->nmem);
-    se->total_records = se->total_merged = 0;
-    se->num_termlists = 0;
 
-    /* reset list of sorted results and clear to relevance search */
-    se->sorted_results = nmem_malloc(se->nmem, sizeof(*se->sorted_results));
-    se->sorted_results->field = nmem_strdup(se->nmem, sort_field);
-    se->sorted_results->increasing = increasing;
-    se->sorted_results->next = 0;
-    
     live_channels = select_targets(se, filter);
     if (!live_channels)
     {
         session_leave(se);
         return PAZPAR2_NO_TARGETS;
     }
-    se->reclist = reclist_create(se->nmem);
 
     yaz_gettimeofday(&tval);
     
@@ -780,7 +797,7 @@ enum pazpar2_error_code session_search(struct session *se,
         else
             return PAZPAR2_NO_TARGETS;
     }
-    yaz_log(YLOG_LOG, "session_start_search done");
+    session_log(se, YLOG_LOG, "session_start_search done");
     return PAZPAR2_NO_ERROR;
 }
 
@@ -1626,7 +1643,7 @@ static int check_limit_local(struct client *cl,
         }
         ser_md = &service->metadata[md_field_id];
         rec_md = record->metadata[md_field_id];
-        yaz_log(YLOG_LOG, "check limit local %s", name);
+        yaz_log(YLOG_DEBUG, "check limit local %s", name);
         for (i = 0; i < num_v; )
         {
             if (rec_md)
@@ -1641,7 +1658,7 @@ static int check_limit_local(struct client *cl,
                 }
                 else
                 {
-                    yaz_log(YLOG_LOG, "cmp: '%s' '%s'", rec_md->data.text.disp, values[i]);
+                    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.
@@ -1916,12 +1933,12 @@ static int ingest_to_cluster(struct client *cl,
                 }
             }
 
-
             // ranking of _all_ fields enabled ... 
             if (rank)
             {
                 relevance_countwords(se->relevance, cluster, 
-                                     (char *) value, rank, ser_md->name);
+                                     (char *) value, rank, ser_md->name,
+                                     ser_md->frank);
             }
 
             // construct facets ... unless the client already has reported them