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
more info on DOM filter config
[idzebra-moved-to-github.git]
/
dict
/
insert.c
diff --git
a/dict/insert.c
b/dict/insert.c
index
54d4faf
..
aa7a685
100644
(file)
--- a/
dict/insert.c
+++ b/
dict/insert.c
@@
-1,5
+1,5
@@
-/* $Id: insert.c,v 1.28 2006-08-29 13:39:18 adam Exp $
- Copyright (C) 1995-2006
+/* $Id: insert.c,v 1.31 2007-01-15 15:10:15 adam Exp $
+ Copyright (C) 1995-2007
Index Data ApS
This file is part of the Zebra server.
Index Data ApS
This file is part of the Zebra server.
@@
-74,6
+74,7
@@
static int split_page (Dict dict, Dict_ptr ptr, void *p)
Dict_char prev_char = 0;
int best_no = -1, no_current = 1;
Dict_char prev_char = 0;
int best_no = -1, no_current = 1;
+ dict->no_split++;
/* determine splitting char... */
indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short));
for (i = DICT_nodir (p); --i >= 0; --indxp)
/* determine splitting char... */
indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short));
for (i = DICT_nodir (p); --i >= 0; --indxp)
@@
-105,8
+106,7
@@
static int split_page (Dict dict, Dict_ptr ptr, void *p)
}
}
}
}
}
}
- if (best_no < 0) /* we didn't find any tail string entry at all! */
- return -1;
+ assert(best_no >= 0); /* we didn't find any tail string entry at all! */
j = best_indxp - (short*) p;
subptr = new_page (dict, ptr, &subp);
j = best_indxp - (short*) p;
subptr = new_page (dict, ptr, &subp);
@@
-344,7
+344,7
@@
static int dict_ins (Dict dict, const Dict_char *str,
if (split_page (dict, ptr, p))
{
yaz_log (YLOG_FATAL, "Unable to split page %d\n", ptr);
if (split_page (dict, ptr, p))
{
yaz_log (YLOG_FATAL, "Unable to split page %d\n", ptr);
- abort ();
+ assert(0);
}
return dict_ins (dict, str-1, ptr, userlen, userinfo);
}
}
return dict_ins (dict, str-1, ptr, userlen, userinfo);
}
@@
-439,6
+439,7
@@
int dict_insert (Dict dict, const char *str, int userlen, void *userinfo)
{
if (!dict->rw)
return -1;
{
if (!dict->rw)
return -1;
+ dict->no_insert++;
if (!dict->head.root)
{
void *p;
if (!dict->head.root)
{
void *p;