-/*
- * Copyright (C) 1994-1999, Index Data
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: zebramap.c,v $
- * 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.27 2002-08-02 19:26:57 adam Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+ 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 <assert.h>
#include <ctype.h>
-#include <yaz-util.h>
+#include <yaz/yaz-util.h>
#include <charmap.h>
#include <zebramap.h>
struct zebra_maps {
char *tabpath;
+ char *tabroot;
NMEM nmem;
struct zebra_map *map_list;
char temp_map_str[2];
int lineno = 0;
struct zebra_map **zm = 0, *zp;
- if (!(f = yaz_path_fopen(zms->tabpath, name, "r")))
+ if (!(f = yaz_fopen(zms->tabpath, name, "r", zms->tabroot)))
{
logf(LOG_WARN|LOG_ERRNO, "%s", name);
return ;
struct zm_token *token = nmem_malloc (zms->nmem, sizeof(*token));
token->next = (*zm)->replace_tokens;
(*zm)->replace_tokens = token;
+#if 0
+ logf (LOG_LOG, "replace %s", argv[1]);
+#endif
token->token_from = 0;
if (argc >= 2)
{
cp++;
}
else
+ {
*dp++ = zebra_prim(&cp);
+#if 0
+ logf (LOG_LOG, " char %2X %c", dp[-1], dp[-1]);
+#endif
+ }
*dp = '\0';
}
if (argc >= 3)
}
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;
zebra_map_read (zms, value);
}
-ZebraMaps zebra_maps_open (Res res)
+ZebraMaps zebra_maps_open (Res res, const char *base)
{
ZebraMaps zms = (ZebraMaps) xmalloc (sizeof(*zms));
int i;
zms->nmem = nmem_create ();
zms->tabpath = nmem_strdup (zms->nmem,
res_get_def (res, "profilePath", "."));
+ zms->tabroot = 0;
+ if (base)
+ zms->tabroot = nmem_strdup (zms->nmem, base);
zms->map_list = NULL;
zms->temp_map_str[0] = '\0';
zms->wrbuf_1 = wrbuf_alloc();
zms->wrbuf_2 = wrbuf_alloc();
+
return zms;
}
logf (LOG_WARN, "Unknown register type: %c", reg_id);
zm->reg_id = reg_id;
- zm->maptab_name = NULL;
+ zm->maptab_name = nmem_strdup (zms->nmem, "@");
zm->maptab = NULL;
zm->type = ZEBRA_MAP_TYPE_INDEX;
zm->completeness = 0;
if (!zm->maptab_name || !yaz_matchstr (zm->maptab_name, "@"))
return NULL;
if (!(zm->maptab = chrmaptab_create (zms->tabpath,
- zm->maptab_name, 0)))
+ zm->maptab_name, 0,
+ zms->tabroot)))
logf(LOG_WARN, "Failed to read character table %s",
zm->maptab_name);
else
return 0;
}
-int zebra_maps_sort (ZebraMaps zms, Z_SortAttributes *sortAttributes)
+int zebra_maps_sort (ZebraMaps zms, Z_SortAttributes *sortAttributes,
+ int *numerical)
{
AttrType use;
+ AttrType structure;
+ int structure_value;
attr_init_AttrList (&use, sortAttributes->list, 1);
+ attr_init_AttrList (&structure, sortAttributes->list, 4);
+ *numerical = 0;
+ structure_value = attr_find (&structure, 0);
+ if (structure_value == 109)
+ *numerical = 1;
return attr_find (&use, NULL);
}
int zebra_maps_attr (ZebraMaps zms, Z_AttributesPlusTerm *zapt,
- unsigned *reg_id, char **search_type, char **rank_type,
+ unsigned *reg_id, char **search_type, char *rank_type,
int *complete_flag, int *sort_flag)
{
AttrType completeness;
AttrType structure;
AttrType relation;
AttrType sort_relation;
+ AttrType weight;
int completeness_value;
int structure_value;
int relation_value;
int sort_relation_value;
+ int weight_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);
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);
if (completeness_value == 2 || completeness_value == 3)
*complete_flag = 1;
*sort_flag = (sort_relation_value > 0) ? 1 : 0;
*search_type = "phrase";
- *rank_type = "void";
+ strcpy (rank_type, "void");
if (relation_value == 102)
- *rank_type = "rank";
-
+ {
+ if (weight_value == -1)
+ weight_value = 34;
+ sprintf (rank_type, "rank,%d", weight_value);
+ }
+ if (relation_value == 103)
+ {
+ *search_type = "always";
+ return 0;
+ }
if (*complete_flag)
*reg_id = 'p';
else
*reg_id = '0';
*search_type = "phrase";
break;
+ case 4: /* year */
+ *reg_id = 'y';
+ *search_type = "phrase";
+ break;
+ case 5: /* date */
+ *reg_id = 'd';
+ *search_type = "phrase";
+ break;
default:
return -1;
}
wrbuf_rewind(zms->wrbuf_1);
wrbuf_write(zms->wrbuf_1, input_str, input_len);
- if (!zm->replace_tokens)
+ if (!zm || !zm->replace_tokens)
return zms->wrbuf_1;
-#if 0
+#if 0
logf (LOG_LOG, "in:%.*s:", wrbuf_len(zms->wrbuf_1),
wrbuf_buf(zms->wrbuf_1));
#endif
if (i+j < 0 || j+i >= input_len)
c = ' ';
else
- c = tolower(input_str[j+i]);
+ c = input_str[j+i] & 255;
if (token->token_from[j] == ZEBRA_REPLACE_ANY)
{
if (c == ' ')
else
{
if (c != token->token_from[j])
+ {
break;
+ }
if (!replace_done)
{
const char *cp = token->token_to;
projects / idzebra-moved-to-github.git / blobdiff