-/* $Id: snippet.c,v 1.4 2005-06-07 15:12:39 adam Exp $
- Copyright (C) 1995-2005
+/* $Id: snippet.c,v 1.12 2007-01-15 15:10:26 adam Exp $
+ Copyright (C) 1995-2007
Index Data ApS
This file is part of the Zebra server.
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <stddef.h>
zebra_snippet_word *tail;
};
-zebra_snippets *zebra_snippets_create()
+zebra_snippets *zebra_snippets_create(void)
{
NMEM nmem = nmem_create();
zebra_snippets *l = nmem_malloc(nmem, sizeof(*l));
}
void zebra_snippets_append(zebra_snippets *l,
- zint seqno, int reg_type, int ord, const char *term)
+ zint seqno, int ord, const char *term)
{
- zebra_snippets_append_match(l, seqno, reg_type, ord, term, 0);
+ zebra_snippets_append_match(l, seqno, ord, term, 0);
}
void zebra_snippets_append_match(zebra_snippets *l,
- zint seqno, int reg_type,
- int ord, const char *term, int match)
+ zint seqno, int ord, const char *term,
+ int match)
{
struct zebra_snippet_word *w = nmem_malloc(l->nmem, sizeof(*w));
l->tail = w;
w->seqno = seqno;
- w->reg_type = reg_type;
w->ord = ord;
w->term = nmem_strdup(l->nmem, term);
w->match = match;
{
zebra_snippet_word *w;
for (w = l->front; w; w = w->next)
- yaz_log(log_level, "term=%s%s seqno=" ZINT_FORMAT " reg_type=%c "
- "ord=%d",
- w->term, (w->match ? "*" : ""), w->seqno, w->reg_type, w->ord);
+ yaz_log(log_level, "term=%s%s seqno=" ZINT_FORMAT " ord=%d",
+ w->term, (w->match ? "*" : ""), w->seqno, w->ord);
}
zebra_snippets *zebra_snippets_window(zebra_snippets *doc, zebra_snippets *hit,
while(1)
{
- int window_start;
- int reg_type;
- int first_seq_no_best_window = 0;
- int last_seq_no_best_window = 0;
+ zint window_start;
+ zint first_seq_no_best_window = 0;
+ zint last_seq_no_best_window = 0;
int number_best_window = 0;
zebra_snippet_word *hit_w, *doc_w;
int min_ord = 0; /* not set yet */
for (hit_w = zebra_snippets_list(hit); hit_w; hit_w = hit_w->next)
if (hit_w->ord > ord &&
- (min_ord == 0 ||
- (hit_w->ord < min_ord && hit_w->reg_type == reg_type)))
+ (min_ord == 0 || hit_w->ord < min_ord))
{
min_ord = hit_w->ord;
- reg_type = hit_w->reg_type;
}
if (min_ord == 0)
break;
{
zebra_snippet_word *look_w = hit_w;
int number_this = 0;
- int seq_no_last = 0;
+ zint seq_no_last = 0;
while (look_w && look_w->seqno < hit_w->seqno + window_size)
{
- if (look_w->ord == ord && look_w->reg_type == reg_type)
+ if (look_w->ord == ord)
{
seq_no_last = look_w->seqno;
number_this++;
}
}
yaz_log(YLOG_DEBUG, "ord=%d", ord);
- yaz_log(YLOG_DEBUG, "first_seq_no_best_window=%d", first_seq_no_best_window);
- yaz_log(YLOG_DEBUG, "last_seq_no_best_window=%d", last_seq_no_best_window);
+ yaz_log(YLOG_DEBUG, "first_seq_no_best_window=" ZINT_FORMAT,
+ first_seq_no_best_window);
+ yaz_log(YLOG_DEBUG, "last_seq_no_best_window=" ZINT_FORMAT,
+ last_seq_no_best_window);
yaz_log(YLOG_DEBUG, "number_best_window=%d", number_best_window);
window_start = (first_seq_no_best_window + last_seq_no_best_window -
window_size) / 2;
for (doc_w = zebra_snippets_list(doc); doc_w; doc_w = doc_w->next)
- if (doc_w->ord == ord && doc_w->reg_type == reg_type
+ if (doc_w->ord == ord
&& doc_w->seqno >= window_start
&& doc_w->seqno < window_start + window_size)
{
int match = 0;
- for (hit_w = zebra_snippets_list(hit); hit_w; hit_w = hit_w->next)
+ for (hit_w = zebra_snippets_list(hit); hit_w;
+ hit_w = hit_w->next)
{
- if (hit_w->ord == ord && hit_w->reg_type == reg_type &&
- hit_w->seqno == doc_w->seqno)
+ if (hit_w->ord == ord && hit_w->seqno == doc_w->seqno)
{
match = 1;
}
}
zebra_snippets_append_match(result, doc_w->seqno,
- doc_w->reg_type, ord,
- doc_w->term, match);
+ ord, doc_w->term, match);
}
}
return result;
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+