X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=src%2Fsession.c;h=b7fcfece770ff8fd568fb9e3a4860031e4dce5d0;hb=601854b8d4fa5992f037679d15baabcea211ff8b;hp=8deded888cd8b495005087bed17e4011e67357b6;hpb=2338caf3742f3414dcd1bbda7d8a7b249fca4e19;p=pazpar2-moved-to-github.git diff --git a/src/session.c b/src/session.c index 8deded8..b7fcfec 100644 --- a/src/session.c +++ b/src/session.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2012 Index Data + Copyright (C) 2006-2013 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 @@ -734,7 +734,6 @@ enum pazpar2_error_code session_search(struct session *se, int no_failed_query = 0; int no_failed_limit = 0; struct client_list *l, *l0; - facet_limits_t facet_limits; int same_sort_order = 0; session_log(se, YLOG_DEBUG, "Search"); @@ -764,8 +763,9 @@ enum pazpar2_error_code session_search(struct session *se, return PAZPAR2_NO_TARGETS; } - facet_limits = facet_limits_create(limit); - if (!facet_limits) + facet_limits_destroy(se->facet_limits); + se->facet_limits = facet_limits_create(limit); + if (!se->facet_limits) { *addinfo = "limit"; session_leave(se, "session_search"); @@ -784,7 +784,7 @@ enum pazpar2_error_code session_search(struct session *se, if (prepare_map(se, client_get_database(cl)) < 0) continue; - parse_ret = client_parse_query(cl, query, facet_limits, se->service->ccl_bibset); + parse_ret = client_parse_query(cl, query, se->facet_limits); if (parse_ret == -1) no_failed_query++; else if (parse_ret == -2) @@ -799,7 +799,6 @@ enum pazpar2_error_code session_search(struct session *se, no_working++; } } - facet_limits_destroy(facet_limits); session_reset_active_clients(se, l0); if (no_working == 0) @@ -931,6 +930,7 @@ void session_destroy(struct session *se) session_log(se, YLOG_DEBUG, "NMEN operation usage %zd", nmem_total(se->nmem)); if (nmem_total(se->session_nmem)) session_log(se, YLOG_DEBUG, "NMEN session usage %zd", nmem_total(se->session_nmem)); + facet_limits_destroy(se->facet_limits); nmem_destroy(se->nmem); service_destroy(se->service); yaz_mutex_destroy(&se->session_mutex); @@ -973,6 +973,7 @@ struct session *new_session(NMEM nmem, struct conf_service *service, session->nmem = nmem_create(); session->databases = 0; session->sorted_results = 0; + session->facet_limits = 0; for (i = 0; i <= SESSION_WATCH_MAX; i++) { @@ -1208,6 +1209,8 @@ struct record_cluster *show_single_start(struct session *se, const char *id, *next_r = 0; if (se->reclist) { + reclist_limit(se->reclist, se); + reclist_enter(se->reclist); while ((r = reclist_read_record(se->reclist))) { @@ -1230,67 +1233,63 @@ void show_single_stop(struct session *se, struct record_cluster *rec) session_leave(se, "show_single_stop"); } + struct record_cluster **show_range_start(struct session *se, struct reclist_sortparms *sp, - int start, int *num, int *total, Odr_int *sumhits, Odr_int *approx_hits) + int start, int *num, int *total, + Odr_int *sumhits, Odr_int *approx_hits) { - struct record_cluster **recs; + struct record_cluster **recs = 0; struct reclist_sortparms *spp; + struct client_list *l; int i; #if USE_TIMING yaz_timing_t t = yaz_timing_create(); #endif session_enter(se, "show_range_start"); - recs = nmem_malloc(se->nmem, *num * sizeof(struct record_cluster *)); - if (!se->relevance) - { - *num = 0; - *total = 0; - *sumhits = 0; - *approx_hits = 0; - recs = 0; - } - else + *sumhits = 0; + *approx_hits = 0; + *total = 0; + reclist_limit(se->reclist, se); + if (se->relevance) { - struct client_list *l; - for (spp = sp; spp; spp = spp->next) if (spp->type == Metadata_sortkey_relevance) { relevance_prepare_read(se->relevance, se->reclist); break; } - reclist_sort(se->reclist, sp); - - reclist_enter(se->reclist); - *total = reclist_get_num_records(se->reclist); - - *sumhits = 0; - *approx_hits = 0; for (l = se->clients_active; l; l = l->next) { *sumhits += client_get_hits(l->client); *approx_hits += client_get_approximation(l->client); } - for (i = 0; i < start; i++) - if (!reclist_read_record(se->reclist)) - { - *num = 0; - recs = 0; - break; - } + } + reclist_sort(se->reclist, sp); + + reclist_enter(se->reclist); + *total = reclist_get_num_records(se->reclist); - for (i = 0; i < *num; i++) + for (i = 0; i < start; i++) + if (!reclist_read_record(se->reclist)) { - struct record_cluster *r = reclist_read_record(se->reclist); - if (!r) - { - *num = i; - break; - } - recs[i] = r; + *num = 0; + break; } - reclist_leave(se->reclist); + + if (*num > 0) + recs = + nmem_malloc(se->nmem, *num * sizeof(struct record_cluster *)); + for (i = 0; i < *num; i++) + { + struct record_cluster *r = reclist_read_record(se->reclist); + if (!r) + { + *num = i; + break; + } + recs[i] = r; } + reclist_leave(se->reclist); #if USE_TIMING yaz_timing_stop(t); yaz_log(YLOG_LOG, "show %6.5f %3.2f %3.2f", @@ -1619,14 +1618,14 @@ int ingest_record(struct client *cl, const char *rec, return ret; } -static int match_metadata_local(struct record *record, - struct conf_service *service, - int md_field_id, +// struct conf_metadata *ser_md = &service->metadata[md_field_id]; +// struct record_metadata *rec_md = record->metadata[md_field_id]; +static int match_metadata_local(struct conf_metadata *ser_md, + struct record_metadata *rec_md0, char **values, int num_v) { int i; - struct conf_metadata *ser_md = &service->metadata[md_field_id]; - struct record_metadata *rec_md = record->metadata[md_field_id]; + struct record_metadata *rec_md = rec_md0; for (i = 0; i < num_v; ) { if (rec_md) @@ -1652,13 +1651,59 @@ static int match_metadata_local(struct record *record, } else { - rec_md = record->metadata[md_field_id]; + rec_md = rec_md0; i++; } } return i < num_v ? 1 : 0; } +int session_check_cluster_limit(struct session *se, struct record_cluster *rec) +{ + int i; + struct conf_service *service = se->service; + int ret = 1; + const char *name; + const char *value; + NMEM nmem_tmp = nmem_create(); + + for (i = 0; (name = facet_limits_get(se->facet_limits, i, &value)); i++) + { + int j; + for (j = 0; j < service->num_metadata; j++) + { + struct conf_metadata *md = service->metadata + j; + if (!strcmp(md->name, name) && md->limitcluster) + { + char **values = 0; + int num = 0; + int md_field_id = + conf_service_metadata_field_id(service, + md->limitcluster); + + if (md_field_id < 0) + { + ret = 0; + break; + } + + nmem_strsplit_escape2(nmem_tmp, "|", value, &values, + &num, 1, '\\', 1); + + if (!match_metadata_local(&service->metadata[md_field_id], + rec->metadata[md_field_id], + values, num)) + { + ret = 0; + break; + } + } + } + } + nmem_destroy(nmem_tmp); + return ret; +} + // Skip record on non-zero static int check_limit_local(struct client *cl, struct record *record, @@ -1686,8 +1731,10 @@ static int check_limit_local(struct client *cl, for (md_field_id = 0; md_field_id < service->num_metadata; md_field_id++) { - if (match_metadata_local(record, service, md_field_id, - values, num_v)) + if (match_metadata_local( + &service->metadata[md_field_id], + record->metadata[md_field_id], + values, num_v)) break; } if (md_field_id == service->num_metadata) @@ -1701,8 +1748,10 @@ static int check_limit_local(struct client *cl, skip_record = 1; break; } - if (!match_metadata_local(record, service, md_field_id, - values, num_v)) + if (!match_metadata_local( + &service->metadata[md_field_id], + record->metadata[md_field_id], + values, num_v)) { skip_record = 1; } @@ -1725,6 +1774,7 @@ static int ingest_to_cluster(struct client *cl, struct conf_service *service = se->service; int term_factor = 1; struct record_cluster *cluster; + struct record_metadata **metadata0; struct session_database *sdb = client_get_database(cl); struct record *record = record_create(se->nmem, service->num_metadata, @@ -1820,6 +1870,11 @@ static int ingest_to_cluster(struct client *cl, relevance_newrec(se->relevance, cluster); + // original metadata, to check if first existence of a field + metadata0 = xmalloc(sizeof(*metadata0) * service->num_metadata); + memcpy(metadata0, cluster->metadata, + sizeof(*metadata0) * service->num_metadata); + // now parsing XML record and adding data to cluster or record metadata for (n = root->children; n; n = n->next) { @@ -1865,6 +1920,9 @@ static int ingest_to_cluster(struct client *cl, // merged metadata rec_md = record_metadata_init(se->nmem, (const char *) value, ser_md->type, 0); + + // see if the field was not in cluster already (from beginning) + if (!rec_md) continue; @@ -1873,9 +1931,16 @@ static int ingest_to_cluster(struct client *cl, wheretoput = &cluster->metadata[md_field_id]; - // and polulate with data: - // assign cluster or record based on merge action - if (ser_md->merge == Metadata_merge_unique) + if (ser_md->merge == Metadata_merge_first) + { + if (!metadata0[md_field_id]) + { + while (*wheretoput) + wheretoput = &(*wheretoput)->next; + *wheretoput = rec_md; + } + } + else if (ser_md->merge == Metadata_merge_unique) { while (*wheretoput) { @@ -2001,6 +2066,7 @@ static int ingest_to_cluster(struct client *cl, if (value) xmlFree(value); + xfree(metadata0); relevance_donerecord(se->relevance, cluster); se->total_records++;