X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Flogic.c;h=be2ec0493162dec09bba9f5b89a388452cba807f;hb=18c38880bdfe4694fdf6bc3bbbea90740930aa65;hp=d02ced415d33cd1e4966b8841e60e04d60ca1124;hpb=c9b8aa39dec714c08863e7fbb6c6a7821421f947;p=pazpar2-moved-to-github.git diff --git a/src/logic.c b/src/logic.c index d02ced4..be2ec04 100644 --- a/src/logic.c +++ b/src/logic.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2009 Index Data + Copyright (C) 2006-2010 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -92,7 +92,7 @@ static void log_xml_doc(xmlDoc *doc) #endif if (lf && len) { - fwrite(result, 1, len, lf); + (void) fwrite(result, 1, len, lf); fprintf(lf, "\n"); } xmlFree(result); @@ -428,12 +428,12 @@ static void select_targets_callback(void *context, struct session_database *db) // Associates a set of clients with a session; // Note: Session-databases represent databases with per-session // setting overrides -int select_targets(struct session *se, struct database_criterion *crit) +static int select_targets(struct session *se, const char *filter) { while (se->clients) client_destroy(se->clients); - return session_grep_databases(se, crit, select_targets_callback); + return session_grep_databases(se, filter, select_targets_callback); } int session_active_clients(struct session *s) @@ -448,50 +448,6 @@ int session_active_clients(struct session *s) return res; } -// parses crit1=val1,crit2=val2|val3,... -static struct database_criterion *parse_filter(NMEM m, const char *buf) -{ - struct database_criterion *res = 0; - char **values; - int num; - int i; - - if (!buf || !*buf) - return 0; - nmem_strsplit(m, ",", buf, &values, &num); - for (i = 0; i < num; i++) - { - char **subvalues; - int subnum; - int subi; - struct database_criterion *new = nmem_malloc(m, sizeof(*new)); - char *eq; - if ((eq = strchr(values[i], '='))) - new->type = PAZPAR2_STRING_MATCH; - else if ((eq = strchr(values[i], '~'))) - new->type = PAZPAR2_SUBSTRING_MATCH; - else - { - yaz_log(YLOG_WARN, "Missing equal-sign/tilde in filter"); - return 0; - } - *(eq++) = '\0'; - new->name = values[i]; - nmem_strsplit(m, "|", eq, &subvalues, &subnum); - new->values = 0; - for (subi = 0; subi < subnum; subi++) - { - struct database_criterion_value *newv - = nmem_malloc(m, sizeof(*newv)); - newv->value = subvalues[subi]; - newv->next = new->values; - new->values = newv; - } - new->next = res; - res = new; - } - return res; -} enum pazpar2_error_code search(struct session *se, const char *query, @@ -503,7 +459,6 @@ enum pazpar2_error_code search(struct session *se, int no_working = 0; int no_failed = 0; struct client *cl; - struct database_criterion *criteria; yaz_log(YLOG_DEBUG, "Search"); @@ -513,8 +468,7 @@ enum pazpar2_error_code search(struct session *se, se->total_records = se->total_hits = se->total_merged = 0; se->reclist = 0; se->num_termlists = 0; - criteria = parse_filter(se->nmem, filter); - live_channels = select_targets(se, criteria); + live_channels = select_targets(se, filter); if (live_channels) { se->reclist = reclist_create(se->nmem); @@ -585,7 +539,7 @@ static void session_database_destroy(struct session_database *sdb) void session_init_databases(struct session *se) { se->databases = 0; - predef_grep_databases(se, se->service, 0, session_init_databases_fun); + predef_grep_databases(se, se->service, session_init_databases_fun); } // Probably session_init_databases_fun should be refactored instead of @@ -593,7 +547,7 @@ void session_init_databases(struct session *se) static struct session_database *load_session_database(struct session *se, char *id) { - struct database *db = find_database(id, 0, se->service); + struct database *db = find_database(id, se->service); resolve_database(db); @@ -765,7 +719,7 @@ struct record_cluster *show_single(struct session *s, const char *id, } struct record_cluster **show(struct session *s, struct reclist_sortparms *sp, - int start, int *num, int *total, int *sumhits, + int start, int *num, int *total, Odr_int *sumhits, NMEM nmem_show) { struct record_cluster **recs = nmem_malloc(nmem_show, *num @@ -868,15 +822,38 @@ void pazpar2_event_loop() } static struct record_metadata *record_metadata_init( - NMEM nmem, char *value, enum conf_metadata_type type) + NMEM nmem, const char *value, enum conf_metadata_type type, + struct _xmlAttr *attr) { struct record_metadata *rec_md = record_metadata_create(nmem); + struct record_metadata_attr **attrp = &rec_md->attributes; + + for (; attr; attr = attr->next) + { + if (attr->children && attr->children->content) + { + if (strcmp((const char *) attr->name, "type")) + { /* skip the "type" attribute.. Its value is already part of + the element in output (md-%s) and so repeating it here + is redundant */ + *attrp = nmem_malloc(nmem, sizeof(**attrp)); + (*attrp)->name = + nmem_strdup(nmem, (const char *) attr->name); + (*attrp)->value = + nmem_strdup(nmem, (const char *) attr->children->content); + attrp = &(*attrp)->next; + } + } + } + *attrp = 0; + if (type == Metadata_type_generic) { - char * p = value; + char *p = nmem_strdup(nmem, value); + p = normalize7bit_generic(p, " ,/.:(["); - rec_md->data.text.disp = nmem_strdup(nmem, p); + rec_md->data.text.disp = p; rec_md->data.text.sort = 0; } else if (type == Metadata_type_year || type == Metadata_type_date) @@ -918,17 +895,17 @@ static int get_mergekey_from_doc(xmlDoc *doc, xmlNode *root, const char *name, pp2_relevance_token_t prt = pp2_relevance_tokenize( service->mergekey_pct, - (const char *) value); + (const char *) value, 0); + if (wrbuf_len(norm_wr) > 0) + wrbuf_puts(norm_wr, " "); 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, " "); wrbuf_puts(norm_wr, norm_str); } } @@ -958,7 +935,7 @@ static const char *get_mergekey(xmlDoc *doc, struct client *cl, int record_no, pp2_relevance_token_t prt = pp2_relevance_tokenize( service->mergekey_pct, - (const char *) mergekey); + (const char *) mergekey, 0); while ((norm_str = pp2_relevance_token_next(prt))) { @@ -1167,8 +1144,8 @@ struct record *ingest_record(struct client *cl, const char *rec, } // non-merged metadata - rec_md = record_metadata_init(se->nmem, (char *) value, - ser_md->type); + rec_md = record_metadata_init(se->nmem, (const char *) value, + ser_md->type, n->properties); if (!rec_md) { yaz_log(YLOG_WARN, "bad metadata data '%s' for element '%s'", @@ -1181,8 +1158,8 @@ struct record *ingest_record(struct client *cl, const char *rec, *wheretoput = rec_md; // merged metadata - rec_md = record_metadata_init(se->nmem, (char *) value, - ser_md->type); + rec_md = record_metadata_init(se->nmem, (const char *) value, + ser_md->type, 0); wheretoput = &cluster->metadata[md_field_id]; // and polulate with data: @@ -1220,11 +1197,11 @@ struct record *ingest_record(struct client *cl, const char *rec, prt = pp2_relevance_tokenize( service->sort_pct, - rec_md->data.text.disp); + rec_md->data.text.disp, skip_article); pp2_relevance_token_next(prt); - sort_str = pp2_get_sort(prt, skip_article); + sort_str = pp2_get_sort(prt); cluster->sortkeys[sk_field_id]->text.disp = rec_md->data.text.disp; @@ -1275,7 +1252,8 @@ struct record *ingest_record(struct client *cl, const char *rec, // ranking of _all_ fields enabled ... if (ser_md->rank) relevance_countwords(se->relevance, cluster, - (char *) value, ser_md->rank); + (char *) value, ser_md->rank, + ser_md->name); // construct facets ... if (ser_md->termlist)