X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=data1%2Fd1_if.c;h=741bf4156231eaf2132eec0ef8a4d5c80260f4ea;hp=9ac8f3f2ac6d9b1535b919b23fb1aafa0e2a225c;hb=ecb3935e78cd9bcfdebafdee0834cfb1060d7b5e;hpb=02266b68e2e2c86d8a8467ee56721926b365d2d0

diff --git a/data1/d1_if.c b/data1/d1_if.c
index 9ac8f3f..741bf41 100644
--- 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.8 2006-05-10 08:13: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;
@@ -247,14 +246,9 @@ data1_node *data1_LookupNode(data1_node* node, char* pTagPath)
 }
 
 /**
-
-data1_CountOccurences
-
-Count the number of occurences of the last instance on a tagpath.
-
-@param data1_node* node : The root of the tree we wish to look for occurences in
-@param const char* pTagPath : The tagpath we want to count the occurences of... 
-
+   \brief Count the number of occurences of the last instance on a tagpath.
+   \param node : The root of the tree we wish to look for occurences in
+   \param pTagPath : The tagpath we want to count the occurences of... 
 */
 int data1_CountOccurences(data1_node* node, char* pTagPath)
 {
@@ -298,3 +292,11 @@ int data1_CountOccurences(data1_node* node, char* pTagPath)
 
     return iRetVal;
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+