#include "client.h"
#include "settings.h"
#include "normalize7bit.h"
-#include "marcmap.h"
#define TERMLIST_HIGH_SCORE 25
struct parameters global_parameters =
{
0, // dump_records
- 0, // debug_mode
- 100,
+ 0 // debug_mode
};
static void log_xml_doc(xmlDoc *doc)
s->termlists[i].name = nmem_strdup(s->nmem, type);
s->termlists[i].termlist
- = termlist_create(s->nmem, s->expected_maxrecs,
- TERMLIST_HIGH_SCORE);
+ = termlist_create(s->nmem, TERMLIST_HIGH_SCORE);
s->num_termlists = i + 1;
}
termlist_insert(s->termlists[i].termlist, value);
}
-xmlDoc *record_to_xml(struct session_database *sdb, const char *rec)
+static xmlDoc *record_to_xml(struct session_database *sdb, const char *rec)
{
struct database *db = sdb->database;
xmlDoc *rdoc = 0;
int setting;
if (md->setting == Metadata_setting_parameter &&
- (setting = settings_offset(service, md->name)) > 0)
+ (setting = settings_lookup_offset(service, md->name)) >= 0)
{
const char *val = session_setting_oneval(sdb, setting);
if (val && nparms < MAX_XSLT_ARGS)
int offset;
if (md->setting == Metadata_setting_postproc &&
- (offset = settings_offset(service, md->name)) > 0)
+ (offset = settings_lookup_offset(service, md->name)) >= 0)
{
const char *val = session_setting_oneval(sdb, offset);
if (val)
}
}
-xmlDoc *normalize_record(struct session_database *sdb, struct session *se,
- const char *rec)
+static xmlDoc *normalize_record(struct session_database *sdb,
+ struct session *se,
+ const char *rec)
{
- struct database_retrievalmap *m;
xmlDoc *rdoc = record_to_xml(sdb, rec);
+
if (rdoc)
{
- for (m = sdb->map; m; m = m->next)
+ char *parms[MAX_XSLT_ARGS*2+1];
+
+ insert_settings_parameters(sdb, se, parms);
+
+ if (normalize_record_transform(sdb->map, &rdoc, (const char **)parms))
{
- xmlDoc *new = 0;
+ yaz_log(YLOG_WARN, "Normalize failed from %s", sdb->database->url);
+ }
+ else
+ {
+ insert_settings_values(sdb, rdoc, se->service);
+ if (global_parameters.dump_records)
{
- xmlNodePtr root = 0;
- char *parms[MAX_XSLT_ARGS*2+1];
-
- insert_settings_parameters(sdb, se, parms);
-
- if (m->stylesheet)
- {
- new = xsltApplyStylesheet(m->stylesheet, rdoc, (const char **) parms);
- }
- else if (m->marcmap)
- {
- new = marcmap_apply(m->marcmap, rdoc);
- }
-
- root = xmlDocGetRootElement(new);
-
- if (!new || !root || !(root->children))
- {
- yaz_log(YLOG_WARN, "XSLT transformation failed from %s",
- sdb->database->url);
- xmlFreeDoc(new);
- xmlFreeDoc(rdoc);
- return 0;
- }
+ yaz_log(YLOG_LOG, "Normalized record from %s",
+ sdb->database->url);
+ log_xml_doc(rdoc);
}
-
- xmlFreeDoc(rdoc);
- rdoc = new;
}
+ }
+ return rdoc;
+}
- insert_settings_values(sdb, rdoc, se->service);
-
- if (global_parameters.dump_records)
+void session_settings_dump(struct session *se,
+ struct session_database *db,
+ WRBUF w)
+{
+ if (db->settings)
+ {
+ int i, num = db->num_settings;
+ for (i = 0; i < num; i++)
{
- yaz_log(YLOG_LOG, "Normalized record from %s",
- sdb->database->url);
- log_xml_doc(rdoc);
+ struct setting *s = db->settings[i];
+ for (;s ; s = s->next)
+ {
+ wrbuf_puts(w, "<set name=\"");
+ wrbuf_xmlputs(w, s->name);
+ wrbuf_puts(w, "\" value=\"");
+ wrbuf_xmlputs(w, s->value);
+ wrbuf_puts(w, "\"/>");
+ }
+ if (db->settings[i])
+ wrbuf_puts(w, "\n");
}
}
- return rdoc;
}
// Retrieve first defined value for 'name' for given database.
}
if ((s = session_setting_oneval(sdb, PZ_XSLT)))
{
- char **stylesheets;
- struct database_retrievalmap **m = &sdb->map;
- int num, i;
char auto_stylesheet[256];
if (!strcmp(s, "auto"))
yaz_log(YLOG_WARN, "No pz:requestsyntax for auto stylesheet");
}
}
- nmem_strsplit(se->session_nmem, ",", s, &stylesheets, &num);
- for (i = 0; i < num; i++)
- {
- WRBUF fname = conf_get_fname(se->service, stylesheets[i]);
-
- (*m) = nmem_malloc(se->session_nmem, sizeof(**m));
- (*m)->next = 0;
-
- // XSLT
- if (!strcmp(&stylesheets[i][strlen(stylesheets[i])-4], ".xsl"))
- {
- (*m)->marcmap = NULL;
- if (!((*m)->stylesheet =
- xsltParseStylesheetFile((xmlChar *) wrbuf_cstr(fname))))
- {
- yaz_log(YLOG_FATAL|YLOG_ERRNO, "Unable to load stylesheet: %s",
- stylesheets[i]);
- wrbuf_destroy(fname);
- return -1;
- }
- }
- // marcmap
- else if (!strcmp(&stylesheets[i][strlen(stylesheets[i])-5], ".mmap"))
- {
- (*m)->stylesheet = NULL;
- if (!((*m)->marcmap = marcmap_load(wrbuf_cstr(fname), se->session_nmem)))
- {
- yaz_log(YLOG_FATAL|YLOG_ERRNO, "Unable to load marcmap: %s",
- stylesheets[i]);
- wrbuf_destroy(fname);
- return -1;
- }
- }
- wrbuf_destroy(fname);
- m = &(*m)->next;
- }
+ sdb->map = normalize_cache_get(se->normalize_cache,
+ se->service, s);
+ if (!sdb->map)
+ return -1;
}
- if (!sdb->map)
- yaz_log(YLOG_WARN, "No Normalization stylesheet for target %s",
- sdb->database->url);
return 0;
}
char *eq;
if ((eq = strchr(values[i], '=')))
new->type = PAZPAR2_STRING_MATCH;
- if ((eq = strchr(values[i], '~')))
+ else if ((eq = strchr(values[i], '~')))
new->type = PAZPAR2_SUBSTRING_MATCH;
- if (!eq)
+ else
{
- yaz_log(YLOG_WARN, "Missing equal-signi/tilde in filter");
+ yaz_log(YLOG_WARN, "Missing equal-sign/tilde in filter");
return 0;
}
*(eq++) = '\0';
}
enum pazpar2_error_code search(struct session *se,
- const char *query, const char *filter,
+ const char *query,
+ const char *startrecs, const char *maxrecs,
+ const char *filter,
const char **addinfo)
{
int live_channels = 0;
live_channels = select_targets(se, criteria);
if (live_channels)
{
- int maxrecs = live_channels * global_parameters.toget; // This is buggy!!!
- se->reclist = reclist_create(se->nmem, maxrecs);
- se->expected_maxrecs = maxrecs;
+ se->reclist = reclist_create(se->nmem);
}
else
return PAZPAR2_NO_TARGETS;
for (cl = se->clients; cl; cl = client_next_in_session(cl))
{
+ if (maxrecs)
+ client_set_maxrecs(cl, atoi(maxrecs));
+ if (startrecs)
+ client_set_startrecs(cl, atoi(startrecs));
if (prepare_session_database(se, client_get_database(cl)) < 0)
- {
- *addinfo = client_get_database(cl)->database->url;
- return PAZPAR2_CONFIG_TARGET;
- }
+ continue;
// Parse query for target
if (client_parse_query(cl, query) < 0)
no_failed++;
{
no_working++;
if (client_prep_connection(cl, se->service->z3950_operation_timeout,
- se->service->z3950_session_timeout))
+ se->service->z3950_session_timeout))
client_start_search(cl);
}
}
-
- // If no queries could be mapped, we signal an error
if (no_working == 0)
{
- *addinfo = "query";
- return PAZPAR2_MALFORMED_PARAMETER_VALUE;
+ if (no_failed > 0)
+ {
+ *addinfo = "query";
+ return PAZPAR2_MALFORMED_PARAMETER_VALUE;
+ }
+ else
+ return PAZPAR2_NO_TARGETS;
}
return PAZPAR2_NO_ERROR;
}
static void session_init_databases_fun(void *context, struct database *db)
{
struct session *se = (struct session *) context;
- struct conf_service *service = se->service;
struct session_database *new = nmem_malloc(se->session_nmem, sizeof(*new));
- int num = settings_num(service);
int i;
new->database = db;
new->map = 0;
- new->settings
- = nmem_malloc(se->session_nmem, sizeof(struct settings *) * num);
- memset(new->settings, 0, sizeof(struct settings*) * num);
-
- if (db->settings)
- {
- for (i = 0; i < num; i++)
- new->settings[i] = db->settings[i];
- }
+ assert(db->settings);
+ new->settings = nmem_malloc(se->session_nmem,
+ sizeof(struct settings *) * db->num_settings);
+ new->num_settings = db->num_settings;
+ for (i = 0; i < db->num_settings; i++)
+ new->settings[i] = db->settings[i];
new->next = se->databases;
se->databases = new;
}
// Doesn't free memory associated with sdb -- nmem takes care of that
static void session_database_destroy(struct session_database *sdb)
{
- struct database_retrievalmap *m;
-
- for (m = sdb->map; m; m = m->next)
- xsltFreeStylesheet(m->stylesheet);
+ sdb->map = 0;
}
// Initialize session_database list -- this represents this session's view
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_offset_cprefix(service, setting);
+ int offset = settings_create_offset(service, setting);
- if (offset < 0)
- {
- yaz_log(YLOG_WARN, "Unknown setting %s", setting);
- return;
- }
- // Jakub: This breaks the filter setting.
- /*if (offset == PZ_ID)
- {
- yaz_log(YLOG_WARN, "No need to set pz:id setting. Ignoring");
- return;
- }*/
+ expand_settings_array(&sdb->settings, &sdb->num_settings, offset,
+ se->session_nmem);
new->precedence = 0;
new->target = dbname;
new->name = setting;
case PZ_XSLT:
if (sdb->map)
{
- struct database_retrievalmap *m;
- // We don't worry about the map structure -- it's in nmem
- for (m = sdb->map; m; m = m->next)
- xsltFreeStylesheet(m->stylesheet);
sdb->map = 0;
}
break;
client_destroy(s->clients);
for (sdb = s->databases; sdb; sdb = sdb->next)
session_database_destroy(sdb);
+ normalize_cache_destroy(s->normalize_cache);
nmem_destroy(s->nmem);
service_destroy(s->service);
wrbuf_destroy(s->wrbuf);
session->num_termlists = 0;
session->reclist = 0;
session->clients = 0;
- session->expected_maxrecs = 0;
session->session_nmem = nmem;
session->nmem = nmem_create();
session->wrbuf = wrbuf_alloc();
session->watchlist[i].data = 0;
session->watchlist[i].fun = 0;
}
+ session->normalize_cache = normalize_cache_create();
+
return session;
}
*count = 0;
for (cl = se->clients; cl; cl = client_next_in_session(cl))
{
+ WRBUF w = wrbuf_alloc();
const char *name = session_setting_oneval(client_get_database(cl),
PZ_NAME);
res[*count].diagnostic = client_get_diagnostic(cl);
res[*count].state = client_get_state_str(cl);
res[*count].connected = client_get_connection(cl) ? 1 : 0;
+ session_settings_dump(se, client_get_database(cl), w);
+ res[*count].settings_xml = w;
(*count)++;
}
return res;
}
reclist_sort(s->reclist, sp);
- *total = s->reclist->num_records;
+ *total = reclist_get_num_records(s->reclist);
*sumhits = s->total_hits;
for (i = 0; i < start; i++)
if (type)
{
size_t len;
- const char *eq = strchr(s, '=');
+ const char *eq = strchr(s, '~');
if (eq)
len = eq - s;
else
service,
record, (char *) mergekey_norm,
&se->total_merged);
- if (global_parameters.dump_records)
- yaz_log(YLOG_LOG, "Cluster id %s from %s (#%d)", cluster->recid,
- sdb->database->url, record_no);
if (!cluster)
{
/* no room for record */
xmlFreeDoc(xdoc);
return 0;
}
+ if (global_parameters.dump_records)
+ yaz_log(YLOG_LOG, "Cluster id %s from %s (#%d)", cluster->recid,
+ sdb->database->url, record_no);
relevance_newrec(se->relevance, cluster);
// now parsing XML record and adding data to cluster or record metadata