-/* $Id: logic.c,v 1.27 2007-05-10 11:46:09 adam Exp $
+/* $Id: logic.c,v 1.35 2007-06-02 04:32:28 quinn Exp $
Copyright (c) 2006-2007, Index Data.
This file is part of Pazpar2.
"",
"",
0,
- 0,
+ 0, /* dump_records */
+ 0, /* debug_mode */
30,
"81",
"Index Data PazPar2",
{
struct database_retrievalmap *m;
struct database *db = sdb->database;
- xmlNode *res;
- xmlDoc *rdoc;
+ xmlDoc *rdoc = 0;
+ const Odr_oid *oid = rec->direct_reference;
- // First normalize to XML
- if (sdb->yaz_marc)
+ /* convert response record to XML somehow */
+ if (rec->which == Z_External_octet && oid
+ && !oid_oidcmp(oid, yaz_oid_recsyn_xml))
{
- char *buf;
- int len;
- if (rec->which != Z_External_octet)
+ /* xml already */
+ rdoc = xmlParseMemory((char*) rec->u.octet_aligned->buf,
+ rec->u.octet_aligned->len);
+ if (!rdoc)
{
- yaz_log(YLOG_WARN, "Unexpected external branch, probably BER %s",
+ yaz_log(YLOG_FATAL, "Non-wellformed XML received from %s",
db->url);
return 0;
}
- buf = (char*) rec->u.octet_aligned->buf;
- len = rec->u.octet_aligned->len;
- if (yaz_marc_read_iso2709(sdb->yaz_marc, buf, len) < 0)
+ }
+ else if (oid && yaz_oid_is_iso2709(oid))
+ {
+ /* ISO2709 gets converted to MARCXML */
+ if (!sdb->yaz_marc)
{
- yaz_log(YLOG_WARN, "Failed to decode MARC %s", db->url);
+ yaz_log(YLOG_FATAL, "Unable to handle ISO2709 record");
return 0;
}
-
- yaz_marc_write_using_libxml2(sdb->yaz_marc, 1);
- if (yaz_marc_write_xml(sdb->yaz_marc, &res,
- "http://www.loc.gov/MARC21/slim", 0, 0) < 0)
+ else
{
- yaz_log(YLOG_WARN, "Failed to encode as XML %s",
- db->url);
- return 0;
+ xmlNode *res;
+ char *buf;
+ int len;
+
+ if (rec->which != Z_External_octet)
+ {
+ yaz_log(YLOG_WARN, "Unexpected external branch, probably BER %s",
+ db->url);
+ return 0;
+ }
+ buf = (char*) rec->u.octet_aligned->buf;
+ len = rec->u.octet_aligned->len;
+ if (yaz_marc_read_iso2709(sdb->yaz_marc, buf, len) < 0)
+ {
+ yaz_log(YLOG_WARN, "Failed to decode MARC %s", db->url);
+ return 0;
+ }
+
+ yaz_marc_write_using_libxml2(sdb->yaz_marc, 1);
+ if (yaz_marc_write_xml(sdb->yaz_marc, &res,
+ "http://www.loc.gov/MARC21/slim", 0, 0) < 0)
+ {
+ yaz_log(YLOG_WARN, "Failed to encode as XML %s",
+ db->url);
+ return 0;
+ }
+ rdoc = xmlNewDoc((xmlChar *) "1.0");
+ xmlDocSetRootElement(rdoc, res);
}
- rdoc = xmlNewDoc((xmlChar *) "1.0");
- xmlDocSetRootElement(rdoc, res);
-
}
else
{
+ char oid_name_buf[OID_STR_MAX];
+ const char *oid_name = yaz_oid_to_string_buf(oid, 0, oid_name_buf);
yaz_log(YLOG_FATAL,
- "Unknown native_syntax in normalize_record from %s",
- db->url);
+ "Unable to handle record of type %s from %s",
+ oid_name, db->url);
return 0;
}
-
+
if (global_parameters.dump_records){
fprintf(stderr,
"Input Record (normalized) from %s\n----------------\n",
for (m = sdb->map; m; m = m->next){
xmlDoc *new = 0;
-#if 1
{
xmlNodePtr root = 0;
new = xsltApplyStylesheet(m->stylesheet, rdoc, 0);
return 0;
}
}
-#else
- // do it another way to detect transformation errors right now
- // but does not seem to work either!
- {
- xsltTransformContextPtr ctxt;
- ctxt = xsltNewTransformContext(m->stylesheet, rdoc);
- new = xsltApplyStylesheetUser(m->stylesheet, rdoc, 0, 0, 0, ctxt);
- if ((ctxt->state == XSLT_STATE_ERROR) ||
- (ctxt->state == XSLT_STATE_STOPPED)){
- yaz_log(YLOG_WARN, "XSLT transformation failed from %s",
- cl->database->database->url);
- xmlFreeDoc(new);
- xmlFreeDoc(rdoc);
- return 0;
- }
- }
-#endif
xmlFreeDoc(rdoc);
rdoc = new;
}
for (cl = se->clients; cl; cl = client_next_in_session(cl))
- {
client_prep_connection(cl);
- }
return 0;
}
new->database = db;
new->yaz_marc = 0;
- new->pct = pp2_charset_create();
+
+#ifdef HAVE_ICU
+ if (global_parameters.server && global_parameters.server->icu_chn)
+ new->pct = pp2_charset_create(global_parameters.server->icu_chn);
+ else
+ new->pct = pp2_charset_create(0);
+#else // HAVE_ICU
+ new->pct = pp2_charset_create(0);
+#endif // HAVE_ICU
+
new->map = 0;
new->settings
= nmem_malloc(se->session_nmem, sizeof(struct settings *) * num);
{
struct session_database *sdb = find_session_database(se, dbname);
struct setting *new = nmem_malloc(se->session_nmem, sizeof(*new));
- int offset = settings_offset(setting);
+ int offset = settings_offset_cprefix(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;
+ }*/
new->precedence = 0;
new->target = dbname;
new->name = setting;
return 0;
}
-#if 0
- record = nmem_malloc(se->nmem, sizeof(struct record));
- record->next = 0;
- record->client = cl;
- record->metadata = nmem_malloc(se->nmem,
- sizeof(struct record_metadata*) * service->num_metadata);
- memset(record->metadata, 0,
- sizeof(struct record_metadata*) * service->num_metadata);
-
-#else
record = record_create(se->nmem,
service->num_metadata, service->num_sortkeys);
record_assign_client(record, cl);
-#endif
mergekey_norm = (xmlChar *) nmem_strdup(se->nmem, (char*) mergekey);
xmlFree(mergekey);
if (!type || !value)
continue;
-#if 0
- // First, find out what field we're looking at
- for (md_field_id = 0; md_field_id < service->num_metadata;
- md_field_id++)
- if (!strcmp((const char *) type,
- service->metadata[md_field_id].name))
- {
- ser_md = &service->metadata[md_field_id];
- if (ser_md->sortkey_offset >= 0){
- sk_field_id = ser_md->sortkey_offset;
- ser_sk = &service->sortkeys[sk_field_id];
- }
- break;
- }
-
- if (!ser_md)
- {
- yaz_log(YLOG_WARN,
- "Ignoring unknown metadata element: %s", type);
- continue;
- }
-
-#else
md_field_id
= conf_service_metadata_field_id(service, (const char *) type);
if (md_field_id < 0)
sk_field_id = ser_md->sortkey_offset;
ser_sk = &service->sortkeys[sk_field_id];
}
-#endif
// Find out where we are putting it - based on merge or not
if (ser_md->merge == Metadata_merge_no)
wheretoput = &cluster->metadata[md_field_id];
// create new record_metadata
-#if 0
- rec_md = nmem_malloc(se->nmem, sizeof(struct record_metadata));
- rec_md->next = 0;
-#else
rec_md = record_metadata_create(se->nmem);
-#endif
// and polulate with data:
// type based charmapping decisions follow here
if (ser_md->type == Metadata_type_generic)
{
-#if 0
- char *p, *pe;
- for (p = (char *) value; *p && isspace(*p); p++)
- ;
- for (pe = p + strlen(p) - 1;
- pe > p && strchr(" ,/.:([", *pe); pe--)
- *pe = '\0';
-#else
char * p = (char *) value;
p = normalize7bit_generic(p, " ,/.:([");
-#endif
rec_md->data.text = nmem_strdup(se->nmem, p);
continue;
}
-#if 0 // this test does not belong here.
- // the condition is enforced in the constructor
- // inside conf_metadata_assign()
- // and will _never_ occur
- if (ser_md->type == Metadata_type_year
- && ser_md->merge != Metadata_merge_range)
- {
- yaz_log(YLOG_WARN, "Only range merging supported for years");
- continue;
- }
-# endif
-
-
// and polulate with data:
// assign cluster or record based on merge action
if (ser_md->merge == Metadata_merge_unique)
}
else if (ser_md->merge == Metadata_merge_range)
{
-
-#if 0 // this assert does not belong here.
- // the condition is enforced in the constructor
- // inside conf_metadata_assign()
- // and will _never_ occur
- assert(ser_md->type == Metadata_type_year);
-#endif
-
if (!*wheretoput)
{
*wheretoput = rec_md;
#endif
}
-#if 0 // this else is only entered when Metadata_merge_no
- // but I believe then we should _not_ pollute with log messages
- else
-
- yaz_log(YLOG_WARN,
- "Don't know how to merge on element name %s",
- ser_md->name);
-#endif
-
// ranking of _all_ fields enabled ...
if (ser_md->rank)