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
Fix typo in path to oai-pmh example
[idzebra-moved-to-github.git]
/
util
/
snippet.c
diff --git
a/util/snippet.c
b/util/snippet.c
index
61296fa
..
cb8b65b
100644
(file)
--- a/
util/snippet.c
+++ b/
util/snippet.c
@@
-1,8
+1,5
@@
-/* $Id: snippet.c,v 1.15 2008-01-24 16:13:29 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) 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 <stddef.h>
#include <string.h>
#include <yaz/nmem.h>
#include <stddef.h>
#include <string.h>
#include <yaz/nmem.h>
@@
-111,7
+111,7
@@
void zebra_snippets_log(const zebra_snippets *l, int log_level, int all)
if (all || w->mark)
yaz_log(log_level, "term='%s'%s mark=%d seqno=" ZINT_FORMAT " ord=%d",
if (all || w->mark)
yaz_log(log_level, "term='%s'%s mark=%d seqno=" ZINT_FORMAT " ord=%d",
- wrbuf_cstr(wr_term),
+ wrbuf_cstr(wr_term),
(w->match && !w->ws ? "*" : ""), w->mark,
w->seqno, w->ord);
wrbuf_destroy(wr_term);
(w->match && !w->ws ? "*" : ""), w->mark,
w->seqno, w->ord);
wrbuf_destroy(wr_term);
@@
-189,7
+189,7
@@
zebra_snippets *zebra_snippets_window(const zebra_snippets *doc,
hit_w = hit_w->next)
{
if (hit_w->ord == ord && hit_w->seqno == doc_w->seqno)
hit_w = hit_w->next)
{
if (hit_w->ord == ord && hit_w->seqno == doc_w->seqno)
-
+
{
match = 1;
break;
{
match = 1;
break;
@@
-197,7
+197,7
@@
zebra_snippets *zebra_snippets_window(const zebra_snippets *doc,
}
zebra_snippets_append_match(result, doc_w->seqno,
doc_w->ws,
}
zebra_snippets_append_match(result, doc_w->seqno,
doc_w->ws,
- ord, doc_w->term,
+ ord, doc_w->term,
strlen(doc_w->term), match);
}
}
strlen(doc_w->term), match);
}
}
@@
-269,7
+269,7
@@
void zebra_snippets_ring(zebra_snippets *doc, const zebra_snippets *hit,
doc_w->mark = 1;
break;
}
doc_w->mark = 1;
break;
}
-
+
}
/* mark following terms */
if (doc_w)
}
/* mark following terms */
if (doc_w)
@@
-277,7
+277,7
@@
void zebra_snippets_ring(zebra_snippets *doc, const zebra_snippets *hit,
zebra_snippet_word *w = doc_w->next;
while (w)
if (w->ord == ord
zebra_snippet_word *w = doc_w->next;
while (w)
if (w->ord == ord
- && hit_w->seqno - before < w->seqno
+ && hit_w->seqno - before < w->seqno
&& hit_w->seqno + after > w->seqno)
{
w->mark = 1;
&& hit_w->seqno + after > w->seqno)
{
w->mark = 1;
@@
-292,7
+292,7
@@
void zebra_snippets_ring(zebra_snippets *doc, const zebra_snippets *hit,
zebra_snippet_word *w = doc_w->prev;
while (w)
if (w->ord == ord
zebra_snippet_word *w = doc_w->prev;
while (w)
if (w->ord == ord
- && hit_w->seqno - before < w->seqno
+ && hit_w->seqno - before < w->seqno
&& hit_w->seqno + after > w->seqno)
{
w->mark = 1;
&& hit_w->seqno + after > w->seqno)
{
w->mark = 1;
@@
-306,10
+306,11
@@
void zebra_snippets_ring(zebra_snippets *doc, const zebra_snippets *hit,
}
}
}
}
-
+
/*
* 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