X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=dict%2Finsert.c;h=ab7613f89a01171aa7fe7bcb251529813b3154b6;hb=0ef68e6e54cfd7a91a28ee3b1f305924ac34e787;hp=54d4faf1d99615036b2de94ee37bcf8d78128d86;hpb=81fea315c5f745053a8afdca84d45e4ffae6c27c;p=idzebra-moved-to-github.git diff --git a/dict/insert.c b/dict/insert.c index 54d4faf..ab7613f 100644 --- a/dict/insert.c +++ b/dict/insert.c @@ -1,8 +1,5 @@ -/* $Id: insert.c,v 1.28 2006-08-29 13:39:18 adam Exp $ - Copyright (C) 1995-2006 - Index Data ApS - -This file is part of the Zebra server. +/* This file is part of the Zebra server. + Copyright (C) 1995-2008 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 @@ -74,6 +71,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->no_split++; /* determine splitting char... */ indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short)); for (i = DICT_nodir (p); --i >= 0; --indxp) @@ -105,8 +103,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); @@ -344,7 +341,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); - abort (); + assert(0); } return dict_ins (dict, str-1, ptr, userlen, userinfo); } @@ -439,6 +436,7 @@ int dict_insert (Dict dict, const char *str, int userlen, void *userinfo) { if (!dict->rw) return -1; + dict->no_insert++; if (!dict->head.root) { void *p;