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
Ignore config.h stuff
[idzebra-moved-to-github.git]
/
index
/
rankstatic.c
diff --git
a/index/rankstatic.c
b/index/rankstatic.c
index
144d60c
..
09f593e
100644
(file)
--- a/
index/rankstatic.c
+++ b/
index/rankstatic.c
@@
-1,8
+1,5
@@
-/* $Id: rankstatic.c,v 1.10 2007-01-15 15:10:16 adam Exp $
- Copyright (C) 1995-2007
- Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+ 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
@@
-20,6
+17,9
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#include <assert.h>
#include <limits.h>
#include <stdio.h>
#include <assert.h>
#include <limits.h>
@@
-91,7
+91,7
@@
static void *begin (struct zebra_register *reg,
for (; ol; ol = ol->next)
{
for (; ol; ol = ol->next)
{
- int index_type = 0;
+ const char *index_type = 0;
const char *db = 0;
const char *string_index = 0;
int set = -1;
const char *db = 0;
const char *string_index = 0;
int set = -1;
@@
-101,11
+101,11
@@
static void *begin (struct zebra_register *reg,
ol->ord, &index_type, &db, &string_index);
if (string_index)
ol->ord, &index_type, &db, &string_index);
if (string_index)
- yaz_log(log_level, " ord=%d index_type=%c db=%s str-index=%s",
- ol->ord, index_type, db, string_index);
+ yaz_log(log_level, " ord=%d index_type=%s db=%s str-index=%s",
+ ol->ord, index_type, db, string_index);
else
else
- yaz_log(log_level, " ord=%d index_type=%c db=%s set=%d use=%d",
- ol->ord, index_type, db, set, use);
+ yaz_log(log_level, " ord=%d index_type=%s db=%s set=%d use=%d",
+ ol->ord, index_type, db, set, use);
}
if (!strncmp (terms[i]->flags, "rank,", 5))
(si->no_rank_entries)++;
}
if (!strncmp (terms[i]->flags, "rank,", 5))
(si->no_rank_entries)++;
@@
-186,6
+186,7
@@
struct rank_control *rank_static_class = &rank_control;
/*
* 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