X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=util%2Fzebramap.c;h=b075257e24094de70f3f1c9a8af9e6d4cb3747c9;hp=06b2605f69e93af3551b53ef68ce7a8453398bb2;hb=c33ea56e3771c3b80ba66ef8fda3a09cad171ebb;hpb=ecb3935e78cd9bcfdebafdee0834cfb1060d7b5e diff --git a/util/zebramap.c b/util/zebramap.c index 06b2605..b075257 100644 --- a/util/zebramap.c +++ b/util/zebramap.c @@ -1,5 +1,5 @@ -/* $Id: zebramap.c,v 1.47 2006-05-10 08:13:46 adam Exp $ - Copyright (C) 1995-2005 +/* $Id: zebramap.c,v 1.53 2006-09-08 14:41:00 adam Exp $ + Copyright (C) 1995-2006 Index Data ApS This file is part of the Zebra server. @@ -25,9 +25,10 @@ #include #include +#include #include -#include +#include #define ZEBRA_MAP_TYPE_SORT 1 #define ZEBRA_MAP_TYPE_INDEX 2 @@ -38,6 +39,8 @@ struct zebra_map { unsigned reg_id; int completeness; int positioned; + int alwaysmatches; + int first_in_field; int type; union { struct { @@ -85,6 +88,7 @@ ZEBRA_RES zebra_maps_read_file(ZebraMaps zms, const char *fname) char *argv[10]; int argc; int lineno = 0; + int failures = 0; struct zebra_map **zm = 0, *zp; if (!(f = yaz_fopen(zms->tabpath, fname, "r", zms->tabroot))) @@ -94,7 +98,21 @@ ZEBRA_RES zebra_maps_read_file(ZebraMaps zms, const char *fname) } while ((argc = readconf_line(f, &lineno, line, 512, argv, 10))) { - if (!yaz_matchstr(argv[0], "index") && argc == 2) + if (argc == 1) + { + yaz_log(YLOG_WARN, "%s:%d: Missing arguments for '%s'", + fname, lineno, argv[0]); + failures++; + break; + } + if (argc > 2) + { + yaz_log(YLOG_WARN, "%s:%d: Too many arguments for '%s'", + fname, lineno, argv[0]); + failures++; + break; + } + if (!yaz_matchstr(argv[0], "index")) { if (!zm) zm = &zms->map_list; @@ -107,9 +125,11 @@ ZEBRA_RES zebra_maps_read_file(ZebraMaps zms, const char *fname) (*zm)->type = ZEBRA_MAP_TYPE_INDEX; (*zm)->completeness = 0; (*zm)->positioned = 1; + (*zm)->alwaysmatches = 0; + (*zm)->first_in_field = 0; zms->no_maps++; } - else if (!yaz_matchstr(argv[0], "sort") && argc == 2) + else if (!yaz_matchstr(argv[0], "sort")) { if (!zm) zm = &zms->map_list; @@ -123,25 +143,47 @@ ZEBRA_RES zebra_maps_read_file(ZebraMaps zms, const char *fname) (*zm)->maptab = NULL; (*zm)->completeness = 0; (*zm)->positioned = 0; + (*zm)->alwaysmatches = 0; + (*zm)->first_in_field = 0; zms->no_maps++; } - else if (zm && !yaz_matchstr(argv[0], "charmap") && argc == 2) + else if (!zm) + { + yaz_log(YLOG_WARN, "%s:%d: Missing sort/index before '%s'", + fname, lineno, argv[0]); + failures++; + } + else if (!yaz_matchstr(argv[0], "charmap") && argc == 2) { (*zm)->maptab_name = nmem_strdup(zms->nmem, argv[1]); } - else if (zm && !yaz_matchstr(argv[0], "completeness") && argc == 2) + else if (!yaz_matchstr(argv[0], "completeness") && argc == 2) { (*zm)->completeness = atoi(argv[1]); } - else if (zm && !yaz_matchstr(argv[0], "position") && argc == 2) + else if (!yaz_matchstr(argv[0], "position") && argc == 2) { (*zm)->positioned = atoi(argv[1]); } - else if (zm && !yaz_matchstr(argv[0], "entrysize") && argc == 2) + else if (!yaz_matchstr(argv[0], "alwaysmatches") && argc == 2) + { + (*zm)->alwaysmatches = atoi(argv[1]); + } + else if (!yaz_matchstr(argv[0], "firstinfield") && argc == 2) + { + (*zm)->first_in_field = atoi(argv[1]); + } + else if (!yaz_matchstr(argv[0], "entrysize") && argc == 2) { if ((*zm)->type == ZEBRA_MAP_TYPE_SORT) (*zm)->u.sort.entry_size = atoi(argv[1]); } + else + { + yaz_log(YLOG_WARN, "%s:%d: Unrecognized directive '%s'", + fname, lineno, argv[0]); + failures++; + } } if (zm) (*zm)->next = NULL; @@ -150,6 +192,8 @@ ZEBRA_RES zebra_maps_read_file(ZebraMaps zms, const char *fname) for (zp = zms->map_list; zp; zp = zp->next) zms->lookup_array[zp->reg_id] = zp; + if (failures) + return ZEBRA_FAIL; return ZEBRA_OK; } @@ -277,79 +321,6 @@ const char *zebra_maps_output(ZebraMaps zms, unsigned reg_id, /* ------------------------------------ */ -typedef struct { - int type; - int major; - int minor; - Z_AttributeElement **attributeList; - int num_attributes; -} AttrType; - -static int attr_find(AttrType *src, oid_value *attributeSetP) -{ - while (src->major < src->num_attributes) - { - Z_AttributeElement *element; - - element = src->attributeList[src->major]; - if (src->type == *element->attributeType) - { - switch (element->which) - { - case Z_AttributeValue_numeric: - ++(src->major); - if (element->attributeSet && attributeSetP) - { - oident *attrset; - - attrset = oid_getentbyoid(element->attributeSet); - *attributeSetP = attrset->value; - } - return *element->value.numeric; - break; - case Z_AttributeValue_complex: - if (src->minor >= element->value.complex->num_list || - element->value.complex->list[src->minor]->which != - Z_StringOrNumeric_numeric) - break; - ++(src->minor); - if (element->attributeSet && attributeSetP) - { - oident *attrset; - - attrset = oid_getentbyoid(element->attributeSet); - *attributeSetP = attrset->value; - } - return *element->value.complex->list[src->minor-1]->u.numeric; - default: - assert(0); - } - } - ++(src->major); - } - return -1; -} - -static void attr_init_APT(AttrType *src, Z_AttributesPlusTerm *zapt, int type) -{ - src->attributeList = zapt->attributes->attributes; - src->num_attributes = zapt->attributes->num_attributes; - src->type = type; - src->major = 0; - src->minor = 0; -} - -static void attr_init_AttrList(AttrType *src, Z_AttributeList *list, int type) -{ - src->attributeList = list->attributes; - src->num_attributes = list->num_attributes; - src->type = type; - src->major = 0; - src->minor = 0; -} - -/* ------------------------------------ */ - int zebra_maps_is_complete(ZebraMaps zms, unsigned reg_id) { struct zebra_map *zm = zebra_map_get(zms, reg_id); @@ -374,6 +345,22 @@ int zebra_maps_is_sort(ZebraMaps zms, unsigned reg_id) return 0; } +int zebra_maps_is_alwaysmatches(ZebraMaps zms, unsigned reg_id) +{ + struct zebra_map *zm = zebra_map_get(zms, reg_id); + if (zm) + return zm->alwaysmatches; + return 0; +} + +int zebra_maps_is_first_in_field(ZebraMaps zms, unsigned reg_id) +{ + struct zebra_map *zm = zebra_map_get(zms, reg_id); + if (zm) + return zm->first_in_field; + return 0; +} + int zebra_maps_sort(ZebraMaps zms, Z_SortAttributes *sortAttributes, int *numerical) { @@ -436,11 +423,6 @@ int zebra_maps_attr(ZebraMaps zms, Z_AttributesPlusTerm *zapt, weight_value = 34; 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