X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Flogic.c;h=c07d3036a4e4b7949669dd66a078370c6332f218;hb=572de728d257c3d2e6b11d0f60713c81b004c406;hp=9e24e8a2bd36b8656252874c4bcca1e15438d068;hpb=ec1a0e3f9b22db0f03fb22e43f374f2cdffce438;p=pazpar2-moved-to-github.git diff --git a/src/logic.c b/src/logic.c index 9e24e8a..c07d303 100644 --- a/src/logic.c +++ b/src/logic.c @@ -191,7 +191,7 @@ static void insert_settings_parameters(struct session_database *sdb, int setting; if (md->setting == Metadata_setting_parameter && - (setting = settings_offset(service, md->name)) > 0) + (setting = settings_lookup_offset(service, md->name)) >= 0) { const char *val = session_setting_oneval(sdb, setting); if (val && nparms < MAX_XSLT_ARGS) @@ -224,7 +224,7 @@ static void insert_settings_values(struct session_database *sdb, xmlDoc *doc, int offset; if (md->setting == Metadata_setting_postproc && - (offset = settings_offset(service, md->name)) > 0) + (offset = settings_lookup_offset(service, md->name)) >= 0) { const char *val = session_setting_oneval(sdb, offset); if (val) @@ -269,6 +269,30 @@ static xmlDoc *normalize_record(struct session_database *sdb, return rdoc; } +void session_settings_dump(struct session *se, + struct session_database *db, + WRBUF w) +{ + if (db->settings) + { + int i, num = db->num_settings; + for (i = 0; i < num; i++) + { + struct setting *s = db->settings[i]; + for (;s ; s = s->next) + { + wrbuf_puts(w, "name); + wrbuf_puts(w, "\" value=\""); + wrbuf_xmlputs(w, s->value); + wrbuf_puts(w, "\"/>"); + } + if (db->settings[i]) + wrbuf_puts(w, "\n"); + } + } +} + // Retrieve first defined value for 'name' for given database. // Will be extended to take into account user associated with session const char *session_setting_oneval(struct session_database *db, int offset) @@ -404,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) @@ -424,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, @@ -479,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"); @@ -489,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); @@ -534,23 +512,18 @@ enum pazpar2_error_code search(struct session *se, static void session_init_databases_fun(void *context, struct database *db) { struct session *se = (struct session *) context; - struct conf_service *service = se->service; struct session_database *new = nmem_malloc(se->session_nmem, sizeof(*new)); - int num = settings_num(service); int i; new->database = db; new->map = 0; - new->settings - = nmem_malloc(se->session_nmem, sizeof(struct settings *) * num); - memset(new->settings, 0, sizeof(struct settings*) * num); - - if (db->settings) - { - for (i = 0; i < num; i++) - new->settings[i] = db->settings[i]; - } + assert(db->settings); + new->settings = nmem_malloc(se->session_nmem, + sizeof(struct settings *) * db->num_settings); + new->num_settings = db->num_settings; + for (i = 0; i < db->num_settings; i++) + new->settings[i] = db->settings[i]; new->next = se->databases; se->databases = new; } @@ -566,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 @@ -574,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); @@ -602,19 +575,10 @@ void session_apply_setting(struct session *se, char *dbname, char *setting, struct session_database *sdb = find_session_database(se, dbname); struct conf_service *service = se->service; struct setting *new = nmem_malloc(se->session_nmem, sizeof(*new)); - int offset = settings_offset_cprefix(service, setting); + int offset = settings_create_offset(service, 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; - }*/ + expand_settings_array(&sdb->settings, &sdb->num_settings, offset, + se->session_nmem); new->precedence = 0; new->target = dbname; new->name = setting; @@ -692,6 +656,7 @@ struct hitsbytarget *hitsbytarget(struct session *se, int *count, NMEM nmem) *count = 0; for (cl = se->clients; cl; cl = client_next_in_session(cl)) { + WRBUF w = wrbuf_alloc(); const char *name = session_setting_oneval(client_get_database(cl), PZ_NAME); @@ -702,6 +667,8 @@ struct hitsbytarget *hitsbytarget(struct session *se, int *count, NMEM nmem) res[*count].diagnostic = client_get_diagnostic(cl); res[*count].state = client_get_state_str(cl); res[*count].connected = client_get_connection(cl) ? 1 : 0; + session_settings_dump(se, client_get_database(cl), w); + res[*count].settings_xml = w; (*count)++; } return res; @@ -855,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) @@ -905,7 +895,7 @@ 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); wrbuf_puts(norm_wr, name); wrbuf_puts(norm_wr, "="); @@ -945,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))) { @@ -1154,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'", @@ -1168,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: @@ -1207,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; @@ -1262,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)