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
Explain: using Odr_int
[idzebra-moved-to-github.git]
/
index
/
zebraapi.c
diff --git
a/index/zebraapi.c
b/index/zebraapi.c
index
65b9176
..
ff18046
100644
(file)
--- a/
index/zebraapi.c
+++ b/
index/zebraapi.c
@@
-1,5
+1,5
@@
/* This file is part of the Zebra server.
/* This file is part of the Zebra server.
- Copyright (C) 1994-2009 Index Data
+ Copyright (C) 1994-2010 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
@@
-420,7
+420,7
@@
struct zebra_register *zebra_register_open(ZebraService zs, const char *name,
zebraRankInstall(reg, rank_similarity_class);
zebraRankInstall(reg, rank_static_class);
zebraRankInstall(reg, rank_similarity_class);
zebraRankInstall(reg, rank_static_class);
- compression_str = res_get_def(res, "compression_str", "none");
+ compression_str = res_get_def(res, "recordCompression", "none");
if (!strcmp(compression_str, "none"))
record_compression = REC_COMPRESS_NONE;
else if (!strcmp(compression_str, "bzip2"))
if (!strcmp(compression_str, "none"))
record_compression = REC_COMPRESS_NONE;
else if (!strcmp(compression_str, "bzip2"))
@@
-433,6
+433,13
@@
struct zebra_register *zebra_register_open(ZebraService zs, const char *name,
ret = ZEBRA_FAIL;
}
ret = ZEBRA_FAIL;
}
+ if (!rec_check_compression_method(record_compression))
+ {
+ yaz_log(YLOG_FATAL, "unsupported recordCompression: %s",
+ compression_str);
+ ret = ZEBRA_FAIL;
+ }
+
{
const char *index_fname = res_get_def(res, "index", "default.idx");
if (index_fname && *index_fname && strcmp(index_fname, "none"))
{
const char *index_fname = res_get_def(res, "index", "default.idx");
if (index_fname && *index_fname && strcmp(index_fname, "none"))