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
Several updates for the changes of hit count datatype from int
[idzebra-moved-to-github.git]
/
util
/
zebramap.c
diff --git
a/util/zebramap.c
b/util/zebramap.c
index
8b24c04
..
005793b
100644
(file)
--- a/
util/zebramap.c
+++ b/
util/zebramap.c
@@
-1,6
+1,6
@@
-/* $Id: zebramap.c,v 1.31 2004-06-15 09:29:31 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
- Index Data Aps
+/* $Id: zebramap.c,v 1.39 2005-01-16 23:14:58 adam Exp $
+ Copyright (C) 1995-2005
+ Index Data ApS
This file is part of the Zebra server.
This file is part of the Zebra server.
@@
-20,14
+20,14
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
*/
02111-1307, USA.
*/
-
-
#include <assert.h>
#include <assert.h>
+#include <stdlib.h>
#include <ctype.h>
#include <ctype.h>
-#include <yaz/yaz-util.h>
#include <charmap.h>
#include <charmap.h>
-#include <zebramap.h>
+#include <yaz/yaz-util.h>
+
+#include <idzebra/zebramap.h>
#define ZEBRA_MAP_TYPE_SORT 1
#define ZEBRA_MAP_TYPE_INDEX 2
#define ZEBRA_MAP_TYPE_SORT 1
#define ZEBRA_MAP_TYPE_INDEX 2
@@
-97,7
+97,7
@@
static void zebra_map_read (ZebraMaps zms, const char *name)
if (!(f = yaz_fopen(zms->tabpath, name, "r", zms->tabroot)))
{
if (!(f = yaz_fopen(zms->tabpath, name, "r", zms->tabroot)))
{
- logf(LOG_WARN|LOG_ERRNO, "%s", name);
+ yaz_log(YLOG_WARN|YLOG_ERRNO, "%s", name);
return ;
}
while ((argc = readconf_line(f, &lineno, line, 512, argv, 10)))
return ;
}
while ((argc = readconf_line(f, &lineno, line, 512, argv, 10)))
@@
-156,7
+156,7
@@
static void zebra_map_read (ZebraMaps zms, const char *name)
token->next = (*zm)->replace_tokens;
(*zm)->replace_tokens = token;
#if 0
token->next = (*zm)->replace_tokens;
(*zm)->replace_tokens = token;
#if 0
- logf (LOG_LOG, "replace %s", argv[1]);
+ yaz_log (YLOG_LOG, "replace %s", argv[1]);
#endif
token->token_from = 0;
if (argc >= 2)
#endif
token->token_from = 0;
if (argc >= 2)
@@
-179,7
+179,7
@@
static void zebra_map_read (ZebraMaps zms, const char *name)
{
*dp++ = zebra_prim(&cp);
#if 0
{
*dp++ = zebra_prim(&cp);
#if 0
- logf (LOG_LOG, " char %2X %c", dp[-1], dp[-1]);
+ yaz_log (YLOG_LOG, " char %2X %c", dp[-1], dp[-1]);
#endif
}
*dp = '\0';
#endif
}
*dp = '\0';
@@
-262,7
+262,7
@@
chrmaptab zebra_charmap_get (ZebraMaps zms, unsigned reg_id)
if (!zm)
{
zm = (struct zebra_map *) nmem_malloc (zms->nmem, sizeof(*zm));
if (!zm)
{
zm = (struct zebra_map *) nmem_malloc (zms->nmem, sizeof(*zm));
- logf (LOG_WARN, "Unknown register type: %c", reg_id);
+ yaz_log (YLOG_WARN, "Unknown register type: %c", reg_id);
zm->reg_id = reg_id;
zm->maptab_name = nmem_strdup (zms->nmem, "@");
zm->reg_id = reg_id;
zm->maptab_name = nmem_strdup (zms->nmem, "@");
@@
-282,22
+282,22
@@
chrmaptab zebra_charmap_get (ZebraMaps zms, unsigned reg_id)
if (!(zm->maptab = chrmaptab_create (zms->tabpath,
zm->maptab_name, 0,
zms->tabroot)))
if (!(zm->maptab = chrmaptab_create (zms->tabpath,
zm->maptab_name, 0,
zms->tabroot)))
- logf(LOG_WARN, "Failed to read character table %s",
+ yaz_log(YLOG_WARN, "Failed to read character table %s",
zm->maptab_name);
else
zm->maptab_name);
else
- logf(LOG_DEBUG, "Read character table %s", zm->maptab_name);
+ yaz_log(YLOG_DEBUG, "Read character table %s", zm->maptab_name);
}
return zm->maptab;
}
const char **zebra_maps_input (ZebraMaps zms, unsigned reg_id,
}
return zm->maptab;
}
const char **zebra_maps_input (ZebraMaps zms, unsigned reg_id,
- const char **from, int len)
+ const char **from, int len, int first)
{
chrmaptab maptab;
maptab = zebra_charmap_get (zms, reg_id);
if (maptab)
{
chrmaptab maptab;
maptab = zebra_charmap_get (zms, reg_id);
if (maptab)
- return chr_map_input(maptab, from, len);
+ return chr_map_input(maptab, from, len, first);
zms->temp_map_str[0] = **from;
zms->temp_map_str[0] = **from;
@@
-546,7
+546,7
@@
WRBUF zebra_replace(ZebraMaps zms, unsigned reg_id, const char *ex_list,
return zms->wrbuf_1;
#if 0
return zms->wrbuf_1;
#if 0
- logf (LOG_LOG, "in:%.*s:", wrbuf_len(zms->wrbuf_1),
+ yaz_log (YLOG_LOG, "in:%.*s:", wrbuf_len(zms->wrbuf_1),
wrbuf_buf(zms->wrbuf_1));
#endif
for (;;)
wrbuf_buf(zms->wrbuf_1));
#endif
for (;;)
@@
-573,7
+573,7
@@
int zebra_replace_sub(ZebraMaps zms, unsigned reg_id, const char *ex_list,
{
struct zm_token *token;
char replace_string[128];
{
struct zm_token *token;
char replace_string[128];
- int replace_out;
+ int replace_out = 0;
int replace_in = 0;
for (token = zm->replace_tokens; !replace_in && token;
int replace_in = 0;
for (token = zm->replace_tokens; !replace_in && token;
@@
-633,7
+633,7
@@
int zebra_replace_sub(ZebraMaps zms, unsigned reg_id, const char *ex_list,
}
}
#if 0
}
}
#if 0
- logf (LOG_LOG, "out:%.*s:", wrbuf_len(wrbuf), wrbuf_buf(wrbuf));
+ yaz_log (YLOG_LOG, "out:%.*s:", wrbuf_len(wrbuf), wrbuf_buf(wrbuf));
#endif
return no_replaces;
}
#endif
return no_replaces;
}