X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Flogic.c;h=4ec42cf1a5f8fc70fd31196e932dd881d8b107ca;hb=06ec84ec5e71464bbdb286b0548483b97147be81;hp=5a014aac5194fa9a5f26d078f73233de255aee03;hpb=b660a23f733b863332748bb2705f0050f58566e4;p=pazpar2-moved-to-github.git diff --git a/src/logic.c b/src/logic.c index 5a014aa..4ec42cf 100644 --- a/src/logic.c +++ b/src/logic.c @@ -1,4 +1,4 @@ -/* $Id: logic.c,v 1.26 2007-04-27 12:17:04 marc Exp $ +/* $Id: logic.c,v 1.32 2007-05-23 21:58:28 adam Exp $ Copyright (c) 2006-2007, Index Data. This file is part of Pazpar2. @@ -82,7 +82,8 @@ struct parameters global_parameters = "", "", 0, - 0, + 0, /* dump_records */ + 0, /* debug_mode */ 30, "81", "Index Data PazPar2", @@ -209,7 +210,6 @@ xmlDoc *normalize_record(struct session_database *sdb, Z_External *rec) for (m = sdb->map; m; m = m->next){ xmlDoc *new = 0; -#if 1 { xmlNodePtr root = 0; new = xsltApplyStylesheet(m->stylesheet, rdoc, 0); @@ -223,23 +223,6 @@ xmlDoc *normalize_record(struct session_database *sdb, Z_External *rec) 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; @@ -511,6 +494,17 @@ static void session_init_databases_fun(void *context, struct database *db) new->database = db; new->yaz_marc = 0; + +#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); @@ -534,6 +528,8 @@ static void session_database_destroy(struct session_database *sdb) xsltFreeStylesheet(m->stylesheet); if (sdb->yaz_marc) yaz_marc_destroy(sdb->yaz_marc); + if (sdb->pct) + pp2_charset_destroy(sdb->pct); } // Initialize session_database list -- this represents this session's view @@ -574,13 +570,19 @@ void session_apply_setting(struct session *se, char *dbname, char *setting, { 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; @@ -902,20 +904,9 @@ struct record *ingest_record(struct client *cl, Z_External *rec, 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); @@ -964,29 +955,6 @@ struct record *ingest_record(struct client *cl, Z_External *rec, 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) @@ -1002,7 +970,6 @@ struct record *ingest_record(struct client *cl, Z_External *rec, 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) @@ -1011,29 +978,15 @@ struct record *ingest_record(struct client *cl, Z_External *rec, 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); @@ -1050,19 +1003,6 @@ struct record *ingest_record(struct client *cl, Z_External *rec, 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) @@ -1106,14 +1046,6 @@ struct record *ingest_record(struct client *cl, Z_External *rec, } 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; @@ -1141,15 +1073,6 @@ struct record *ingest_record(struct client *cl, Z_External *rec, #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)