Improved installation. Moved header files to include/yaz.

[yaz-moved-to-github.git] / retrieval / d1_handle.c

diff --git a/retrieval/d1_handle.c b/retrieval/d1_handle.c
index 062b4ad..966eaae 100644 (file)
--- a/retrieval/d1_handle.c
+++ b/retrieval/d1_handle.c
@@ -1,10 +1,24 @@
 /*
- * Copyright (c) 1995-1997, Index Data.
+ * Copyright (c) 1995-1999, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: d1_handle.c,v $
- * Revision 1.2  1997-09-30 11:50:04  adam
+ * Revision 1.6  1999-11-30 13:47:12  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.5  1999/08/27 09:40:32  adam
+ * Renamed logf function to yaz_log. Removed VC++ project files.
+ *
+ * Revision 1.4  1998/05/18 13:07:05  adam
+ * Changed the way attribute sets are handled by the retriaval module.
+ * Extended Explain conversion / schema.
+ * Modified server and client to work with ASN.1 compiled protocol handlers.
+ *
+ * Revision 1.3  1998/02/11 11:53:35  adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.2  1997/09/30 11:50:04  adam
  * Added handler data1_get_map_buf that is used by data1_nodetomarc.
  *
  * Revision 1.1  1997/09/17 12:28:24  adam
@@ -15,8 +29,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <log.h>
-#include <data1.h>
+#include <yaz/log.h>
+#include <yaz/data1.h>
 
 struct data1_handle_info {
     WRBUF wrbuf;
@@ -26,6 +40,7 @@ struct data1_handle_info {
     int read_len;
 
     data1_absyn_cache absyn_cache;
+    data1_attset_cache attset_cache;
 
     char *map_buf;
     int map_len;
@@ -35,7 +50,7 @@ struct data1_handle_info {
 
 data1_handle data1_create (void)
 {
-    data1_handle p = xmalloc (sizeof(*p));
+    data1_handle p = (data1_handle)xmalloc (sizeof(*p));
     if (!p)
        return NULL;
     p->tab_path = NULL;
@@ -45,6 +60,7 @@ data1_handle data1_create (void)
     p->map_buf = NULL;
     p->map_len = 0;
     p->absyn_cache = NULL;
+    p->attset_cache = NULL;
     p->mem = nmem_create ();
     return p;
 }
@@ -59,6 +75,11 @@ data1_absyn_cache *data1_absyn_cache_get (data1_handle dh)
     return &dh->absyn_cache;
 }
 
+data1_attset_cache *data1_attset_cache_get (data1_handle dh)
+{
+    return &dh->attset_cache;
+}
+
 void data1_destroy (data1_handle dh)
 {
     if (!dh)
@@ -83,14 +104,14 @@ WRBUF data1_get_wrbuf (data1_handle dp)
 char **data1_get_read_buf (data1_handle dp, int **lenp)
 {
     *lenp = &dp->read_len;
-    logf (LOG_DEBUG, "data1_get_read_buf lenp=%u", **lenp);
+    yaz_log (LOG_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;
-    logf (LOG_DEBUG, "data1_get_map_buf lenp=%u", **lenp);
+    yaz_log (LOG_DEBUG, "data1_get_map_buf lenp=%u", **lenp);
     return &dp->map_buf;
 }
 
@@ -103,7 +124,7 @@ void data1_set_tabpath (data1_handle dp, const char *p)
     }
     if (p)
     {
-        dp->tab_path = xmalloc (strlen(p)+1);
+        dp->tab_path = (char *)xmalloc (strlen(p)+1);
         strcpy (dp->tab_path, p);
     }
 }