#include <libxml/tree.h>
-#define TERMLIST_HIGH_SCORE 25
-
#define MAX_CHUNK 15
#define MAX(a,b) ((a)>(b)?(a):(b))
}
s->termlists[i].name = nmem_strdup(s->nmem, type);
- s->termlists[i].termlist
- = termlist_create(s->nmem, TERMLIST_HIGH_SCORE);
+ s->termlists[i].termlist = termlist_create(s->nmem);
s->num_termlists = i + 1;
}
#if 0
- session_log(s, YLOG_DEBUG, "Facets for %s: %s norm:%s (%d)", type, value, wrbuf_cstr(facet_wrbuf), count);
+ session_log(s, YLOG_LOG, "Facets for %s: %s norm:%s (%d)", type, value, wrbuf_cstr(facet_wrbuf), count);
#endif
termlist_insert(s->termlists[i].termlist, wrbuf_cstr(display_wrbuf),
wrbuf_cstr(facet_wrbuf), count);
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, int position)
+{
+ 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->position = position;
+ se->sorted_results->next = 0;
+
+ se->reclist = reclist_create(se->nmem);
+}
+
+void session_sort(struct session *se, const char *field, int increasing,
+ int position)
{
struct session_sorted_results *sr;
struct client_list *l;
session_enter(se);
+ yaz_log(YLOG_LOG, "session_sort field=%s increasing=%d position=%d", field, increasing, position);
/* see if we already have sorted for this critieria */
+ /* TODO I do not see the point in saving all previous sorts. Dont we re-sort anyway ? */
for (sr = se->sorted_results; sr; sr = sr->next)
{
- if (!strcmp(field, sr->field) && increasing == sr->increasing)
+ if (!strcmp(field, sr->field) && increasing == sr->increasing && sr->position == position)
break;
}
if (sr)
{
- yaz_log(YLOG_LOG, "search_sort: field=%s increasing=%d already fetched",
- field, increasing);
+ session_log(se, YLOG_DEBUG, "search_sort: field=%s increasing=%d position=%d already fetched",
+ field, increasing, position);
session_leave(se);
return;
}
- yaz_log(YLOG_LOG, "search_sort: field=%s increasing=%d must fetch",
- field, increasing);
+ if (position)
+ {
+ session_clear_set(se, field, increasing, position);
+ }
+
+ session_log(se, YLOG_DEBUG, "search_sort: field=%s increasing=%d position=%d must fetch",
+ field, increasing, position);
sr = nmem_malloc(se->nmem, sizeof(*sr));
sr->field = nmem_strdup(se->nmem, field);
sr->increasing = increasing;
+ sr->position = position;
sr->next = se->sorted_results;
se->sorted_results = sr;
-
+
for (l = se->clients_active; l; l = l->next)
{
struct client *cl = l->client;
const char *filter,
const char *limit,
const char **addinfo,
- const char *sort_field, int increasing)
+ const char *sort_field,
+ int increasing)
{
int live_channels = 0;
int no_working = 0;
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, 0); /* hardcoded position */
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);
continue;
parse_ret = client_parse_query(cl, query, facet_limits, startrecs,
- maxrecs);
+ maxrecs, se->service->ccl_bibset);
if (parse_ret == -1)
no_failed_query++;
else if (parse_ret == -2)
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;
}
session_leave(se);
return p;
}
-
-struct termlist_score **get_termlist_score(struct session *se,
- const char *name, int *num)
-{
- int i;
- struct termlist_score **tl = 0;
-
- session_enter(se);
- for (i = 0; i < se->num_termlists; i++)
- if (!strcmp((const char *) se->termlists[i].name, name))
- {
- tl = termlist_highscore(se->termlists[i].termlist, num);
- break;
- }
- session_leave(se);
- return tl;
-}
// Compares two hitsbytarget nodes by hitcount
static int cmp_ht(const void *p1, const void *p2)
wrbuf_puts(c->wrbuf, "\">\n");
must_generate_empty = 0;
- p = termlist_highscore(se->termlists[i].termlist, &len);
+ p = termlist_highscore(se->termlists[i].termlist, &len,
+ nmem_tmp);
if (p)
{
int i;
}
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)
}
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.
struct record_metadata *rec_md = 0;
int md_field_id = -1;
int sk_field_id = -1;
- int rank = 0;
- xmlChar *rank_str = 0;
+ const char *rank;
+ xmlChar *xml_rank;
type = xmlGetProp(n, (xmlChar *) "type");
value = xmlNodeListGetString(xdoc, n->children, 1);
ser_md = &service->metadata[md_field_id];
- rank_str = xmlGetProp(n, (xmlChar *) "rank");
- if (rank_str)
- {
- rank = atoi((const char *) rank_str);
- xmlFree(rank_str);
- }
- else
- rank = ser_md->rank;
-
if (ser_md->sortkey_offset >= 0)
{
sk_field_id = ser_md->sortkey_offset;
if (!rec_md)
continue;
+ xml_rank = xmlGetProp(n, (xmlChar *) "rank");
+ rank = xml_rank ? (const char *) xml_rank : ser_md->rank;
+
wheretoput = &cluster->metadata[md_field_id];
// and polulate with data:
}
}
-
// ranking of _all_ fields enabled ...
if (rank)
{
}
// cleaning up
+ if (xml_rank)
+ xmlFree(xml_rank);
xmlFree(type);
xmlFree(value);
type = value = 0;
projects / pazpar2-moved-to-github.git / blobdiff