/* This file is part of Pazpar2.
- Copyright (C) 2006-2013 Index Data
+ Copyright (C) Index Data
Pazpar2 is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
}
// Apply a session override to a database
-void session_apply_setting(struct session *se, char *dbname, char *setting,
+void session_apply_setting(struct session *se, char *dbname, char *name,
char *value)
{
struct session_database *sdb = find_session_database(se, dbname);
struct conf_service *service = se->service;
- struct setting *new = nmem_malloc(se->session_nmem, sizeof(*new));
- int offset = settings_create_offset(service, setting);
+ struct setting *s;
+ int offset = settings_create_offset(service, name);
expand_settings_array(&sdb->settings, &sdb->num_settings, offset,
se->session_nmem);
- new->precedence = 0;
- new->target = dbname;
- new->name = setting;
- new->value = value;
- new->next = sdb->settings[offset];
- sdb->settings[offset] = new;
-
- se->settings_modified = 1;
// Force later recompute of settings-driven data structures
// (happens when a search starts and client connections are prepared)
- switch (offset)
- {
- case PZ_XSLT:
- if (sdb->map)
+ if (offset == PZ_XSLT)
+ sdb->map = 0;
+
+ se->settings_modified = 1;
+ for (s = sdb->settings[offset]; s; s = s->next)
+ if (!strcmp(s->name, name) &&
+ dbname && s->target && !strcmp(dbname, s->target))
{
- sdb->map = 0;
+ s->value = value;
+ return;
}
- break;
- }
+ s = nmem_malloc(se->session_nmem, sizeof(*s));
+ s->precedence = 0;
+ s->target = dbname;
+ s->name = name;
+ s->value = value;
+ s->next = sdb->settings[offset];
+ sdb->settings[offset] = s;
+
}
void session_destroy(struct session *se)
if (se->relevance)
{
for (spp = sp; spp; spp = spp->next)
- if (spp->type == Metadata_sortkey_relevance)
+ if (spp->type == Metadata_type_relevance)
{
relevance_prepare_read(se->relevance, se->reclist);
break;
}
*attrp = 0;
- if (type == Metadata_type_generic)
+ switch (type)
{
- char *p = nmem_strdup(nmem, value);
-
- p = normalize7bit_generic(p, " ,/.:([");
-
- rec_md->data.text.disp = p;
+ case Metadata_type_generic:
+ case Metadata_type_skiparticle:
+ if (strstr(value, "://")) /* looks like a URL */
+ rec_md->data.text.disp = nmem_strdup(nmem, value);
+ else
+ rec_md->data.text.disp =
+ normalize7bit_generic(nmem_strdup(nmem, value), " ,/.:([");
rec_md->data.text.sort = 0;
rec_md->data.text.snippet = 0;
- }
- else if (type == Metadata_type_year || type == Metadata_type_date)
+ break;
+ case Metadata_type_year:
+ case Metadata_type_date:
{
int first, last;
int longdate = 0;
rec_md->data.number.min = first;
rec_md->data.number.max = last;
}
- else
+ break;
+ case Metadata_type_float:
+ rec_md->data.fnumber = atof(value);
+ break;
+ case Metadata_type_relevance:
+ case Metadata_type_position:
return 0;
+ }
return rec_md;
}
{
const char *sort_str = 0;
int skip_article =
- ser_sk->type == Metadata_sortkey_skiparticle;
+ ser_sk->type == Metadata_type_skiparticle;
if (!cluster->sortkeys[sk_field_id])
cluster->sortkeys[sk_field_id] =