X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Flogic.c;h=d0a92a8bf20d55b83b32fda375ef74bc941dcdca;hb=a58a0ed09301d1a773ad5489fba90b9dddfb1bfd;hp=f54b3039f30dca47650056213deb91b47b2d179f;hpb=badc6391cc7169540e1a063a311adf3c649a6360;p=pazpar2-moved-to-github.git diff --git a/src/logic.c b/src/logic.c index f54b303..d0a92a8 100644 --- a/src/logic.c +++ b/src/logic.c @@ -1,4 +1,4 @@ -/* $Id: logic.c,v 1.29 2007-05-16 17:16:21 quinn Exp $ +/* $Id: logic.c,v 1.43 2007-06-13 21:29:04 adam Exp $ Copyright (c) 2006-2007, Index Data. This file is part of Pazpar2. @@ -72,6 +72,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "settings.h" #include "normalize7bit.h" +#define TERMLIST_HIGH_SCORE 25 + #define MAX_CHUNK 15 // Note: Some things in this structure will eventually move to configuration @@ -79,10 +81,10 @@ struct parameters global_parameters = { "", "", - "", - "", - 0, + "", 0, + 0, /* dump_records */ + 0, /* debug_mode */ 30, "81", "Index Data PazPar2", @@ -143,7 +145,8 @@ static void add_facet(struct session *s, const char *type, const char *value) s->termlists[i].name = nmem_strdup(s->nmem, type); s->termlists[i].termlist - = termlist_create(s->nmem, s->expected_maxrecs, 15); + = termlist_create(s->nmem, s->expected_maxrecs, + TERMLIST_HIGH_SCORE); s->num_termlists = i + 1; } termlist_insert(s->termlists[i].termlist, value); @@ -153,48 +156,73 @@ xmlDoc *normalize_record(struct session_database *sdb, Z_External *rec) { struct database_retrievalmap *m; struct database *db = sdb->database; - xmlNode *res; - xmlDoc *rdoc; + xmlDoc *rdoc = 0; + const Odr_oid *oid = rec->direct_reference; - // First normalize to XML - if (sdb->yaz_marc) + /* convert response record to XML somehow */ + if (rec->which == Z_External_octet && oid + && !oid_oidcmp(oid, yaz_oid_recsyn_xml)) { - char *buf; - int len; - if (rec->which != Z_External_octet) + /* xml already */ + rdoc = xmlParseMemory((char*) rec->u.octet_aligned->buf, + rec->u.octet_aligned->len); + if (!rdoc) { - yaz_log(YLOG_WARN, "Unexpected external branch, probably BER %s", + yaz_log(YLOG_FATAL, "Non-wellformed XML received from %s", db->url); return 0; } - buf = (char*) rec->u.octet_aligned->buf; - len = rec->u.octet_aligned->len; - if (yaz_marc_read_iso2709(sdb->yaz_marc, buf, len) < 0) + } + else if (oid && yaz_oid_is_iso2709(oid)) + { + /* ISO2709 gets converted to MARCXML */ + if (!sdb->yaz_marc) { - yaz_log(YLOG_WARN, "Failed to decode MARC %s", db->url); + yaz_log(YLOG_FATAL, "Unable to handle ISO2709 record"); return 0; } - - yaz_marc_write_using_libxml2(sdb->yaz_marc, 1); - if (yaz_marc_write_xml(sdb->yaz_marc, &res, - "http://www.loc.gov/MARC21/slim", 0, 0) < 0) + else { - yaz_log(YLOG_WARN, "Failed to encode as XML %s", - db->url); - return 0; + xmlNode *res; + char *buf; + int len; + + if (rec->which != Z_External_octet) + { + yaz_log(YLOG_WARN, "Unexpected external branch, probably BER %s", + db->url); + return 0; + } + buf = (char*) rec->u.octet_aligned->buf; + len = rec->u.octet_aligned->len; + if (yaz_marc_read_iso2709(sdb->yaz_marc, buf, len) < 0) + { + yaz_log(YLOG_WARN, "Failed to decode MARC %s", db->url); + return 0; + } + + yaz_marc_write_using_libxml2(sdb->yaz_marc, 1); + if (yaz_marc_write_xml(sdb->yaz_marc, &res, + "http://www.loc.gov/MARC21/slim", 0, 0) < 0) + { + yaz_log(YLOG_WARN, "Failed to encode as XML %s", + db->url); + return 0; + } + rdoc = xmlNewDoc((xmlChar *) "1.0"); + xmlDocSetRootElement(rdoc, res); } - rdoc = xmlNewDoc((xmlChar *) "1.0"); - xmlDocSetRootElement(rdoc, res); - } else { + char oid_name_buf[OID_STR_MAX]; + const char *oid_name = yaz_oid_to_string_buf(oid, 0, oid_name_buf); yaz_log(YLOG_FATAL, - "Unknown native_syntax in normalize_record from %s", - db->url); + "Unable to handle record of type %s from %s", + oid_name, db->url); return 0; } - + if (global_parameters.dump_records){ fprintf(stderr, "Input Record (normalized) from %s\n----------------\n", @@ -440,7 +468,9 @@ static struct database_criterion *parse_filter(NMEM m, const char *buf) return res; } -char *search(struct session *se, char *query, char *filter) +enum pazpar2_error_code search(struct session *se, + char *query, char *filter, + const char **addinfo) { int live_channels = 0; struct client *cl; @@ -448,6 +478,7 @@ char *search(struct session *se, char *query, char *filter) yaz_log(YLOG_DEBUG, "Search"); + *addinfo = 0; nmem_reset(se->nmem); criteria = parse_filter(se->nmem, filter); se->requestid++; @@ -462,25 +493,29 @@ char *search(struct session *se, char *query, char *filter) se->expected_maxrecs = maxrecs; } else - return "NOTARGETS"; + return PAZPAR2_NO_TARGETS; se->relevance = 0; for (cl = se->clients; cl; cl = client_next_in_session(cl)) { if (prepare_session_database(se, client_get_database(cl)) < 0) - return "CONFIG_ERROR"; + { + *addinfo = client_get_database(cl)->database->url; + return PAZPAR2_CONFIG_TARGET; + } // Query must parse for all targets - if (client_parse_query(cl, query) < 0) - return "QUERY"; + if (client_parse_query(cl, query) < 0) + { + *addinfo = "query"; + return PAZPAR2_MALFORMED_PARAMETER_VALUE; + } } for (cl = se->clients; cl; cl = client_next_in_session(cl)) - { client_prep_connection(cl); - } - return 0; + return PAZPAR2_NO_ERROR; } // Creates a new session_database object for a database @@ -493,7 +528,16 @@ static void session_init_databases_fun(void *context, struct database *db) new->database = db; new->yaz_marc = 0; - new->pct = pp2_charset_create(); + +#ifdef HAVE_ICU + if (global_parameters.server && global_parameters.server->icu_chn) + new->pct = pp2_charset_create(global_parameters.server->icu_chn); + else + new->pct = pp2_charset_create(0); +#else // HAVE_ICU + new->pct = pp2_charset_create(0); +#endif // HAVE_ICU + new->map = 0; new->settings = nmem_malloc(se->session_nmem, sizeof(struct settings *) * num); @@ -566,11 +610,12 @@ void session_apply_setting(struct session *se, char *dbname, char *setting, yaz_log(YLOG_WARN, "Unknown setting %s", setting); return; } - if (offset == PZ_ID) + // Jakub: This breaks the filter setting. + /*if (offset == PZ_ID) { yaz_log(YLOG_WARN, "No need to set pz:id setting. Ignoring"); return; - } + }*/ new->precedence = 0; new->target = dbname; new->name = setting; @@ -606,7 +651,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) @@ -622,6 +666,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; @@ -711,34 +756,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) { - struct record_cluster *r = reclist_read_record(s->reclist); - if (!r) + *num = 0; + *total = 0; + *sumhits = 0; + recs = 0; + } + else + { + 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); @@ -822,38 +877,6 @@ void start_proxy(void) http_set_proxyaddr(hp, ser->myurl ? ser->myurl : ""); } -void start_zproxy(void) -{ - struct conf_server *ser = global_parameters.server; - - if (*global_parameters.zproxy_override){ - yaz_log(YLOG_LOG, "Z39.50 proxy %s", - global_parameters.zproxy_override); - return; - } - - else if (ser->zproxy_host || ser->zproxy_port) - { - char hp[128] = ""; - - strcpy(hp, ser->zproxy_host ? ser->zproxy_host : ""); - if (ser->zproxy_port) - { - if (*hp) - strcat(hp, ":"); - else - strcat(hp, "@:"); - - sprintf(hp + strlen(hp), "%d", ser->zproxy_port); - } - strcpy(global_parameters.zproxy_override, hp); - yaz_log(YLOG_LOG, "Z39.50 proxy %s", - global_parameters.zproxy_override); - - } - else - return; -} // Master list of connections we're handling events to static IOCHAN channel_list = 0; @@ -893,8 +916,8 @@ struct record *ingest_record(struct client *cl, Z_External *rec, } record = record_create(se->nmem, - service->num_metadata, service->num_sortkeys); - record_assign_client(record, cl); + service->num_metadata, service->num_sortkeys, cl, + record_no); mergekey_norm = (xmlChar *) nmem_strdup(se->nmem, (char*) mergekey); xmlFree(mergekey); @@ -938,7 +961,7 @@ struct record *ingest_record(struct client *cl, Z_External *rec, int first, last; type = xmlGetProp(n, (xmlChar *) "type"); - value = xmlNodeListGetString(xdoc, n->children, 0); + value = xmlNodeListGetString(xdoc, n->children, 1); if (!type || !value) continue;