#include "client.h"
#include "settings.h"
#include "normalize7bit.h"
-#include "marcmap.h"
#define TERMLIST_HIGH_SCORE 25
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))
+ {
+ yaz_log(YLOG_WARN, "Normalize failed from %s", sdb->database->url);
+ }
+ else
{
- xmlDoc *new = 0;
+ 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;
- }
-
- insert_settings_values(sdb, rdoc, se->service);
-
- if (global_parameters.dump_records)
- {
- yaz_log(YLOG_LOG, "Normalized record from %s",
- sdb->database->url);
- log_xml_doc(rdoc);
}
}
return rdoc;
}
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_record_create(se->service, s);
}
- if (!sdb->map)
- yaz_log(YLOG_WARN, "No Normalization stylesheet for target %s",
- sdb->database->url);
return 0;
}
int subnum;
int subi;
struct database_criterion *new = nmem_malloc(m, sizeof(*new));
- char *eq = strchr(values[i], '=');
+ char *eq;
+ if ((eq = strchr(values[i], '=')))
+ new->type = PAZPAR2_STRING_MATCH;
+ if ((eq = strchr(values[i], '~')))
+ new->type = PAZPAR2_SUBSTRING_MATCH;
if (!eq)
{
- yaz_log(YLOG_WARN, "Missing equal-sign in filter");
+ yaz_log(YLOG_WARN, "Missing equal-signi/tilde in filter");
return 0;
}
*(eq++) = '\0';
// 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);
+ normalize_record_destroy(sdb->map);
+ sdb->map = 0;
}
// Initialize session_database list -- this represents this session's view
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);
+ normalize_record_destroy(sdb->map);
sdb->map = 0;
}
break;
return rec_md;
}
+static int get_mergekey_from_doc(xmlDoc *doc, xmlNode *root, const char *name,
+ struct conf_service *service, WRBUF norm_wr)
+{
+ xmlNode *n;
+ int no_found = 0;
+ for (n = root->children; n; n = n->next)
+ {
+ if (n->type != XML_ELEMENT_NODE)
+ continue;
+ if (!strcmp((const char *) n->name, "metadata"))
+ {
+ xmlChar *type = xmlGetProp(n, (xmlChar *) "type");
+ if (!strcmp(name, (const char *) type))
+ {
+ xmlChar *value = xmlNodeListGetString(doc, n->children, 1);
+ if (value)
+ {
+ const char *norm_str;
+ pp2_relevance_token_t prt =
+ pp2_relevance_tokenize(
+ service->mergekey_pct,
+ (const char *) value);
+
+ wrbuf_puts(norm_wr, name);
+ wrbuf_puts(norm_wr, "=");
+ while ((norm_str =
+ pp2_relevance_token_next(prt)))
+ {
+ if (*norm_str)
+ {
+ if (wrbuf_len(norm_wr))
+ wrbuf_puts(norm_wr, " ");
+ wrbuf_puts(norm_wr, norm_str);
+ }
+ }
+ xmlFree(value);
+ pp2_relevance_token_destroy(prt);
+ no_found++;
+ }
+ }
+ xmlFree(type);
+ }
+ }
+ return no_found;
+}
+
static const char *get_mergekey(xmlDoc *doc, struct client *cl, int record_no,
struct conf_service *service, NMEM nmem)
{
char *mergekey_norm = 0;
xmlNode *root = xmlDocGetRootElement(doc);
WRBUF norm_wr = wrbuf_alloc();
- xmlNode *n;
/* consider mergekey from XSL first */
xmlChar *mergekey = xmlGetProp(root, (xmlChar *) "mergekey");
else
{
/* no mergekey defined in XSL. Look for mergekey metadata instead */
- for (n = root->children; n; n = n->next)
+ int field_id;
+ for (field_id = 0; field_id < service->num_metadata; field_id++)
{
- if (n->type != XML_ELEMENT_NODE)
- continue;
- if (!strcmp((const char *) n->name, "metadata"))
+ struct conf_metadata *ser_md = &service->metadata[field_id];
+ if (ser_md->mergekey != Metadata_mergekey_no)
{
- struct conf_metadata *ser_md = 0;
- int md_field_id = -1;
-
- xmlChar *type = xmlGetProp(n, (xmlChar *) "type");
-
- if (!type)
- continue;
-
- md_field_id
- = conf_service_metadata_field_id(service,
- (const char *) type);
- if (md_field_id >= 0)
+ int r = get_mergekey_from_doc(doc, root, ser_md->name,
+ service, norm_wr);
+ if (r == 0 && ser_md->mergekey == Metadata_mergekey_required)
{
- ser_md = &service->metadata[md_field_id];
- if (ser_md->mergekey == Metadata_mergekey_yes)
- {
- xmlChar *value = xmlNodeListGetString(doc, n->children, 1);
- if (value)
- {
- const char *norm_str;
- pp2_relevance_token_t prt =
- pp2_relevance_tokenize(
- service->mergekey_pct,
- (const char *) value);
-
- while ((norm_str = pp2_relevance_token_next(prt)))
- {
- if (*norm_str)
- {
- if (wrbuf_len(norm_wr))
- wrbuf_puts(norm_wr, " ");
- wrbuf_puts(norm_wr, norm_str);
- }
- }
- xmlFree(value);
- pp2_relevance_token_destroy(prt);
- }
- }
+ /* no mergekey on this one and it is required..
+ Generate unique key instead */
+ wrbuf_rewind(norm_wr);
+ break;
}
- xmlFree(type);
}
}
}