X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fsession.c;h=5e39968d6a496fd6153e3ddcf9ae1a3a045168da;hb=8e14ee4be4caa036057d7d7a13cce8ecd06f2fc2;hp=0817d8e38287211078d9b20f692f63d8df2a8793;hpb=3d72c16632e288e4a6635152083b7cb930707428;p=pazpar2-moved-to-github.git diff --git a/src/session.c b/src/session.c index 0817d8e..5e39968 100644 --- a/src/session.c +++ b/src/session.c @@ -57,7 +57,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include -#define USE_TIMING 0 +#define USE_TIMING 1 #if USE_TIMING #include #endif @@ -181,7 +181,8 @@ static void session_normalize_facet(struct session *s, const char *type, prt = pp2_charset_token_create(service->charsets, icu_chain_id); if (!prt) { - yaz_log(YLOG_FATAL, "Unknown ICU chain '%s' for facet of type '%s'", + session_log(s, YLOG_FATAL, + "Unknown ICU chain '%s' for facet of type '%s'", icu_chain_id, type); wrbuf_destroy(facet_wrbuf); wrbuf_destroy(display_wrbuf); @@ -623,7 +624,6 @@ int session_is_preferred_clients_ready(struct session *s) static void session_clear_set(struct session *se, struct reclist_sortparms *sp) { reclist_destroy(se->reclist); - se->reclist = 0; if (nmem_total(se->nmem)) session_log(se, YLOG_DEBUG, "NMEN operation usage %zd", nmem_total(se->nmem)); @@ -653,11 +653,12 @@ static void session_sort_unlocked(struct session *se, struct reclist_sortparms * int type = sp->type; int clients_research = 0; - yaz_log(YLOG_LOG, "session_sort field=%s increasing=%d type=%d", field, increasing, type); + session_log(se, YLOG_DEBUG, "session_sort field=%s increasing=%d type=%d", + field, increasing, type); /* see if we already have sorted for this criteria */ for (sr = se->sorted_results; sr; sr = sr->next) { - if (!reclist_sortparms_cmp(sr,sp)) + if (!reclist_sortparms_cmp(sr, sp)) break; } if (sr) @@ -681,7 +682,9 @@ static void session_sort_unlocked(struct session *se, struct reclist_sortparms * clients_research += client_parse_sort(cl, sp); } if (clients_research) { - yaz_log(YLOG_DEBUG, "Reset results due to %d clients researching", clients_research); + session_log(se, YLOG_DEBUG, + "Reset results due to %d clients researching", + clients_research); session_clear_set(se, sp); } else { @@ -706,7 +709,8 @@ static void session_sort_unlocked(struct session *se, struct reclist_sortparms * client_start_search(cl); } else { - yaz_log(YLOG_DEBUG, "Client %s: No re-start/ingest in show. Wrong client state: %d", + session_log(se, YLOG_DEBUG, + "Client %s: No re-start/ingest in show. Wrong client state: %d", client_get_id(cl), client_get_state(cl)); } @@ -960,7 +964,7 @@ struct session *new_session(NMEM nmem, struct conf_service *service, session->number_of_warnings_unknown_elements = 0; session->number_of_warnings_unknown_metadata = 0; session->num_termlists = 0; - session->reclist = 0; + session->reclist = reclist_create(nmem); session->clients_active = 0; session->clients_cached = 0; session->settings_modified = 0; @@ -1202,22 +1206,19 @@ struct record_cluster *show_single_start(struct session *se, const char *id, session_enter(se, "show_single_start"); *prev_r = 0; *next_r = 0; - if (se->reclist) - { - reclist_limit(se->reclist, se); + reclist_limit(se->reclist, se); - reclist_enter(se->reclist); - while ((r = reclist_read_record(se->reclist))) + reclist_enter(se->reclist); + while ((r = reclist_read_record(se->reclist))) + { + if (!strcmp(r->recid, id)) { - if (!strcmp(r->recid, id)) - { - *next_r = reclist_read_record(se->reclist); - break; - } - *prev_r = r; + *next_r = reclist_read_record(se->reclist); + break; } - reclist_leave(se->reclist); + *prev_r = r; } + reclist_leave(se->reclist); if (!r) session_leave(se, "show_single_start"); return r; @@ -1229,10 +1230,44 @@ void show_single_stop(struct session *se, struct record_cluster *rec) } +int session_fetch_more(struct session *se) +{ + struct client_list *l; + int ret = 0; + + for (l = se->clients_active; l; l = l->next) + { + struct client *cl = l->client; + if (client_get_state(cl) == Client_Idle) + { + if (client_fetch_more(cl)) + { + session_log(se, YLOG_LOG, "%s: more to fetch", + client_get_id(cl)); + ret = 1; + } + else + { + session_log(se, YLOG_LOG, "%s: no more to fetch", + client_get_id(cl)); + } + } + else + { + session_log(se, YLOG_LOG, "%s: no fetch due to state=%s", + client_get_id(cl), client_get_state_str(cl)); + } + + } + return ret; +} + 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) + Odr_int *sumhits, Odr_int *approx_hits, + void (*show_records_ready)(void *data), + struct http_channel *chan) { struct record_cluster **recs = 0; struct reclist_sortparms *spp; @@ -1264,16 +1299,25 @@ struct record_cluster **show_range_start(struct session *se, reclist_enter(se->reclist); *total = reclist_get_num_records(se->reclist); + for (l = se->clients_active; l; l = l->next) + client_update_show_stat(l->client, 0); + for (i = 0; i < start; i++) - if (!reclist_read_record(se->reclist)) + { + struct record_cluster *r = reclist_read_record(se->reclist); + if (!r) { *num = 0; break; } - - if (*num > 0) - recs = - nmem_malloc(se->nmem, *num * sizeof(struct record_cluster *)); + else + { + struct record *rec = r->records; + for (;rec; rec = rec->next) + client_update_show_stat(rec->client, 1); + } + } + recs = nmem_malloc(se->nmem, (*num > 0 ? *num : 1) * sizeof(*recs)); for (i = 0; i < *num; i++) { struct record_cluster *r = reclist_read_record(se->reclist); @@ -1282,16 +1326,41 @@ struct record_cluster **show_range_start(struct session *se, *num = i; break; } - recs[i] = r; + else + { + struct record *rec = r->records; + for (;rec; rec = rec->next) + client_update_show_stat(rec->client, 1); + 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", + session_log(se, YLOG_LOG, "show %6.5f %3.2f %3.2f", yaz_timing_get_real(t), yaz_timing_get_user(t), yaz_timing_get_sys(t)); yaz_timing_destroy(&t); #endif + + if (!session_fetch_more(se)) + session_log(se, YLOG_LOG, "can not fetch more"); + else + { + show_range_stop(se, recs); + session_log(se, YLOG_LOG, "fetching more in progress"); + if (session_set_watch(se, SESSION_WATCH_SHOW, + show_records_ready, chan, chan)) + { + session_log(se, YLOG_WARN, "Ignoring show block"); + session_enter(se, "show_range_start"); + } + else + { + session_log(se, YLOG_LOG, "session watch OK"); + return 0; + } + } return recs; } @@ -1340,10 +1409,11 @@ static struct record_metadata *record_metadata_init( { 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 */ + if (strcmp((const char *) attr->name, "type") + && strcmp((const char *) attr->name, "empty")) + { /* skip the "type" + "empty" attribute.. + The "Type" 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); @@ -1795,10 +1865,17 @@ static int ingest_to_cluster(struct client *cl, type = xmlGetProp(n, (xmlChar *) "type"); value = xmlNodeListGetString(xdoc, n->children, 1); - - if (!type || !value || !*value) + if (!type) continue; - + if (!value || !*value) + { + xmlChar *empty = xmlGetProp(n, (xmlChar *) "empty"); + if (!empty) + continue; + if (value) + xmlFree(value); + value = empty; + } md_field_id = conf_service_metadata_field_id(service, (const char *) type); if (md_field_id < 0) @@ -1843,7 +1920,7 @@ static int ingest_to_cluster(struct client *cl, cluster = reclist_insert(se->reclist, service, record, mergekey_norm, &se->total_merged); if (!cluster) - return -1; + return 0; // complete match with existing record { const char *use_term_factor_str = @@ -1854,7 +1931,8 @@ static int ingest_to_cluster(struct client *cl, int hits = (int) client_get_hits(cl); term_factor = MAX(hits, maxrecs) / MAX(1, maxrecs); assert(term_factor >= 1); - yaz_log(YLOG_DEBUG, "Using term factor: %d (%d / %d)", term_factor, MAX(hits, maxrecs), MAX(1, maxrecs)); + session_log(se, YLOG_DEBUG, "Using term factor: %d (%d / %d)", + term_factor, MAX(hits, maxrecs), MAX(1, maxrecs)); } } @@ -2075,7 +2153,7 @@ void session_log(struct session *s, int level, const char *fmt, ...) va_start(ap, fmt); yaz_vsnprintf(buf, sizeof(buf)-30, fmt, ap); - yaz_log(level, "Session %u: %s", s->session_id, buf); + yaz_log(level, "Session %u: %s", s ? s->session_id : 0, buf); va_end(ap); }