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
Changed behavior of dict_lookup_grep so that it returns value of function
[idzebra-moved-to-github.git]
/
dict
/
open.c
diff --git
a/dict/open.c
b/dict/open.c
index
79ebe4c
..
a8f241f
100644
(file)
--- a/
dict/open.c
+++ b/
dict/open.c
@@
-1,6
+1,6
@@
-/* $Id: open.c,v 1.21 2004-11-19 10:26:55 heikki Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
- Index Data Aps
+/* $Id: open.c,v 1.26 2006-08-14 10:40:09 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.
@@
-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
+
*/
*/
@@
-26,7
+26,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <string.h>
#include <stdio.h>
#include <string.h>
#include <stdio.h>
-#include <dict.h>
+#include "dict-p.h"
Dict dict_open (BFiles bfs, const char *name, int cache, int rw,
int compact_flag, int page_size)
Dict dict_open (BFiles bfs, const char *name, int cache, int rw,
int compact_flag, int page_size)
@@
-76,7
+76,9
@@
Dict dict_open (BFiles bfs, const char *name, int cache, int rw,
if (strcmp (dict->head.magic_str, DICT_MAGIC))
{
yaz_log (YLOG_WARN, "Bad magic of `%s'", name);
if (strcmp (dict->head.magic_str, DICT_MAGIC))
{
yaz_log (YLOG_WARN, "Bad magic of `%s'", name);
- exit (1);
+ dict_bf_close(dict->dbf);
+ xfree(dict);
+ return 0;
}
if (dict->head.page_size != page_size)
{
}
if (dict->head.page_size != page_size)
{
@@
-103,3
+105,11
@@
int dict_strlen (const Dict_char *s)
{
return strlen((const char *) s);
}
{
return strlen((const char *) s);
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+