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
removed documentation of non-working 'insert', 'update' 'delete' functionality in...
[idzebra-moved-to-github.git]
/
dict
/
insert.c
diff --git
a/dict/insert.c
b/dict/insert.c
index
955a2cd
..
aa7a685
100644
(file)
--- a/
dict/insert.c
+++ b/
dict/insert.c
@@
-1,6
+1,6
@@
-/* $Id: insert.c,v 1.22 2002-08-02 19:26:55 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
- Index Data Aps
+/* $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.
This file is part of the Zebra server.
@@
-15,9
+15,9
@@
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
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
+
*/
*/
@@
-27,7
+27,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <stdio.h>
#include <assert.h>
#include <stdio.h>
#include <assert.h>
-#include <dict.h>
+#include "dict-p.h"
#define CHECK 0
#define CHECK 0
@@
-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);
@@
-343,8
+343,8
@@
static int dict_ins (Dict dict, const Dict_char *str,
}
if (split_page (dict, ptr, p))
{
}
if (split_page (dict, ptr, p))
{
- logf (LOG_FATAL, "Unable to split page %d\n", ptr);
- abort ();
+ yaz_log (YLOG_FATAL, "Unable to split page %d\n", ptr);
+ assert(0);
}
return dict_ins (dict, str-1, ptr, userlen, userinfo);
}
}
return dict_ins (dict, str-1, ptr, userlen, userinfo);
}
@@
-437,15
+437,25
@@
static int dict_ins (Dict dict, const Dict_char *str,
int dict_insert (Dict dict, const char *str, int userlen, void *userinfo)
{
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;
if (!dict->head.root)
{
void *p;
- if (dict->rw)
- dict->head.root = new_page (dict, 0, &p);
+ dict->head.root = new_page (dict, 0, &p);
if (!dict->head.root)
if (!dict->head.root)
- return 0;
+ return -1;
}
return dict_ins (dict, (const Dict_char *) str, dict->head.root,
userlen, userinfo);
}
}
return dict_ins (dict, (const Dict_char *) str, dict->head.root,
userlen, userinfo);
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+