-/*
- * Copyright (C) 1994, Index Data I/S
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: lookup.c,v $
- * Revision 1.2 1994-09-16 15:39:14 adam
- * Initial code of lookup - not tested yet.
- *
- * Revision 1.1 1994/08/16 16:26:48 adam
- * Added dict.
- *
- */
+/* 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
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+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
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+*/
+
+
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <assert.h>
-#include <dict.h>
+#include "dict-p.h"
-static char *dict_look (Dict dict, Dict_char *str)
+static char *dict_look (Dict dict, const Dict_char *str, Dict_ptr ptr)
{
- Dict_ptr ptr = 1;
int mid, lo, hi;
int cmp;
void *p;
dict_bf_readp (dict->dbf, ptr, &p);
mid = lo = 0;
hi = DICT_nodir(p)-1;
- indxp = (short*) ((char*) p+DICT_PAGESIZE-sizeof(short));
+ indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short));
while (lo <= hi)
{
mid = (lo+hi)/2;
info = (char*)p + indxp[-mid];
cmp = dict_strcmp((Dict_char*) info, str);
if (!cmp)
- return info+(dict_strlen (info)+1)*sizeof(Dict_char);
+ return info+(dict_strlen ((Dict_char*) info)+1)
+ *sizeof(Dict_char);
}
else
{
{
memcpy (&subptr, info, sizeof(Dict_ptr));
if (*++str == DICT_EOS)
- return info+sizeof(Dict_ptr)+sizeof(Dict_char);
+ {
+ if (info[sizeof(Dict_ptr)+sizeof(Dict_char)])
+ return info+sizeof(Dict_ptr)+sizeof(Dict_char);
+ return NULL;
+ }
else
{
if (subptr == 0)
dict_bf_readp (dict->dbf, ptr, &p);
mid = lo = 0;
hi = DICT_nodir(p)-1;
- indxp = (short*) ((char*) p+DICT_PAGESIZE-sizeof(short));
+ indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short));
continue;
}
}
return NULL;
}
-char *dict_lookup (Dict dict, Dict_char *p)
+char *dict_lookup (Dict dict, const char *p)
{
- if (dict->head.last == 1)
+ dict->no_lookup++;
+ if (!dict->head.root)
return NULL;
- return dict_look (dict, p);
+ return dict_look (dict, (const Dict_char *) p, dict->head.root);
}
-
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */