X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=data1%2Fd1_handle.c;h=2c5f853a44a903e91e806365676e2d8d6a550806;hb=b81cd7ee4098ebe5770e4f1f7daca5afc9e82956;hp=f990653e158a404de531371fe52e9d3911124322;hpb=b17cf6fd6cad7283033afe18fc346250ec1b2ad3;p=idzebra-moved-to-github.git

diff --git a/data1/d1_handle.c b/data1/d1_handle.c
index f990653..2c5f853 100644
--- a/data1/d1_handle.c
+++ b/data1/d1_handle.c
@@ -1,6 +1,6 @@
-/* $Id: d1_handle.c,v 1.3 2002-12-16 20:27:18 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
-   Index Data Aps
+/* $Id: d1_handle.c,v 1.8 2006-03-29 10:43:23 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -24,7 +24,9 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <stdlib.h>
 
 #include <yaz/log.h>
-#include <data1.h>
+#include <idzebra/data1.h>
+
+#define DATA1_FLAG_XML  1
 
 struct data1_handle_info {
     WRBUF wrbuf;
@@ -41,15 +43,9 @@ struct data1_handle_info {
     int map_len;
 
     NMEM mem;
-    int flags;
 };
 
-data1_handle data1_create (void)
-{
-    return data1_createx(0);
-}
-
-data1_handle data1_createx (int flags)
+data1_handle data1_create(void)
 {
     data1_handle p = (data1_handle)xmalloc (sizeof(*p));
     if (!p)
@@ -64,7 +60,6 @@ data1_handle data1_createx (int flags)
     p->absyn_cache = NULL;
     p->attset_cache = NULL;
     p->mem = nmem_create ();
-    p->flags = flags;
     return p;
 }
 
@@ -116,14 +111,14 @@ WRBUF data1_get_wrbuf (data1_handle dp)
 char **data1_get_read_buf (data1_handle dp, int **lenp)
 {
     *lenp = &dp->read_len;
-    yaz_log (LOG_DEBUG, "data1_get_read_buf lenp=%u", **lenp);
+    yaz_log (YLOG_DEBUG, "data1_get_read_buf lenp=%u", **lenp);
     return &dp->read_buf;
 }
 
 char **data1_get_map_buf (data1_handle dp, int **lenp)
 {
     *lenp = &dp->map_len;
-    yaz_log (LOG_DEBUG, "data1_get_map_buf lenp=%u", **lenp);
+    yaz_log (YLOG_DEBUG, "data1_get_map_buf lenp=%u", **lenp);
     return &dp->map_buf;
 }
 
@@ -162,5 +157,5 @@ FILE *data1_path_fopen (data1_handle dh, const char *file, const char *mode)
 
 int data1_is_xmlmode(data1_handle dh)
 {
-    return dh->flags & DATA1_FLAG_XML;
+    return 1;
 }