X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fsession.c;h=e3e0a0d87c52397ce19879e13ddb13ecabb7cb8a;hb=b22c4ae2c14eb5d2b991e6233cdea2a9fd7dcf6c;hp=5f84c8849aeb60a038cf0e76c105fe2cee0ca5b9;hpb=1a758f7086294d72bae431be64eb851b51f121cf;p=pazpar2-moved-to-github.git diff --git a/src/session.c b/src/session.c index 5f84c88..e3e0a0d 100644 --- a/src/session.c +++ b/src/session.c @@ -97,7 +97,6 @@ struct client_list { /* session counting (1) , disable client counting (0) */ static YAZ_MUTEX g_session_mutex = 0; static int no_sessions = 0; -static int no_session_total = 0; static int session_use(int delta) { @@ -106,11 +105,10 @@ static int session_use(int delta) yaz_mutex_create(&g_session_mutex); yaz_mutex_enter(g_session_mutex); no_sessions += delta; - if (delta > 0) - no_session_total += delta; sessions = no_sessions; yaz_mutex_leave(g_session_mutex); - yaz_log(YLOG_DEBUG, "%s sessions=%d", delta == 0 ? "" : (delta > 0 ? "INC" : "DEC"), no_sessions); + yaz_log(YLOG_DEBUG, "%s sessions=%d", delta == 0 ? "" : + (delta > 0 ? "INC" : "DEC"), no_sessions); return sessions; } @@ -119,17 +117,6 @@ int sessions_count(void) return session_use(0); } -int session_count_total(void) -{ - int total = 0; - if (!g_session_mutex) - return 0; - yaz_mutex_enter(g_session_mutex); - total = no_session_total; - yaz_mutex_leave(g_session_mutex); - return total; -} - static void log_xml_doc(xmlDoc *doc) { FILE *lf = yaz_log_file(); @@ -162,10 +149,9 @@ static void session_leave(struct session *s, const char *caller) session_log(s, YLOG_DEBUG, "Session unlock by %s", caller); } -static void session_normalize_facet(struct session *s, const char *type, - const char *value, - WRBUF display_wrbuf, - WRBUF facet_wrbuf) +static void session_normalize_facet(struct session *s, + const char *type, const char *value, + WRBUF display_wrbuf, WRBUF facet_wrbuf) { struct conf_service *service = s->service; pp2_charset_token_t prt; @@ -648,7 +634,8 @@ static void session_clear_set(struct session *se, struct reclist_sortparms *sp) static void session_sort_unlocked(struct session *se, struct reclist_sortparms *sp, - const char *mergekey) + const char *mergekey, + const char *rank) { struct client_list *l; const char *field = sp->name; @@ -659,7 +646,17 @@ static void session_sort_unlocked(struct session *se, session_log(se, YLOG_DEBUG, "session_sort field=%s increasing=%d type=%d", field, increasing, type); - if (mergekey && strcmp(se->mergekey, mergekey)) + if (rank && (!se->rank || strcmp(se->rank, rank))) + { + /* new rank must research/reingest anyway */ + assert(rank); + xfree(se->rank); + se->rank = *rank ? xstrdup(rank) : 0; + clients_research = 1; + session_log(se, YLOG_DEBUG, "session_sort: new rank = %s", + rank); + } + if (mergekey && (!se->mergekey || strcmp(se->mergekey, mergekey))) { /* new mergekey must research/reingest anyway */ assert(mergekey); @@ -736,10 +733,10 @@ static void session_sort_unlocked(struct session *se, } void session_sort(struct session *se, struct reclist_sortparms *sp, - const char *mergekey) + const char *mergekey, const char *rank) { //session_enter(se, "session_sort"); - session_sort_unlocked(se, sp, mergekey); + session_sort_unlocked(se, sp, mergekey, rank); //session_leave(se, "session_sort"); } @@ -752,7 +749,8 @@ enum pazpar2_error_code session_search(struct session *se, const char *limit, const char **addinfo, struct reclist_sortparms *sp, - const char *mergekey) + const char *mergekey, + const char *rank) { int live_channels = 0; int no_working = 0; @@ -778,6 +776,11 @@ enum pazpar2_error_code session_search(struct session *se, xfree(se->mergekey); se->mergekey = *mergekey ? xstrdup(mergekey) : 0; } + if (rank) + { + xfree(se->rank); + se->rank = *rank ? xstrdup(rank) : 0; + } session_clear_set(se, sp); relevance_destroy(&se->relevance); @@ -953,6 +956,7 @@ void session_destroy(struct session *se) relevance_destroy(&se->relevance); reclist_destroy(se->reclist); xfree(se->mergekey); + xfree(se->rank); if (nmem_total(se->nmem)) session_log(se, YLOG_DEBUG, "NMEN operation usage %zd", nmem_total(se->nmem)); if (nmem_total(se->session_nmem)) @@ -1002,6 +1006,7 @@ struct session *new_session(NMEM nmem, struct conf_service *service, session->sorted_results = 0; session->facet_limits = 0; session->mergekey = 0; + session->rank = 0; for (i = 0; i <= SESSION_WATCH_MAX; i++) { @@ -1462,6 +1467,7 @@ static struct record_metadata *record_metadata_init( rec_md->data.text.disp = p; rec_md->data.text.sort = 0; + rec_md->data.text.snippet = 0; } else if (type == Metadata_type_year || type == Metadata_type_date) { @@ -1481,6 +1487,26 @@ static struct record_metadata *record_metadata_init( return rec_md; } +static void mergekey_norm_wr(pp2_charset_fact_t charsets, + WRBUF norm_wr, const char *value) +{ + const char *norm_str; + pp2_charset_token_t prt = + pp2_charset_token_create(charsets, "mergekey"); + + pp2_charset_token_first(prt, value, 0); + while ((norm_str = pp2_charset_token_next(prt))) + { + if (*norm_str) + { + if (wrbuf_len(norm_wr)) + wrbuf_puts(norm_wr, " "); + wrbuf_puts(norm_wr, norm_str); + } + } + pp2_charset_token_destroy(prt); +} + static int get_mergekey_from_doc(xmlDoc *doc, xmlNode *root, const char *name, struct conf_service *service, WRBUF norm_wr) { @@ -1501,24 +1527,11 @@ static int get_mergekey_from_doc(xmlDoc *doc, xmlNode *root, const char *name, xmlChar *value = xmlNodeListGetString(doc, n->children, 1); if (value && *value) { - const char *norm_str; - pp2_charset_token_t prt = - pp2_charset_token_create(service->charsets, "mergekey"); - - pp2_charset_token_first(prt, (const char *) value, 0); if (wrbuf_len(norm_wr) > 0) wrbuf_puts(norm_wr, " "); wrbuf_puts(norm_wr, name); - while ((norm_str = - pp2_charset_token_next(prt))) - { - if (*norm_str) - { - wrbuf_puts(norm_wr, " "); - wrbuf_puts(norm_wr, norm_str); - } - } - pp2_charset_token_destroy(prt); + mergekey_norm_wr(service->charsets, norm_wr, + (const char *) value); no_found++; } if (value) @@ -1551,21 +1564,7 @@ static const char *get_mergekey(xmlDoc *doc, struct client *cl, int record_no, } else if ((mergekey = xmlGetProp(root, (xmlChar *) "mergekey"))) { - const char *norm_str; - pp2_charset_token_t prt = - pp2_charset_token_create(service->charsets, "mergekey"); - - pp2_charset_token_first(prt, (const char *) mergekey, 0); - while ((norm_str = pp2_charset_token_next(prt))) - { - if (*norm_str) - { - if (wrbuf_len(norm_wr)) - wrbuf_puts(norm_wr, " "); - wrbuf_puts(norm_wr, norm_str); - } - } - pp2_charset_token_destroy(prt); + mergekey_norm_wr(service->charsets, norm_wr, (const char *) mergekey); xmlFree(mergekey); } else @@ -1726,12 +1725,15 @@ int ingest_record(struct client *cl, const char *rec, // 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, +static int match_metadata_local(struct conf_service *service, + struct conf_metadata *ser_md, struct record_metadata *rec_md0, char **values, int num_v) { int i; struct record_metadata *rec_md = rec_md0; + WRBUF val_wr = 0; + WRBUF text_wr = wrbuf_alloc(); for (i = 0; i < num_v; ) { if (rec_md) @@ -1746,21 +1748,29 @@ static int match_metadata_local(struct conf_metadata *ser_md, } else { - yaz_log(YLOG_DEBUG, "cmp: '%s' '%s'", rec_md->data.text.disp, values[i]); - if (!strcmp(rec_md->data.text.disp, values[i])) + if (!val_wr) { - // Value equals, should not be filtered. - break; + val_wr = wrbuf_alloc(); + mergekey_norm_wr(service->charsets, val_wr, values[i]); } + wrbuf_rewind(text_wr); + mergekey_norm_wr(service->charsets, text_wr, + rec_md->data.text.disp); + if (!strcmp(wrbuf_cstr(val_wr), wrbuf_cstr(text_wr))) + break; } rec_md = rec_md->next; } else { rec_md = rec_md0; + wrbuf_destroy(val_wr); + val_wr = 0; i++; } } + wrbuf_destroy(val_wr); + wrbuf_destroy(text_wr); return i < num_v ? 1 : 0; } @@ -1796,7 +1806,8 @@ int session_check_cluster_limit(struct session *se, struct record_cluster *rec) nmem_strsplit_escape2(nmem_tmp, "|", value, &values, &num, 1, '\\', 1); - if (!match_metadata_local(&service->metadata[md_field_id], + if (!match_metadata_local(service, + &service->metadata[md_field_id], rec->metadata[md_field_id], values, num)) { @@ -1838,6 +1849,7 @@ static int check_limit_local(struct client *cl, md_field_id++) { if (match_metadata_local( + service, &service->metadata[md_field_id], record->metadata[md_field_id], values, num_v)) @@ -1855,6 +1867,7 @@ static int check_limit_local(struct client *cl, break; } if (!match_metadata_local( + service, &service->metadata[md_field_id], record->metadata[md_field_id], values, num_v)) @@ -1882,6 +1895,9 @@ static int ingest_to_cluster(struct client *cl, struct record_cluster *cluster; struct record_metadata **metadata0; struct session_database *sdb = client_get_database(cl); + NMEM ingest_nmem = 0; + char **rank_values = 0; + int rank_num = 0; struct record *record = record_create(se->nmem, service->num_metadata, service->num_sortkeys, cl, @@ -1941,6 +1957,18 @@ static int ingest_to_cluster(struct client *cl, "for element '%s'", value, type); continue; } + + if (ser_md->type == Metadata_type_generic) + { + WRBUF w = wrbuf_alloc(); + if (relevance_snippet(se->relevance, + (char*) value, ser_md->name, w)) + rec_md->data.text.snippet = nmem_strdup(se->nmem, + wrbuf_cstr(w)); + wrbuf_destroy(w); + } + + wheretoput = &record->metadata[md_field_id]; while (*wheretoput) wheretoput = &(*wheretoput)->next; @@ -1989,6 +2017,14 @@ static int ingest_to_cluster(struct client *cl, memcpy(metadata0, cluster->metadata, sizeof(*metadata0) * service->num_metadata); + ingest_nmem = nmem_create(); + if (se->rank) + { + yaz_log(YLOG_LOG, "local in sort : %s", se->rank); + nmem_strsplit_escape2(ingest_nmem, ",", se->rank, &rank_values, + &rank_num, 1, '\\', 1); + } + // now parsing XML record and adding data to cluster or record metadata for (n = root->children; n; n = n->next) { @@ -2009,8 +2045,8 @@ static int ingest_to_cluster(struct client *cl, struct record_metadata *rec_md = 0; int md_field_id = -1; int sk_field_id = -1; - const char *rank; - xmlChar *xml_rank; + const char *rank = 0; + xmlChar *xml_rank = 0; type = xmlGetProp(n, (xmlChar *) "type"); value = xmlNodeListGetString(xdoc, n->children, 1); @@ -2040,8 +2076,28 @@ static int ingest_to_cluster(struct client *cl, if (!rec_md) continue; - xml_rank = xmlGetProp(n, (xmlChar *) "rank"); - rank = xml_rank ? (const char *) xml_rank : ser_md->rank; + if (rank_num) + { + int i; + for (i = 0; i < rank_num; i++) + { + const char *val = rank_values[i]; + const char *cp = strchr(val, '='); + if (!cp) + continue; + if ((cp - val) == strlen((const char *) type) + && !memcmp(val, type, cp - val)) + { + rank = cp + 1; + break; + } + } + } + else + { + xml_rank = xmlGetProp(n, (xmlChar *) "rank"); + rank = xml_rank ? (const char *) xml_rank : ser_md->rank; + } wheretoput = &cluster->metadata[md_field_id]; @@ -2140,7 +2196,6 @@ static int ingest_to_cluster(struct client *cl, relevance_countwords(se->relevance, cluster, (char *) value, rank, ser_md->name); } - // construct facets ... unless the client already has reported them if (ser_md->termlist && !client_has_facet(cl, (char *) type)) { @@ -2180,6 +2235,7 @@ static int ingest_to_cluster(struct client *cl, if (value) xmlFree(value); + nmem_destroy(ingest_nmem); xfree(metadata0); relevance_donerecord(se->relevance, cluster); se->total_records++;