projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update various URLs
[idzebra-moved-to-github.git]
/
util
/
zebramap.c
diff --git
a/util/zebramap.c
b/util/zebramap.c
index
8af0c93
..
80a5a86
100644
(file)
--- a/
util/zebramap.c
+++ b/
util/zebramap.c
@@
-1,5
+1,5
@@
/* This file is part of the Zebra server.
/* This file is part of the Zebra server.
- Copyright (C) 1994-2010 Index Data
+ Copyright (C) Index Data
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
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
@@
-17,6
+17,9
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <assert.h>
#include <stdlib.h>
#include <ctype.h>
#include <assert.h>
#include <stdlib.h>
#include <ctype.h>
@@
-167,7
+170,7
@@
static int parse_command(zebra_maps_t zms, int argc, char **argv,
}
else if (!zm)
{
}
else if (!zm)
{
- yaz_log(YLOG_WARN, "%s:%d: Missing sort/index before '%s'",
+ yaz_log(YLOG_WARN, "%s:%d: Missing sort/index before '%s'",
fname, lineno, argv[0]);
return -1;
}
fname, lineno, argv[0]);
return -1;
}
@@
-212,8
+215,8
@@
static int parse_command(zebra_maps_t zms, int argc, char **argv,
zm->u.sort.entry_size = atoi(argv[1]);
else
{
zm->u.sort.entry_size = atoi(argv[1]);
else
{
- yaz_log(YLOG_WARN,
- "%s:%d: entrysize only valid in sort section",
+ yaz_log(YLOG_WARN,
+ "%s:%d: entrysize only valid in sort section",
fname, lineno);
return -1;
}
fname, lineno);
return -1;
}
@@
-248,14
+251,14
@@
static int parse_command(zebra_maps_t zms, int argc, char **argv,
#if YAZ_HAVE_ICU
UErrorCode status;
xmlNode *xml_node = xmlDocGetRootElement(zm->doc);
#if YAZ_HAVE_ICU
UErrorCode status;
xmlNode *xml_node = xmlDocGetRootElement(zm->doc);
- zm->icu_chain =
+ zm->icu_chain =
icu_chain_xml_config(xml_node,
/* not sure about sort for this function yet.. */
#if 1
1,
#else
zm->type == ZEBRA_MAP_TYPE_SORT,
icu_chain_xml_config(xml_node,
/* not sure about sort for this function yet.. */
#if 1
1,
#else
zm->type == ZEBRA_MAP_TYPE_SORT,
-#endif
+#endif
&status);
if (!zm->icu_chain)
{
&status);
if (!zm->icu_chain)
{
@@
-281,7
+284,7
@@
static int parse_command(zebra_maps_t zms, int argc, char **argv,
}
else
{
}
else
{
- yaz_log(YLOG_WARN, "%s:%d: Unrecognized directive '%s'",
+ yaz_log(YLOG_WARN, "%s:%d: Unrecognized directive '%s'",
fname, lineno, argv[0]);
return -1;
}
fname, lineno, argv[0]);
return -1;
}
@@
-363,7
+366,7
@@
zebra_map_t zebra_map_get_or_add(zebra_maps_t zms, const char *id)
if (!zm)
{
zm = zebra_add_map(zms, id, ZEBRA_MAP_TYPE_INDEX);
if (!zm)
{
zm = zebra_add_map(zms, id, ZEBRA_MAP_TYPE_INDEX);
-
+
/* no reason to warn if no maps are read from file */
if (zms->no_files_read)
yaz_log(YLOG_WARN, "Unknown register type: %s", id);
/* no reason to warn if no maps are read from file */
if (zms->no_files_read)
yaz_log(YLOG_WARN, "Unknown register type: %s", id);
@@
-398,7
+401,7
@@
const char **zebra_maps_input(zebra_map_t zm,
chrmaptab maptab = zebra_charmap_get(zm);
if (maptab)
return chr_map_input(maptab, from, len, first);
chrmaptab maptab = zebra_charmap_get(zm);
if (maptab)
return chr_map_input(maptab, from, len, first);
-
+
zm->zebra_maps->temp_map_str[0] = **from;
(*from)++;
zm->zebra_maps->temp_map_str[0] = **from;
(*from)++;
@@
-409,7
+412,7
@@
const char **zebra_maps_search(zebra_map_t zm,
const char **from, int len, int *q_map_match)
{
chrmaptab maptab;
const char **from, int len, int *q_map_match)
{
chrmaptab maptab;
-
+
*q_map_match = 0;
maptab = zebra_charmap_get(zm);
if (maptab)
*q_map_match = 0;
maptab = zebra_charmap_get(zm);
if (maptab)
@@
-444,7
+447,7
@@
const char *zebra_maps_output(zebra_map_t zm,
/* ------------------------------------ */
int zebra_maps_is_complete(zebra_map_t zm)
/* ------------------------------------ */
int zebra_maps_is_complete(zebra_map_t zm)
-{
+{
if (zm)
return zm->completeness;
return 0;
if (zm)
return zm->completeness;
return 0;
@@
-470,7
+473,7
@@
int zebra_maps_is_staticrank(zebra_map_t zm)
return zm->type == ZEBRA_MAP_TYPE_STATICRANK;
return 0;
}
return zm->type == ZEBRA_MAP_TYPE_STATICRANK;
return 0;
}
-
+
int zebra_maps_is_sort(zebra_map_t zm)
{
if (zm)
int zebra_maps_is_sort(zebra_map_t zm)
{
if (zm)
@@
-569,11
+572,11
@@
int zebra_maps_attr(zebra_maps_t zms, Z_AttributesPlusTerm *zapt,
break;
case 106: /* document-text */
*search_type = "or-list";
break;
case 106: /* document-text */
*search_type = "or-list";
- break;
+ break;
case -1:
case 1: /* phrase */
case 2: /* word */
case -1:
case 1: /* phrase */
case 2: /* word */
- case 108: /* string */
+ case 108: /* string */
*search_type = "phrase";
break;
case 107: /* local-number */
*search_type = "phrase";
break;
case 107: /* local-number */
@@
-698,6
+701,9
@@
int zebra_map_tokenize_next(zebra_map_t zm,
int zebra_map_tokenize_start(zebra_map_t zm,
const char *buf, size_t len)
{
int zebra_map_tokenize_start(zebra_map_t zm,
const char *buf, size_t len)
{
+#if YAZ_HAVE_ICU
+ int ret;
+#endif
assert(zm->use_chain);
wrbuf_rewind(zm->input_str);
assert(zm->use_chain);
wrbuf_rewind(zm->input_str);
@@
-712,14
+718,13
@@
int zebra_map_tokenize_start(zebra_map_t zm,
wrbuf_rewind(zm->print_str);
wrbuf_write_escaped(zm->print_str, wrbuf_buf(zm->input_str),
wrbuf_len(zm->input_str));
wrbuf_rewind(zm->print_str);
wrbuf_write_escaped(zm->print_str, wrbuf_buf(zm->input_str),
wrbuf_len(zm->input_str));
-
- yaz_log(YLOG_LOG, "input %s",
- wrbuf_cstr(zm->print_str));
+
+ yaz_log(YLOG_LOG, "input %s",
+ wrbuf_cstr(zm->print_str));
}
}
- icu_chain_assign_cstr(zm->icu_chain,
- wrbuf_cstr(zm->input_str),
- &status);
- if (!U_SUCCESS(status))
+ ret = icu_chain_assign_cstr(zm->icu_chain,
+ wrbuf_cstr(zm->input_str), &status);
+ if (!ret && !U_SUCCESS(status))
{
if (zm->debug)
{
{
if (zm->debug)
{