X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Flogic.c;h=3d4de112f7a56cfb449688234868a74b71215d55;hb=18701a2fcad5171b03a76ceda18702831eb90850;hp=5b0517bbb64389beac729c3ec691546ba17f1b90;hpb=2ba8ac40a1911b9854478521556469909c6c96f0;p=pazpar2-moved-to-github.git diff --git a/src/logic.c b/src/logic.c index 5b0517b..3d4de11 100644 --- a/src/logic.c +++ b/src/logic.c @@ -1,7 +1,5 @@ -/* $Id: logic.c,v 1.57 2007-07-30 11:52:08 quinn Exp $ - Copyright (c) 2006-2007, Index Data. - -This file is part of Pazpar2. +/* This file is part of Pazpar2. + Copyright (C) 2006-2008 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 @@ -14,22 +12,34 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with Pazpar2; see the file LICENSE. If not, write to the -Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. - */ +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ /** \file logic.c \brief high-level logic; mostly user sessions and settings */ +#if HAVE_CONFIG_H +#include +#endif + #include #include #include +#if HAVE_SYS_TIME_H #include +#endif +#if HAVE_UNISTD_H #include +#endif +#if HAVE_SYS_SOCKET_H #include +#endif +#if HAVE_NETDB_H #include +#endif #include #include #include @@ -48,16 +58,14 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include -#if HAVE_CONFIG_H -#include "cconfig.h" -#endif - #define USE_TIMING 0 #if USE_TIMING #include #endif +#if HAVE_NETINET_IN_H #include +#endif #include "pazpar2.h" #include "eventl.h" @@ -65,7 +73,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "termlists.h" #include "reclists.h" #include "relevance.h" -#include "config.h" #include "database.h" #include "client.h" #include "settings.h" @@ -82,20 +89,19 @@ struct parameters global_parameters = "", "", 0, - 0, /* dump_records */ - 0, /* debug_mode */ - 30, + 0, // dump_records + 0, // debug_mode + 30, // operations timeout "81", "Index Data PazPar2", VERSION, - 600, // 10 minutes - 60, + 60, // session timeout 100, MAX_CHUNK, 0, 0, - 180, - 30 + 180, // Z39.50 session timeout + 15 // Connect timeout }; // Recursively traverse query structure to extract terms. @@ -107,20 +113,20 @@ void pull_terms(NMEM nmem, struct ccl_rpn_node *n, char **termlist, int *num) switch (n->kind) { - case CCL_RPN_AND: - case CCL_RPN_OR: - case CCL_RPN_NOT: - case CCL_RPN_PROX: - pull_terms(nmem, n->u.p[0], termlist, num); - pull_terms(nmem, n->u.p[1], termlist, num); - break; - case CCL_RPN_TERM: - nmem_strsplit(nmem, " ", n->u.t.term, &words, &numwords); - for (i = 0; i < numwords; i++) - termlist[(*num)++] = words[i]; - break; - default: // NOOP - break; + case CCL_RPN_AND: + case CCL_RPN_OR: + case CCL_RPN_NOT: + case CCL_RPN_PROX: + pull_terms(nmem, n->u.p[0], termlist, num); + pull_terms(nmem, n->u.p[1], termlist, num); + break; + case CCL_RPN_TERM: + nmem_strsplit(nmem, " ", n->u.t.term, &words, &numwords); + for (i = 0; i < numwords; i++) + termlist[(*num)++] = words[i]; + break; + default: // NOOP + break; } } @@ -191,7 +197,18 @@ xmlDoc *record_to_xml(struct session_database *sdb, Z_External *rec) rdoc = xmlParseMemory((char*) wrbuf_buf(wrbuf_opac), wrbuf_len(wrbuf_opac)); if (!rdoc) + { yaz_log(YLOG_WARN, "Unable to parse OPAC XML"); + /* Was used to debug bug #1348 */ +#if 0 + FILE *f = fopen("/tmp/opac.xml.txt", "wb"); + if (f) + { + fwrite(wrbuf_buf(wrbuf_opac), 1, wrbuf_len(wrbuf_opac), f); + fclose(f); + } +#endif + } wrbuf_destroy(wrbuf_opac); } } @@ -223,7 +240,6 @@ xmlDoc *record_to_xml(struct session_database *sdb, Z_External *rec) 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) { @@ -262,6 +278,44 @@ xmlDoc *record_to_xml(struct session_database *sdb, Z_External *rec) return rdoc; } +#define MAX_XSLT_ARGS 16 + +// Add static values from session database settings if applicable +static void insert_settings_parameters(struct session_database *sdb, + struct session *se, char **parms) +{ + struct conf_service *service = global_parameters.server->service; + int i; + int nparms = 0; + int offset = 0; + + for (i = 0; i < service->num_metadata; i++) + { + struct conf_metadata *md = &service->metadata[i]; + int setting; + + if (md->setting == Metadata_setting_parameter && + (setting = settings_offset(md->name)) > 0) + { + const char *val = session_setting_oneval(sdb, setting); + if (val && nparms < MAX_XSLT_ARGS) + { + char *buf; + int len = strlen(val); + buf = nmem_malloc(se->nmem, len + 3); + buf[0] = '\''; + strcpy(buf + 1, val); + buf[len+1] = '\''; + buf[len+2] = '\0'; + parms[offset++] = md->name; + parms[offset++] = buf; + nparms++; + } + } + } + parms[offset] = 0; +} + // Add static values from session database settings if applicable static void insert_settings_values(struct session_database *sdb, xmlDoc *doc) { @@ -274,21 +328,22 @@ static void insert_settings_values(struct session_database *sdb, xmlDoc *doc) int offset; if (md->setting == Metadata_setting_postproc && - (offset = settings_offset(md->name)) > 0) + (offset = settings_offset(md->name)) > 0) { - char *val = session_setting_oneval(sdb, offset); + const char *val = session_setting_oneval(sdb, offset); if (val) { xmlNode *r = xmlDocGetRootElement(doc); xmlNode *n = xmlNewTextChild(r, 0, (xmlChar *) "metadata", - (xmlChar *) val); + (xmlChar *) val); xmlSetProp(n, (xmlChar *) "type", (xmlChar *) md->name); } } } } -xmlDoc *normalize_record(struct session_database *sdb, Z_External *rec) +xmlDoc *normalize_record(struct session_database *sdb, struct session *se, + Z_External *rec) { struct database_retrievalmap *m; xmlDoc *rdoc = record_to_xml(sdb, rec); @@ -300,7 +355,11 @@ xmlDoc *normalize_record(struct session_database *sdb, Z_External *rec) { xmlNodePtr root = 0; - new = xsltApplyStylesheet(m->stylesheet, rdoc, 0); + char *parms[MAX_XSLT_ARGS*2+1]; + + insert_settings_parameters(sdb, se, parms); + + new = xsltApplyStylesheet(m->stylesheet, rdoc, (const char **) parms); root= xmlDocGetRootElement(new); if (!new || !root || !(root->children)) { @@ -340,7 +399,7 @@ xmlDoc *normalize_record(struct session_database *sdb, Z_External *rec) // Retrieve first defined value for 'name' for given database. // Will be extended to take into account user associated with session -char *session_setting_oneval(struct session_database *db, int offset) +const char *session_setting_oneval(struct session_database *db, int offset) { if (!db->settings[offset]) return ""; @@ -352,7 +411,7 @@ char *session_setting_oneval(struct session_database *db, int offset) // Initialize YAZ Map structures for MARC-based targets static int prepare_yazmarc(struct session_database *sdb) { - char *s; + const char *s; if (!sdb->settings) { @@ -392,7 +451,7 @@ static int prepare_yazmarc(struct session_database *sdb) // setting. However, this is not a realistic use scenario. static int prepare_map(struct session *se, struct session_database *sdb) { - char *s; + const char *s; if (!sdb->settings) { @@ -408,8 +467,8 @@ static int prepare_map(struct session *se, struct session_database *sdb) if (!strcmp(s, "auto")) { - char *request_syntax = session_setting_oneval(sdb, - PZ_REQUESTSYNTAX); + const char *request_syntax = session_setting_oneval( + sdb, PZ_REQUESTSYNTAX); if (request_syntax) { char *cp; @@ -473,7 +532,8 @@ static int prepare_session_database(struct session *se, } // called if watch should be removed because http_channel is to be destroyed -static void session_watch_cancel(void *data, struct http_channel *c) +static void session_watch_cancel(void *data, struct http_channel *c, + void *data2) { struct session_watchentry *ent = data; @@ -498,13 +558,24 @@ int session_set_watch(struct session *s, int what, 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; + if (s->watchlist[what].fun) + { + /* our watch is no longer associated with http_channel */ + void *data; + session_watchfun fun; + + http_remove_observer(s->watchlist[what].obs); + fun = s->watchlist[what].fun; + data = s->watchlist[what].data; + + /* reset watch before fun is invoked - in case fun wants to set + it again */ + s->watchlist[what].fun = 0; + s->watchlist[what].data = 0; + s->watchlist[what].obs = 0; + + fun(data); + } } //callback for grep_databases @@ -594,23 +665,22 @@ enum pazpar2_error_code search(struct session *se, *addinfo = 0; nmem_reset(se->nmem); + se->relevance = 0; + se->total_records = se->total_hits = se->total_merged = 0; + se->reclist = 0; + se->num_termlists = 0; criteria = parse_filter(se->nmem, filter); se->requestid++; live_channels = select_targets(se, criteria); if (live_channels) { int maxrecs = live_channels * global_parameters.toget; - se->num_termlists = 0; se->reclist = reclist_create(se->nmem, maxrecs); - // This will be initialized in send_search() - se->total_records = se->total_hits = se->total_merged = 0; se->expected_maxrecs = maxrecs; } else 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) @@ -648,15 +718,6 @@ static void session_init_databases_fun(void *context, struct database *db) new->database = db; new->yaz_marc = 0; -#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); @@ -680,8 +741,6 @@ static void session_database_destroy(struct session_database *sdb) xsltFreeStylesheet(m->stylesheet); if (sdb->yaz_marc) yaz_marc_destroy(sdb->yaz_marc); - if (sdb->pct) - pp2_charset_destroy(sdb->pct); } // Initialize session_database list -- this represents this session's view @@ -731,10 +790,10 @@ void session_apply_setting(struct session *se, char *dbname, char *setting, } // Jakub: This breaks the filter setting. /*if (offset == PZ_ID) - { - yaz_log(YLOG_WARN, "No need to set pz:id setting. Ignoring"); - return; - }*/ + { + yaz_log(YLOG_WARN, "No need to set pz:id setting. Ignoring"); + return; + }*/ new->precedence = 0; new->target = dbname; new->name = setting; @@ -746,23 +805,23 @@ void session_apply_setting(struct session *se, char *dbname, char *setting, // (happens when a search starts and client connections are prepared) switch (offset) { - case PZ_NATIVESYNTAX: - if (sdb->yaz_marc) - { - yaz_marc_destroy(sdb->yaz_marc); - sdb->yaz_marc = 0; - } - break; - case PZ_XSLT: - if (sdb->map) - { - struct database_retrievalmap *m; - // We don't worry about the map structure -- it's in nmem - for (m = sdb->map; m; m = m->next) - xsltFreeStylesheet(m->stylesheet); - sdb->map = 0; - } - break; + case PZ_NATIVESYNTAX: + if (sdb->yaz_marc) + { + yaz_marc_destroy(sdb->yaz_marc); + sdb->yaz_marc = 0; + } + break; + case PZ_XSLT: + if (sdb->map) + { + struct database_retrievalmap *m; + // We don't worry about the map structure -- it's in nmem + for (m = sdb->map; m; m = m->next) + xsltFreeStylesheet(m->stylesheet); + sdb->map = 0; + } + break; } } @@ -802,19 +861,24 @@ struct session *new_session(NMEM nmem) session->watchlist[i].data = 0; session->watchlist[i].fun = 0; } - return session; } -struct hitsbytarget *hitsbytarget(struct session *se, int *count) +struct hitsbytarget *hitsbytarget(struct session *se, int *count, NMEM nmem) { - static struct hitsbytarget res[1000]; // FIXME MM + struct hitsbytarget *res = 0; struct client *cl; + size_t sz = 0; + for (cl = se->clients; cl; cl = client_next_in_session(cl)) + sz++; + + res = nmem_malloc(nmem, sizeof(*res) * sz); *count = 0; for (cl = se->clients; cl; cl = client_next_in_session(cl)) { - char *name = session_setting_oneval(client_get_database(cl), PZ_NAME); + const char *name = session_setting_oneval(client_get_database(cl), + PZ_NAME); res[*count].id = client_get_database(cl)->database->url; res[*count].name = *name ? name : "Unknown"; @@ -825,7 +889,6 @@ struct hitsbytarget *hitsbytarget(struct session *se, int *count) res[*count].connected = client_get_connection(cl) ? 1 : 0; (*count)++; } - return res; } @@ -868,7 +931,7 @@ struct record_cluster **show(struct session *s, struct reclist_sortparms *sp, NMEM nmem_show) { struct record_cluster **recs = nmem_malloc(nmem_show, *num - * sizeof(struct record_cluster *)); + * sizeof(struct record_cluster *)); struct reclist_sortparms *spp; int i; #if USE_TIMING @@ -936,14 +999,14 @@ void statistics(struct session *se, struct statistics *stat) stat->num_no_connection++; switch (client_get_state(cl)) { - case Client_Connecting: stat->num_connecting++; break; - case Client_Initializing: stat->num_initializing++; break; - case Client_Searching: stat->num_searching++; break; - case Client_Presenting: stat->num_presenting++; break; - case Client_Idle: stat->num_idle++; break; - case Client_Failed: stat->num_failed++; break; - case Client_Error: stat->num_error++; break; - default: break; + case Client_Connecting: stat->num_connecting++; break; + case Client_Initializing: stat->num_initializing++; break; + case Client_Searching: stat->num_searching++; break; + case Client_Presenting: stat->num_presenting++; break; + case Client_Idle: stat->num_idle++; break; + case Client_Failed: stat->num_failed++; break; + case Client_Error: stat->num_error++; break; + default: break; } count++; } @@ -1019,13 +1082,19 @@ static struct record_metadata *record_metadata_init( char * p = value; p = normalize7bit_generic(p, " ,/.:(["); - rec_md->data.text = nmem_strdup(nmem, p); + rec_md->data.text.disp = nmem_strdup(nmem, p); + rec_md->data.text.sort = 0; } - else if (type == Metadata_type_year) + else if (type == Metadata_type_year || type == Metadata_type_date) { int first, last; - if (extract7bit_years((char *) value, &first, &last) < 0) + int longdate = 0; + + if (type == Metadata_type_date) + longdate = 1; + if (extract7bit_dates((char *) value, &first, &last, longdate) < 0) return 0; + rec_md->data.number.min = first; rec_md->data.number.max = last; } @@ -1037,7 +1106,8 @@ static struct record_metadata *record_metadata_init( struct record *ingest_record(struct client *cl, Z_External *rec, int record_no) { - xmlDoc *xdoc = normalize_record(client_get_database(cl), rec); + xmlDoc *xdoc = normalize_record(client_get_database(cl), + client_get_session(cl), rec); xmlNode *root, *n; struct record *record; struct record_cluster *cluster; @@ -1046,6 +1116,9 @@ struct record *ingest_record(struct client *cl, Z_External *rec, xmlChar *type = 0; xmlChar *value = 0; struct conf_service *service = global_parameters.server->service; + const char *norm_str = 0; + pp2_relevance_token_t prt = 0; + WRBUF norm_wr = 0; if (!xdoc) return 0; @@ -1057,15 +1130,34 @@ struct record *ingest_record(struct client *cl, Z_External *rec, xmlFreeDoc(xdoc); return 0; } - + record = record_create(se->nmem, service->num_metadata, service->num_sortkeys, cl, record_no); - mergekey_norm = (xmlChar *) nmem_strdup(se->nmem, (char*) mergekey); - xmlFree(mergekey); - normalize7bit_mergekey((char *) mergekey_norm, 0); + prt = pp2_relevance_tokenize( + global_parameters.server->mergekey_pct, (const char *) mergekey); + + + norm_wr = wrbuf_alloc(); + + while ((norm_str = pp2_relevance_token_next(prt))) + { + if (*norm_str) + { + if (wrbuf_len(norm_wr)) + wrbuf_puts(norm_wr, " "); + wrbuf_puts(norm_wr, norm_str); + } + } + + mergekey_norm = (xmlChar *)nmem_strdup(se->nmem, wrbuf_cstr(norm_wr)); + wrbuf_destroy(norm_wr); + pp2_relevance_token_destroy(prt); + + xmlFree(mergekey); + cluster = reclist_insert(se->reclist, global_parameters.server->service, record, (char *) mergekey_norm, @@ -1080,99 +1172,125 @@ struct record *ingest_record(struct client *cl, Z_External *rec, return 0; } relevance_newrec(se->relevance, cluster); - - - // now parsing XML record and adding data to cluster or record metadata - for (n = root->children; n; n = n->next) - { - if (type) - xmlFree(type); - if (value) - xmlFree(value); - type = value = 0; - - if (n->type != XML_ELEMENT_NODE) - continue; - if (!strcmp((const char *) n->name, "metadata")) - { - struct conf_metadata *ser_md = 0; - struct conf_sortkey *ser_sk = 0; - struct record_metadata **wheretoput = 0; - struct record_metadata *rec_md = 0; - int md_field_id = -1; - int sk_field_id = -1; - - type = xmlGetProp(n, (xmlChar *) "type"); - value = xmlNodeListGetString(xdoc, n->children, 1); - - if (!type || !value) - continue; - - md_field_id - = conf_service_metadata_field_id(service, (const char *) type); - if (md_field_id < 0) - { - yaz_log(YLOG_WARN, - "Ignoring unknown metadata element: %s", type); - continue; - } - - ser_md = &service->metadata[md_field_id]; - - if (ser_md->sortkey_offset >= 0){ - sk_field_id = ser_md->sortkey_offset; - ser_sk = &service->sortkeys[sk_field_id]; - } - - // non-merged metadata - rec_md = record_metadata_init(se->nmem, (char *) value, - ser_md->type); - if (!rec_md) - { - yaz_log(YLOG_WARN, "bad metadata data '%s' for element '%s'", - value, type); - continue; - } - rec_md->next = record->metadata[md_field_id]; - record->metadata[md_field_id] = rec_md; - - // merged metadata - rec_md = record_metadata_init(se->nmem, (char *) value, - ser_md->type); - 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) - { - struct record_metadata *mnode; - for (mnode = *wheretoput; mnode; mnode = mnode->next) - if (!strcmp((const char *) mnode->data.text, - rec_md->data.text)) - break; - if (!mnode) - { - rec_md->next = *wheretoput; - *wheretoput = rec_md; - } - } - else if (ser_md->merge == Metadata_merge_longest) - { - if (!*wheretoput - || strlen(rec_md->data.text) - > strlen((*wheretoput)->data.text)) - { - *wheretoput = rec_md; - if (ser_sk) - { - char *s = nmem_strdup(se->nmem, rec_md->data.text); - if (!cluster->sortkeys[sk_field_id]) - cluster->sortkeys[sk_field_id] = - nmem_malloc(se->nmem, - sizeof(union data_types)); - normalize7bit_mergekey(s, - (ser_sk->type == Metadata_sortkey_skiparticle)); - cluster->sortkeys[sk_field_id]->text = s; + + + // now parsing XML record and adding data to cluster or record metadata + for (n = root->children; n; n = n->next) + { + if (type) + xmlFree(type); + if (value) + xmlFree(value); + type = value = 0; + + if (n->type != XML_ELEMENT_NODE) + continue; + if (!strcmp((const char *) n->name, "metadata")) + { + struct conf_metadata *ser_md = 0; + struct conf_sortkey *ser_sk = 0; + struct record_metadata **wheretoput = 0; + struct record_metadata *rec_md = 0; + int md_field_id = -1; + int sk_field_id = -1; + + type = xmlGetProp(n, (xmlChar *) "type"); + value = xmlNodeListGetString(xdoc, n->children, 1); + + if (!type || !value || !*value) + continue; + + md_field_id + = conf_service_metadata_field_id(service, (const char *) type); + if (md_field_id < 0) + { + yaz_log(YLOG_WARN, + "Ignoring unknown metadata element: %s", type); + continue; + } + + ser_md = &service->metadata[md_field_id]; + + if (ser_md->sortkey_offset >= 0){ + sk_field_id = ser_md->sortkey_offset; + ser_sk = &service->sortkeys[sk_field_id]; + } + + // non-merged metadata + rec_md = record_metadata_init(se->nmem, (char *) value, + ser_md->type); + if (!rec_md) + { + yaz_log(YLOG_WARN, "bad metadata data '%s' for element '%s'", + value, type); + continue; + } + rec_md->next = record->metadata[md_field_id]; + record->metadata[md_field_id] = rec_md; + + // merged metadata + rec_md = record_metadata_init(se->nmem, (char *) value, + ser_md->type); + 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) + { + struct record_metadata *mnode; + for (mnode = *wheretoput; mnode; mnode = mnode->next) + if (!strcmp((const char *) mnode->data.text.disp, + rec_md->data.text.disp)) + break; + if (!mnode) + { + rec_md->next = *wheretoput; + *wheretoput = rec_md; + } + } + else if (ser_md->merge == Metadata_merge_longest) + { + if (!*wheretoput + || strlen(rec_md->data.text.disp) + > strlen((*wheretoput)->data.text.disp)) + { + *wheretoput = rec_md; + if (ser_sk) + { + const char *sort_str = 0; + int skip_article = + ser_sk->type == Metadata_sortkey_skiparticle; + + if (!cluster->sortkeys[sk_field_id]) + cluster->sortkeys[sk_field_id] = + nmem_malloc(se->nmem, + sizeof(union data_types)); + + prt = pp2_relevance_tokenize( + global_parameters.server->sort_pct, + rec_md->data.text.disp); + + pp2_relevance_token_next(prt); + + sort_str = pp2_get_sort(prt, skip_article); + + cluster->sortkeys[sk_field_id]->text.disp = + rec_md->data.text.disp; + if (!sort_str) + { + sort_str = rec_md->data.text.disp; + yaz_log(YLOG_WARN, + "Could not make sortkey. Bug #1858"); + } + cluster->sortkeys[sk_field_id]->text.sort = + nmem_strdup(se->nmem, sort_str); +#if 0 + yaz_log(YLOG_LOG, "text disp=%s", + cluster->sortkeys[sk_field_id]->text.disp); + yaz_log(YLOG_LOG, "text sort=%s", + cluster->sortkeys[sk_field_id]->text.sort); +#endif + pp2_relevance_token_destroy(prt); } } } @@ -1199,15 +1317,6 @@ struct record *ingest_record(struct client *cl, Z_External *rec, if (this_max > (*wheretoput)->data.number.max) (*wheretoput)->data.number.max = this_max; } -#ifdef GAGA - if (ser_sk) - { - union data_types *sdata - = cluster->sortkeys[sk_field_id]; - yaz_log(YLOG_LOG, "SK range: %d-%d", - sdata->number.min, sdata->number.max); - } -#endif }