X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=src%2Fsession.c;h=3a0fc22cd82c894760a1c8cb377224df8ba686a9;hb=848a659ecc0b24d1881c3f091393b99259130aa7;hp=18c9aeecadbbd13183b241cecdbbb40c3a4922ca;hpb=102d64b6e147d9bca7298abf857febdb41106ee8;p=pazpar2-moved-to-github.git
diff --git a/src/session.c b/src/session.c
index 18c9aee..3a0fc22 100644
--- a/src/session.c
+++ b/src/session.c
@@ -408,40 +408,51 @@ const char *session_setting_oneval(struct session_database *db, int offset)
// setting. However, this is not a realistic use scenario.
static int prepare_map(struct session *se, struct session_database *sdb)
{
- const char *s;
-
- if (sdb->settings && sdb->settings[PZ_XSLT] && !sdb->map &&
- (s = session_setting_oneval(sdb, PZ_XSLT)))
+ if (sdb->settings && !sdb->map)
{
- char auto_stylesheet[256];
+ const char *s;
- if (!strcmp(s, "auto"))
+ if (sdb->settings[PZ_EMBED_XSLT] &&
+ (s = session_setting_oneval(sdb, PZ_EMBED_XSLT)))
+ {
+ sdb->map = normalize_cache_get(se->normalize_cache,
+ se->service, s, 1);
+ if (!sdb->map)
+ return -1;
+ }
+ else if (sdb->settings[PZ_XSLT] &&
+ (s = session_setting_oneval(sdb, PZ_XSLT)))
{
- const char *request_syntax = session_setting_oneval(
- sdb, PZ_REQUESTSYNTAX);
- if (request_syntax)
+ char auto_stylesheet[256];
+
+ if (!strcmp(s, "auto"))
{
- char *cp;
- yaz_snprintf(auto_stylesheet, sizeof(auto_stylesheet),
- "%s.xsl", request_syntax);
- for (cp = auto_stylesheet; *cp; cp++)
+ const char *request_syntax = session_setting_oneval(
+ sdb, PZ_REQUESTSYNTAX);
+ if (request_syntax)
{
- /* deliberately only consider ASCII */
- if (*cp > 32 && *cp < 127)
- *cp = tolower(*cp);
+ char *cp;
+ yaz_snprintf(auto_stylesheet, sizeof(auto_stylesheet),
+ "%s.xsl", request_syntax);
+ for (cp = auto_stylesheet; *cp; cp++)
+ {
+ /* deliberately only consider ASCII */
+ if (*cp > 32 && *cp < 127)
+ *cp = tolower(*cp);
+ }
+ s = auto_stylesheet;
+ }
+ else
+ {
+ session_log(se, YLOG_WARN,
+ "No pz:requestsyntax for auto stylesheet");
}
- s = auto_stylesheet;
- }
- else
- {
- session_log(se, YLOG_WARN,
- "No pz:requestsyntax for auto stylesheet");
}
+ sdb->map = normalize_cache_get(se->normalize_cache,
+ se->service, s, 0);
+ if (!sdb->map)
+ return -1;
}
- sdb->map = normalize_cache_get(se->normalize_cache,
- se->service, s);
- if (!sdb->map)
- return -1;
}
return 0;
}
@@ -821,8 +832,7 @@ void session_init_databases(struct session *se)
static struct session_database *load_session_database(struct session *se,
char *id)
{
- struct database *db = new_database(id, se->session_nmem);
-
+ struct database *db = new_database_inherit_settings(id, se->session_nmem, se->service->settings);
session_init_databases_fun((void*) se, db);
// New sdb is head of se->databases list
@@ -1015,6 +1025,14 @@ static int cmp_ht(const void *p1, const void *p2)
return h2->hits - h1->hits;
}
+// Compares two hitsbytarget nodes by hitcount
+static int cmp_ht_approx(const void *p1, const void *p2)
+{
+ const struct hitsbytarget *h1 = p1;
+ const struct hitsbytarget *h2 = p2;
+ return h2->approximation - h1->approximation;
+}
+
static int targets_termlist_nb(WRBUF wrbuf, struct session *se, int num,
NMEM nmem, int version)
{
@@ -1022,7 +1040,10 @@ static int targets_termlist_nb(WRBUF wrbuf, struct session *se, int num,
int count, i;
ht = hitsbytarget_nb(se, &count, nmem);
- qsort(ht, count, sizeof(struct hitsbytarget), cmp_ht);
+ if (version >= 2)
+ qsort(ht, count, sizeof(struct hitsbytarget), cmp_ht_approx);
+ else
+ qsort(ht, count, sizeof(struct hitsbytarget), cmp_ht);
for (i = 0; i < count && i < num && ht[i].hits > 0; i++)
{
@@ -1047,7 +1068,7 @@ static int targets_termlist_nb(WRBUF wrbuf, struct session *se, int num,
if (version >= 2) {
// Should not print if we know it isn't a approximation.
wrbuf_printf(wrbuf, "" ODR_INT_PRINTF "\n", ht[i].approximation);
- wrbuf_printf(wrbuf, "%d\n", ht[i].records);
+ wrbuf_printf(wrbuf, "%d\n", ht[i].records - ht[i].filtered);
wrbuf_printf(wrbuf, "%d\n", ht[i].filtered);
}
@@ -1203,7 +1224,8 @@ struct record_cluster **show_range_start(struct session *se,
{
*num = 0;
*total = 0;
- *sumhits = 0;
+ *sumhits = 0;
+ *approx_hits = 0;
recs = 0;
}
else
@@ -1222,6 +1244,7 @@ struct record_cluster **show_range_start(struct session *se,
*total = reclist_get_num_records(se->reclist);
*sumhits = 0;
+ *approx_hits = 0;
for (l = se->clients_active; l; l = l->next) {
*sumhits += client_get_hits(l->client);
*approx_hits += client_get_approximation(l->client);
@@ -1574,6 +1597,7 @@ int ingest_record(struct client *cl, const char *rec,
return ret;
}
+// Skip record on non-zero
static int check_limit_local(struct client *cl,
struct record *record,
int record_no)
@@ -1592,9 +1616,7 @@ static int check_limit_local(struct client *cl,
char **values = 0;
int i, num_v = 0;
- const char *name =
- client_get_facet_limit_local(cl, sdb, &l, nmem_tmp, &num_v,
- &values);
+ const char *name = client_get_facet_limit_local(cl, sdb, &l, nmem_tmp, &num_v, &values);
if (!name)
break;
@@ -1621,10 +1643,10 @@ 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_LOG, "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.
break;
}
}
@@ -1636,6 +1658,7 @@ static int check_limit_local(struct client *cl,
i++;
}
}
+ // At end , not match
if (i == num_v)
{
skip_record = 1;
@@ -1774,6 +1797,8 @@ static int ingest_to_cluster(struct client *cl,
struct record_metadata *rec_md = 0;
int md_field_id = -1;
int sk_field_id = -1;
+ int rank = 0;
+ xmlChar *rank_str = 0;
type = xmlGetProp(n, (xmlChar *) "type");
value = xmlNodeListGetString(xdoc, n->children, 1);
@@ -1787,6 +1812,15 @@ static int ingest_to_cluster(struct client *cl,
continue;
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)
{
@@ -1886,10 +1920,11 @@ static int ingest_to_cluster(struct client *cl,
// ranking of _all_ fields enabled ...
- if (ser_md->rank)
+ if (rank)
+ {
relevance_countwords(se->relevance, cluster,
- (char *) value, ser_md->rank,
- ser_md->name);
+ (char *) value, rank, ser_md->name);
+ }
// construct facets ... unless the client already has reported them
if (ser_md->termlist && !client_has_facet(cl, (char *) type))