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);
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;
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);
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 =
wrbuf_puts(norm_wr, norm_str);
}
}
- xmlFree(value);
pp2_charset_token_destroy(prt);
no_found++;
}
+ if (value)
+ xmlFree(value);
}
xmlFree(type);
}