Minor refactor of session_sort_unlocked

[pazpar2-moved-to-github.git] / src / session.c

diff --git a/src/session.c b/src/session.c
index ed80133..c6b1f21 100644 (file)
--- a/src/session.c
+++ b/src/session.c
@@ -631,6 +631,8 @@ static void session_clear_set(struct session *se, struct reclist_sortparms *sp)
     se->total_records = se->total_merged = 0;
     se->num_termlists = 0;
 
+    relevance_clear(se->relevance);
+
     /* reset list of sorted results and clear to relevance search */
     se->sorted_results = nmem_malloc(se->nmem, sizeof(*se->sorted_results));
     se->sorted_results->name = nmem_strdup(se->nmem, sp->name);
@@ -648,7 +650,6 @@ static void session_sort_unlocked(struct session *se,
                                   struct reclist_sortparms *sp,
                                   const char *mergekey)
 {
-    struct reclist_sortparms *sr;
     struct client_list *l;
     const char *field = sp->name;
     int increasing = sp->increasing;
@@ -658,36 +659,31 @@ static void session_sort_unlocked(struct session *se,
     session_log(se, YLOG_DEBUG, "session_sort field=%s increasing=%d type=%d",
                 field, increasing, type);
 
-    if (!mergekey ||
-        (se->mergekey && !strcmp(se->mergekey, mergekey)))
+    if (mergekey && strcmp(se->mergekey, mergekey))
+    {
+        /* new mergekey must research/reingest anyway */
+        assert(mergekey);
+        xfree(se->mergekey);
+        se->mergekey = *mergekey ? xstrdup(mergekey) : 0;
+        clients_research = 1;
+        session_log(se, YLOG_DEBUG, "search_sort: new mergekey = %s",
+                    mergekey);
+    }
+    if (clients_research == 0)
     {
-        /* mergekey unchanged.. */
-        /* see if we already have sorted for this criteria */
+        struct reclist_sortparms *sr;
         for (sr = se->sorted_results; sr; sr = sr->next)
-        {
             if (!reclist_sortparms_cmp(sr, sp))
                 break;
-        }
         if (sr)
         {
             session_log(se, YLOG_DEBUG, "search_sort: field=%s increasing=%d type=%d already fetched",
                         field, increasing, type);
             return;
         }
-        session_log(se, YLOG_DEBUG, "search_sort: field=%s increasing=%d type=%d must fetch",
-                    field, increasing, type);
-    }
-    else
-    {
-        /* new mergekey must research/reingest anyway */
-        assert(mergekey);
-        xfree(se->mergekey);
-        se->mergekey = *mergekey ? xstrdup(mergekey) : 0;
-        clients_research = 1;
-
-        session_log(se, YLOG_DEBUG, "search_sort: new mergekey = %s",
-                    mergekey);
     }
+    session_log(se, YLOG_DEBUG, "search_sort: field=%s increasing=%d type=%d must fetch",
+                field, increasing, type);
 
     // We need to reset reclist on every sort that changes the records, not just for position
     // So if just one client requires new searching, we need to clear set.
@@ -700,15 +696,17 @@ static void session_sort_unlocked(struct session *se,
         client_parse_init(cl, 1);
         clients_research += client_parse_sort(cl, sp);
     }
-    if (clients_research) {
+    if (clients_research)
+    {
         session_log(se, YLOG_DEBUG,
                     "Reset results due to %d clients researching",
                     clients_research);
         session_clear_set(se, sp);
     }
-    else {
+    else
+    {
         // A new sorting based on same record set
-        sr = nmem_malloc(se->nmem, sizeof(*sr));
+        struct reclist_sortparms *sr = nmem_malloc(se->nmem, sizeof(*sr));
         sr->name = nmem_strdup(se->nmem, field);
         sr->increasing = increasing;
         sr->type = type;
@@ -752,7 +750,8 @@ enum pazpar2_error_code session_search(struct session *se,
                                        const char *filter,
                                        const char *limit,
                                        const char **addinfo,
-                                       struct reclist_sortparms *sp)
+                                       struct reclist_sortparms *sp,
+                                       const char *mergekey)
 {
     int live_channels = 0;
     int no_working = 0;
@@ -773,6 +772,12 @@ enum pazpar2_error_code session_search(struct session *se,
     session_enter(se, "session_search");
     se->settings_modified = 0;
 
+    if (mergekey)
+    {
+        xfree(se->mergekey);
+        se->mergekey = *mergekey ? xstrdup(mergekey) : 0;
+    }
+
     session_clear_set(se, sp);
     relevance_destroy(&se->relevance);
 
@@ -1493,7 +1498,7 @@ static int get_mergekey_from_doc(xmlDoc *doc, xmlNode *root, const char *name,
             else if (!strcmp(name, (const char *) type))
             {
                 xmlChar *value = xmlNodeListGetString(doc, n->children, 1);
-                if (value)
+                if (value && *value)
                 {
                     const char *norm_str;
                     pp2_charset_token_t prt =
@@ -1512,10 +1517,11 @@ static int get_mergekey_from_doc(xmlDoc *doc, xmlNode *root, const char *name,
                             wrbuf_puts(norm_wr, norm_str);
                         }
                     }
-                    xmlFree(value);
                     pp2_charset_token_destroy(prt);
                     no_found++;
                 }
+                if (value)
+                    xmlFree(value);
             }
             xmlFree(type);
         }