using yaz/log.h again

[idzebra-moved-to-github.git] / data1 / d1_handle.c

diff --git a/data1/d1_handle.c b/data1/d1_handle.c
index 7a37eac..4b49d2e 100644 (file)
--- a/data1/d1_handle.c
+++ b/data1/d1_handle.c
@@ -1,15 +1,30 @@
-/*
- * Copyright (c) 1995-2002, Index Data.
- * See the file LICENSE for details.
- *
- * $Id: d1_handle.c,v 1.1 2002-10-22 12:53:33 adam Exp $
- */
+/* $Id: d1_handle.c,v 1.6 2004-12-13 20:51:28 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+   Index Data Aps
+
+This file is part of the Zebra server.
+
+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 Zebra; see the file LICENSE.zebra.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+*/
 
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <yaz/log.h>
-#include <data1.h>
+#include <idzebra/data1.h>
 
 struct data1_handle_info {
     WRBUF wrbuf;
@@ -72,6 +87,13 @@ void data1_destroy (data1_handle dh)
 {
     if (!dh)
        return;
+    
+    /* *ostrich*
+       We need to destroy DFAs, in xp_element (xelm) definitions 
+       pop, 2002-12-13
+    */
+    data1_absyn_destroy(dh);
+
     wrbuf_free (dh->wrbuf, 1);
     if (dh->tab_path)
        xfree (dh->tab_path);
@@ -94,14 +116,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;
 }