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
Scan: allow preferred position > number + 1
[idzebra-moved-to-github.git]
/
util
/
zebramap.c
diff --git
a/util/zebramap.c
b/util/zebramap.c
index
c6f3da9
..
8165026
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) 1995-2008 Index Data
+ Copyright (C) 1994-2011 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>
@@
-342,6
+345,12
@@
zebra_maps_t zebra_maps_open(Res res, const char *base_path,
return zms;
}
return zms;
}
+void zebra_maps_define_default_sort(zebra_maps_t zms)
+{
+ zebra_map_t zm = zebra_add_map(zms, "s", ZEBRA_MAP_TYPE_SORT);
+ zm->u.sort.entry_size = 80;
+}
+
zebra_map_t zebra_map_get(zebra_maps_t zms, const char *id)
{
zebra_map_t zm;
zebra_map_t zebra_map_get(zebra_maps_t zms, const char *id)
{
zebra_map_t zm;
@@
-692,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);
@@
-710,10
+722,9
@@
int zebra_map_tokenize_start(zebra_map_t zm,
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)
{
@@
-740,6
+751,7
@@
int zebra_maps_is_icu(zebra_map_t zm)
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab