X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=src%2Flogic.c;h=d14da218a20f1ccea6519a7954b29243f87d995f;hb=4b258418178f7f5cba6a7f13f363817466e83806;hp=e61d8118a48ae8d4e44c32e73e5e5425e58a2b10;hpb=4d488222cc06d4329916b4c8365cd9ac7c534455;p=pazpar2-moved-to-github.git diff --git a/src/logic.c b/src/logic.c index e61d811..d14da21 100644 --- a/src/logic.c +++ b/src/logic.c @@ -1,4 +1,4 @@ -/* $Id: logic.c,v 1.41 2007-06-13 08:04:03 adam Exp $ +/* $Id: logic.c,v 1.46 2007-06-19 10:16:15 adam Exp $ Copyright (c) 2006-2007, Index Data. This file is part of Pazpar2. @@ -45,9 +45,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include #include -#if YAZ_VERSIONL >= 0x020163 #include -#endif #if HAVE_CONFIG_H #include "cconfig.h" @@ -152,9 +150,8 @@ static void add_facet(struct session *s, const char *type, const char *value) termlist_insert(s->termlists[i].termlist, value); } -xmlDoc *normalize_record(struct session_database *sdb, Z_External *rec) +xmlDoc *record_to_xml(struct session_database *sdb, Z_External *rec) { - struct database_retrievalmap *m; struct database *db = sdb->database; xmlDoc *rdoc = 0; const Odr_oid *oid = rec->direct_reference; @@ -233,36 +230,45 @@ xmlDoc *normalize_record(struct session_database *sdb, Z_External *rec) xmlDocDump(stderr, rdoc); #endif } + return rdoc; +} - for (m = sdb->map; m; m = m->next){ - xmlDoc *new = 0; - - { - xmlNodePtr root = 0; - new = xsltApplyStylesheet(m->stylesheet, rdoc, 0); - root= xmlDocGetRootElement(new); - if (!new || !root || !(root->children)) - { - yaz_log(YLOG_WARN, "XSLT transformation failed from %s", - sdb->database->url); - xmlFreeDoc(new); +xmlDoc *normalize_record(struct session_database *sdb, Z_External *rec) +{ + struct database_retrievalmap *m; + xmlDoc *rdoc = record_to_xml(sdb, rec); + if (rdoc) + { + for (m = sdb->map; m; m = m->next){ + xmlDoc *new = 0; + + { + xmlNodePtr root = 0; + new = xsltApplyStylesheet(m->stylesheet, rdoc, 0); + root= xmlDocGetRootElement(new); + if (!new || !root || !(root->children)) + { + yaz_log(YLOG_WARN, "XSLT transformation failed from %s", + sdb->database->url); + xmlFreeDoc(new); + xmlFreeDoc(rdoc); + return 0; + } + } + xmlFreeDoc(rdoc); - return 0; - } + rdoc = new; } - - xmlFreeDoc(rdoc); - rdoc = new; - } - if (global_parameters.dump_records) - { - fprintf(stderr, "Record from %s\n----------------\n", - sdb->database->url); + if (global_parameters.dump_records) + { + fprintf(stderr, "Record from %s\n----------------\n", + sdb->database->url); #if LIBXML_VERSION >= 20600 - xmlDocFormatDump(stderr, rdoc, 1); + xmlDocFormatDump(stderr, rdoc, 1); #else - xmlDocDump(stderr, rdoc); + xmlDocDump(stderr, rdoc); #endif + } } return rdoc; } @@ -341,7 +347,7 @@ static int prepare_map(struct session *se, struct session_database *sdb) (*m)->next = 0; if (!((*m)->stylesheet = conf_load_stylesheet(stylesheets[i]))) { - yaz_log(YLOG_FATAL, "Unable to load stylesheet: %s", + yaz_log(YLOG_FATAL|YLOG_ERRNO, "Unable to load stylesheet: %s", stylesheets[i]); return -1; } @@ -378,21 +384,39 @@ static int prepare_session_database(struct session *se, return 0; } +// called if watch should be removed because http_channel is to be destroyed +static void session_watch_cancel(void *data, struct http_channel *c) +{ + struct session_watchentry *ent = data; + + ent->fun = 0; + ent->data = 0; + ent->obs = 0; +} -void session_set_watch(struct session *s, int what, - session_watchfun fun, void *data) +// set watch. Returns 0=OK, -1 if watch is already set +int session_set_watch(struct session *s, int what, + session_watchfun fun, void *data, + struct http_channel *chan) { + if (s->watchlist[what].fun) + return -1; s->watchlist[what].fun = fun; s->watchlist[what].data = data; + s->watchlist[what].obs = http_add_observer(chan, &s->watchlist[what], + session_watch_cancel); + return 0; } void session_alert_watch(struct session *s, int what) { if (!s->watchlist[what].fun) return; + http_remove_observer(s->watchlist[what].obs); (*s->watchlist[what].fun)(s->watchlist[what].data); s->watchlist[what].fun = 0; s->watchlist[what].data = 0; + s->watchlist[what].obs = 0; } //callback for grep_databases @@ -651,7 +675,6 @@ void destroy_session(struct session *s) { struct session_database *sdb; - yaz_log(YLOG_LOG, "Destroying session"); while (s->clients) client_destroy(s->clients); for (sdb = s->databases; sdb; sdb = sdb->next) @@ -667,6 +690,7 @@ struct session *new_session(NMEM nmem) yaz_log(YLOG_DEBUG, "New Pazpar2 session"); + session->relevance = 0; session->total_hits = 0; session->total_records = 0; session->num_termlists = 0; @@ -756,34 +780,44 @@ struct record_cluster **show(struct session *s, struct reclist_sortparms *sp, yaz_timing_t t = yaz_timing_create(); #endif - for (spp = sp; spp; spp = spp->next) - if (spp->type == Metadata_sortkey_relevance) - { - relevance_prepare_read(s->relevance, s->reclist); - break; - } - reclist_sort(s->reclist, sp); - - *total = s->reclist->num_records; - *sumhits = s->total_hits; - - for (i = 0; i < start; i++) - if (!reclist_read_record(s->reclist)) - { - *num = 0; - recs = 0; - break; - } - - for (i = 0; i < *num; i++) + if (!s->relevance) + { + *num = 0; + *total = 0; + *sumhits = 0; + recs = 0; + } + else { - struct record_cluster *r = reclist_read_record(s->reclist); - if (!r) + for (spp = sp; spp; spp = spp->next) + if (spp->type == Metadata_sortkey_relevance) + { + relevance_prepare_read(s->relevance, s->reclist); + break; + } + reclist_sort(s->reclist, sp); + + *total = s->reclist->num_records; + *sumhits = s->total_hits; + + for (i = 0; i < start; i++) + if (!reclist_read_record(s->reclist)) + { + *num = 0; + recs = 0; + break; + } + + for (i = 0; i < *num; i++) { - *num = i; - break; + struct record_cluster *r = reclist_read_record(s->reclist); + if (!r) + { + *num = i; + break; + } + recs[i] = r; } - recs[i] = r; } #if USE_TIMING yaz_timing_stop(t); @@ -906,7 +940,8 @@ struct record *ingest_record(struct client *cl, Z_External *rec, } record = record_create(se->nmem, - service->num_metadata, service->num_sortkeys, cl); + service->num_metadata, service->num_sortkeys, cl, + record_no); mergekey_norm = (xmlChar *) nmem_strdup(se->nmem, (char*) mergekey); xmlFree(mergekey);