X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Flogic.c;h=4ec42cf1a5f8fc70fd31196e932dd881d8b107ca;hb=9ee952e04b4765c49f3b767813f8c8d5579ae005;hp=23d60dc32ad7861f4fc57a0d285b66150ac6afd8;hpb=a8f5308820cd689f5b92601038cb5d24118d5f2b;p=pazpar2-moved-to-github.git diff --git a/src/logic.c b/src/logic.c index 23d60dc..4ec42cf 100644 --- a/src/logic.c +++ b/src/logic.c @@ -1,4 +1,4 @@ -/* $Id: logic.c,v 1.25 2007-04-26 21:33:32 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); @@ -936,6 +927,8 @@ struct record *ingest_record(struct client *cl, Z_External *rec, } relevance_newrec(se->relevance, cluster); + + // now parsing XML record and adding data to cluster or record metadata for (n = root->children; n; n = n->next) { if (type) @@ -962,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) @@ -1000,39 +970,30 @@ 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 + // Find out where we are putting it - based on merge or not if (ser_md->merge == Metadata_merge_no) wheretoput = &record->metadata[md_field_id]; else wheretoput = &cluster->metadata[md_field_id]; - // Put it there - -#if 1 //something wrong with constructor, debug tomorrow - rec_md = nmem_malloc(se->nmem, sizeof(struct record_metadata)); - rec_md->next = 0; -#else + // create new record_metadata 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) { - char *p, *pe; - for (p = (char *) value; *p && isspace(*p); p++) - ; - for (pe = p + strlen(p) - 1; - pe > p && strchr(" ,/.:([", *pe); pe--) - *pe = '\0'; - //char * normalize7bit_generic(char* str, char* rm_chars); + + char * p = (char *) value; + p = normalize7bit_generic(p, " ,/.:(["); rec_md->data.text = nmem_strdup(se->nmem, p); } else if (ser_md->type == Metadata_type_year) { - if (extract_years((char *) value, &first, &last) < 0) + if (extract7bit_years((char *) value, &first, &last) < 0) continue; } else @@ -1041,12 +1002,9 @@ struct record *ingest_record(struct client *cl, Z_External *rec, "Unknown type in metadata element %s", type); continue; } - if (ser_md->type == Metadata_type_year - && ser_md->merge != Metadata_merge_range) - { - yaz_log(YLOG_WARN, "Only range merging supported for years"); - continue; - } + + // and polulate with data: + // assign cluster or record based on merge action if (ser_md->merge == Metadata_merge_unique) { struct record_metadata *mnode; @@ -1088,7 +1046,6 @@ struct record *ingest_record(struct client *cl, Z_External *rec, } else if (ser_md->merge == Metadata_merge_range) { - assert(ser_md->type == Metadata_type_year); if (!*wheretoput) { *wheretoput = rec_md; @@ -1115,14 +1072,14 @@ struct record *ingest_record(struct client *cl, Z_External *rec, } #endif } - else - yaz_log(YLOG_WARN, - "Don't know how to merge on element name %s", - ser_md->name); + + // ranking of _all_ fields enabled ... if (ser_md->rank) relevance_countwords(se->relevance, cluster, (char *) value, ser_md->rank); + + // construct facets ... if (ser_md->termlist) { if (ser_md->type == Metadata_type_year) @@ -1139,6 +1096,8 @@ struct record *ingest_record(struct client *cl, Z_External *rec, else add_facet(se, (char *) type, (char *) value); } + + // cleaning up xmlFree(type); xmlFree(value); type = value = 0;