Bump year. Change Aps->ApS

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

diff --git a/data1/d1_if.c b/data1/d1_if.c
index 9ac8f3f..1ec54db 100644 (file)
--- a/data1/d1_if.c
+++ b/data1/d1_if.c
@@ -1,6 +1,6 @@
-/* $Id: d1_if.c,v 1.2 2002-10-22 13:19:50 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
-   Index Data Aps
+/* $Id: d1_if.c,v 1.6 2005-01-15 19:38:18 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -25,12 +25,11 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <stdlib.h>
 #include <string.h>
 
-#include <data1.h>
+#include <idzebra/data1.h>
 #include <yaz/log.h>
 
 #include <string.h>
 
-
 /*
  * Search for a token in the supplied string up to the supplied list of stop characters or EOL
  * At the end, return the character causing the break and fill pTokenBuffer with the token string so far
@@ -90,17 +89,17 @@ char *data1_getNodeValue(data1_node* node, char* pTagPath)
             }
             else
             {
-                yaz_log(LOG_WARN,"Attempting to lookup data for tagpath: Child node is not a data node");
+                yaz_log(YLOG_WARN,"Attempting to lookup data for tagpath: Child node is not a data node");
             }
         }
         else
         {
-            yaz_log(LOG_WARN,"Found a node matching the tagpath, but it has no child data nodes");
+            yaz_log(YLOG_WARN,"Found a node matching the tagpath, but it has no child data nodes");
         }
     }
     else
     {
-        yaz_log(LOG_WARN,"Unable to lookup a node on the specified tag path");
+        yaz_log(YLOG_WARN,"Unable to lookup a node on the specified tag path");
     }
 
     return "";
@@ -174,7 +173,7 @@ data1_node *data1_LookupNode(data1_node* node, char* pTagPath)
         }
         else
         {
-            yaz_log(LOG_FATAL,"Node does not end with a ]");
+            yaz_log(YLOG_FATAL,"Node does not end with a ]");
             /* Fatal Error */
             return(NULL);
         }
@@ -197,7 +196,7 @@ data1_node *data1_LookupNode(data1_node* node, char* pTagPath)
         
     }
 
-    yaz_log(LOG_DEBUG,"search node for child like [%d,%d,%s,%d]",iTagType,iTagValue,StringTagVal,iOccurences);
+    yaz_log(YLOG_DEBUG,"search node for child like [%d,%d,%s,%d]",iTagType,iTagValue,StringTagVal,iOccurences);
     
 
     /* OK.. We have extracted tagtype, Value and Occurence, see if we can find a node */
@@ -228,7 +227,7 @@ data1_node *data1_LookupNode(data1_node* node, char* pTagPath)
             }
             else /* Attempt to match real element */
             {
-                yaz_log(LOG_WARN,"Non string tag matching not yet implemented");
+                yaz_log(YLOG_WARN,"Non string tag matching not yet implemented");
             }
         }
         current_child = current_child->next;