X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=util%2Fzebramap.c;h=df53aa8561f76f39ad3f7381df3f91571a9f19c4;hp=71c715aee635c793278d2f456a9107f5656b93fd;hb=4eb3b54bb2ca9af74f39f000d3d40dba99ded887;hpb=98e21f950e6d0babe88a6a1ccb03b90f0b3a6b1a diff --git a/util/zebramap.c b/util/zebramap.c index 71c715a..df53aa8 100644 --- a/util/zebramap.c +++ b/util/zebramap.c @@ -1,95 +1,34 @@ -/* - * Copyright (C) 1994-1999, Index Data - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: zebramap.c,v $ - * Revision 1.24 2002-04-04 20:50:37 adam - * Multi register works with record paths and data1 profile path - * - * Revision 1.23 2001/11/15 08:41:24 adam - * Fix for weight (bug introduced by previous commit). - * - * Revision 1.22 2001/11/14 22:06:27 adam - * Rank-weight may be controlled via query. - * - * Revision 1.21 2001/01/22 10:42:56 adam - * Added numerical sort. - * - * Revision 1.20 2000/03/02 14:35:19 adam - * Added structure year and date. - * - * Revision 1.19 1999/11/30 13:48:04 adam - * Improved installation. Updated for inclusion of YAZ header files. - * - * Revision 1.18 1999/10/15 08:27:46 adam - * Fixed replace handler. 8-bit fix. - * - * Revision 1.17 1999/09/08 12:13:21 adam - * Fixed minor bug "replace"-mappings. Removed some logging messages. - * - * Revision 1.16 1999/09/07 07:19:21 adam - * Work on character mapping. Implemented replace rules. - * - * Revision 1.15 1999/05/26 07:49:14 adam - * C++ compilation. - * - * Revision 1.14 1999/02/19 10:37:40 adam - * Minor fix. - * - * Revision 1.13 1999/02/18 15:01:04 adam - * Structure=key uses register type 0. - * - * Revision 1.12 1999/02/12 13:29:25 adam - * Implemented position-flag for registers. - * - * Revision 1.11 1998/10/13 20:09:19 adam - * Changed call to readconf_line. - * - * Revision 1.10 1998/06/23 15:33:37 adam - * Added feature to specify sort criteria in query (type 7 specifies - * sort flags). - * - * Revision 1.9 1998/04/02 14:35:30 adam - * First version of Zebra that works with compiled ASN.1. - * - * Revision 1.8 1998/03/05 08:42:44 adam - * Minor changes to zebramap data structures. Query mapping rules changed. - * - * Revision 1.7 1998/02/10 12:03:07 adam - * Implemented Sort. - * - * Revision 1.6 1998/01/29 13:36:01 adam - * Structure word-list, free-form-text and document-text all - * trigger ranked search. - * - * Revision 1.5 1997/11/19 10:22:14 adam - * Bug fix (introduced by previous commit). - * - * Revision 1.4 1997/11/18 10:05:08 adam - * Changed character map facility so that admin can specify character - * mapping files for each register type, w, p, etc. - * - * Revision 1.3 1997/11/17 15:35:26 adam - * Bug fix. Relation=relevance wasn't observed. - * - * Revision 1.2 1997/10/31 12:39:30 adam - * Changed log message. - * - * Revision 1.1 1997/10/27 14:33:06 adam - * Moved towards generic character mapping depending on "structure" - * field in abstract syntax file. Fixed a few memory leaks. Fixed - * bug with negative integers when doing searches with relational - * operators. - * - */ +/* $Id: zebramap.c,v 1.37 2004-12-13 20:51:34 adam Exp $ + Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 + Index Data Aps + +This file is part of the Zebra server. + +Zebra 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 +Software Foundation; either version 2, or (at your option) any later +version. + +Zebra is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +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 Zebra; see the file LICENSE.zebra. If not, write to the +Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. +*/ + + #include #include -#include #include -#include +#include + +#include #define ZEBRA_MAP_TYPE_SORT 1 #define ZEBRA_MAP_TYPE_INDEX 2 @@ -157,9 +96,9 @@ static void zebra_map_read (ZebraMaps zms, const char *name) int lineno = 0; struct zebra_map **zm = 0, *zp; - if (!(f = yaz_path_fopen_base(zms->tabpath, name, "r", zms->tabroot))) + if (!(f = yaz_fopen(zms->tabpath, name, "r", zms->tabroot))) { - logf(LOG_WARN|LOG_ERRNO, "%s", name); + yaz_log(YLOG_WARN|YLOG_ERRNO, "%s", name); return ; } while ((argc = readconf_line(f, &lineno, line, 512, argv, 10))) @@ -218,7 +157,7 @@ static void zebra_map_read (ZebraMaps zms, const char *name) token->next = (*zm)->replace_tokens; (*zm)->replace_tokens = token; #if 0 - logf (LOG_LOG, "replace %s", argv[1]); + yaz_log (YLOG_LOG, "replace %s", argv[1]); #endif token->token_from = 0; if (argc >= 2) @@ -241,7 +180,7 @@ static void zebra_map_read (ZebraMaps zms, const char *name) { *dp++ = zebra_prim(&cp); #if 0 - logf (LOG_LOG, " char %2X %c", dp[-1], dp[-1]); + yaz_log (YLOG_LOG, " char %2X %c", dp[-1], dp[-1]); #endif } *dp = '\0'; @@ -267,7 +206,7 @@ static void zebra_map_read (ZebraMaps zms, const char *name) } if (zm) (*zm)->next = NULL; - fclose (f); + yaz_fclose (f); for (zp = zms->map_list; zp; zp = zp->next) zms->lookup_array[zp->reg_id] = zp; @@ -287,7 +226,8 @@ ZebraMaps zebra_maps_open (Res res, const char *base) zms->nmem = nmem_create (); zms->tabpath = nmem_strdup (zms->nmem, - res_get_def (res, "profilePath", ".")); + res_get_def (res, "profilePath", + DEFAULT_PROFILE_PATH)); zms->tabroot = 0; if (base) zms->tabroot = nmem_strdup (zms->nmem, base); @@ -323,7 +263,7 @@ chrmaptab zebra_charmap_get (ZebraMaps zms, unsigned reg_id) if (!zm) { zm = (struct zebra_map *) nmem_malloc (zms->nmem, sizeof(*zm)); - logf (LOG_WARN, "Unknown register type: %c", reg_id); + yaz_log (YLOG_WARN, "Unknown register type: %c", reg_id); zm->reg_id = reg_id; zm->maptab_name = nmem_strdup (zms->nmem, "@"); @@ -331,6 +271,7 @@ chrmaptab zebra_charmap_get (ZebraMaps zms, unsigned reg_id) zm->type = ZEBRA_MAP_TYPE_INDEX; zm->completeness = 0; zm->next = zms->map_list; + zm->replace_tokens = 0; zms->map_list = zm->next; zms->lookup_array[zm->reg_id & 255] = zm; @@ -342,22 +283,22 @@ chrmaptab zebra_charmap_get (ZebraMaps zms, unsigned reg_id) if (!(zm->maptab = chrmaptab_create (zms->tabpath, zm->maptab_name, 0, zms->tabroot))) - logf(LOG_WARN, "Failed to read character table %s", + yaz_log(YLOG_WARN, "Failed to read character table %s", zm->maptab_name); else - logf(LOG_DEBUG, "Read character table %s", zm->maptab_name); + yaz_log(YLOG_DEBUG, "Read character table %s", zm->maptab_name); } return zm->maptab; } const char **zebra_maps_input (ZebraMaps zms, unsigned reg_id, - const char **from, int len) + const char **from, int len, int first) { chrmaptab maptab; maptab = zebra_charmap_get (zms, reg_id); if (maptab) - return chr_map_input(maptab, from, len); + return chr_map_input(maptab, from, len, first); zms->temp_map_str[0] = **from; @@ -365,40 +306,6 @@ const char **zebra_maps_input (ZebraMaps zms, unsigned reg_id, return zms->temp_map_ptr; } -#if 0 -int zebra_maps_input_tokens (ZebraMaps zms, unsigned reg_id, - const char *input_str, int input_len, - WRBUF wrbuf) -{ - chrmaptab maptab = zebra_charmap_get (zms, reg_id); - int len[4]; - char *str[3]; - int input_i = 0; - int first = 1; - const char **out; - - if (!maptab) - { - wrbuf_write (wrbuf, input_str, input_len); - return -1; - } - str[0] = " "; - len[0] = 1; - str[1] = input_str; - len[1] = input_len; - str[2] = " "; - len[2] = 1; - len[3] = -1; - - out = chr_map_input (maptab, str, len); - while (len[1] > 0) - { - while (out && *out && **out == *CHR_SPACE) - out = chr_map_input (maptab, str, len); - } -} -#endif - const char *zebra_maps_output(ZebraMaps zms, unsigned reg_id, const char **from) { @@ -466,13 +373,8 @@ static int attr_find (AttrType *src, oid_value *attributeSetP) static void attr_init_APT (AttrType *src, Z_AttributesPlusTerm *zapt, int type) { -#ifdef ASN_COMPILED src->attributeList = zapt->attributes->attributes; src->num_attributes = zapt->attributes->num_attributes; -#else - src->attributeList = zapt->attributeList; - src->num_attributes = zapt->num_attributes; -#endif src->type = type; src->major = 0; src->minor = 0; @@ -538,23 +440,27 @@ int zebra_maps_attr (ZebraMaps zms, Z_AttributesPlusTerm *zapt, AttrType relation; AttrType sort_relation; AttrType weight; + AttrType use; int completeness_value; int structure_value; int relation_value; int sort_relation_value; int weight_value; + int use_value; attr_init_APT (&structure, zapt, 4); attr_init_APT (&completeness, zapt, 6); attr_init_APT (&relation, zapt, 2); attr_init_APT (&sort_relation, zapt, 7); attr_init_APT (&weight, zapt, 9); + attr_init_APT (&use, zapt, 1); completeness_value = attr_find (&completeness, NULL); structure_value = attr_find (&structure, NULL); relation_value = attr_find (&relation, NULL); sort_relation_value = attr_find (&sort_relation, NULL); weight_value = attr_find (&weight, NULL); + use_value = attr_find(&use, NULL); if (completeness_value == 2 || completeness_value == 3) *complete_flag = 1; @@ -569,8 +475,13 @@ int zebra_maps_attr (ZebraMaps zms, Z_AttributesPlusTerm *zapt, { if (weight_value == -1) weight_value = 34; - sprintf (rank_type, "rank,%d", weight_value); - } + sprintf (rank_type, "rank,w=%d,u=%d", weight_value, use_value); + } + if (relation_value == 103) + { + *search_type = "always"; + return 0; + } if (*complete_flag) *reg_id = 'p'; else @@ -636,7 +547,7 @@ WRBUF zebra_replace(ZebraMaps zms, unsigned reg_id, const char *ex_list, return zms->wrbuf_1; #if 0 - logf (LOG_LOG, "in:%.*s:", wrbuf_len(zms->wrbuf_1), + yaz_log (YLOG_LOG, "in:%.*s:", wrbuf_len(zms->wrbuf_1), wrbuf_buf(zms->wrbuf_1)); #endif for (;;) @@ -663,7 +574,7 @@ int zebra_replace_sub(ZebraMaps zms, unsigned reg_id, const char *ex_list, { struct zm_token *token; char replace_string[128]; - int replace_out; + int replace_out = 0; int replace_in = 0; for (token = zm->replace_tokens; !replace_in && token; @@ -723,7 +634,7 @@ int zebra_replace_sub(ZebraMaps zms, unsigned reg_id, const char *ex_list, } } #if 0 - logf (LOG_LOG, "out:%.*s:", wrbuf_len(wrbuf), wrbuf_buf(wrbuf)); + yaz_log (YLOG_LOG, "out:%.*s:", wrbuf_len(wrbuf), wrbuf_buf(wrbuf)); #endif return no_replaces; }