projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added support for specification of staticrank for grs-class of filters.
[idzebra-moved-to-github.git]
/
data1
/
d1_if.c
diff --git
a/data1/d1_if.c
b/data1/d1_if.c
index
a58ce5b
..
1ab0d64
100644
(file)
--- a/
data1/d1_if.c
+++ b/
data1/d1_if.c
@@
-1,6
+1,6
@@
-/* $Id: d1_if.c,v 1.3 2004-09-28 10:15:03 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
- Index Data Aps
+/* $Id: d1_if.c,v 1.9 2006-08-14 10:40:06 adam Exp $
+ Copyright (C) 1995-2006
+ Index Data ApS
This file is part of the Zebra server.
This file is part of the Zebra server.
@@
-15,9
+15,9
@@
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
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.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <stdio.h>
*/
#include <stdio.h>
@@
-89,17
+89,17
@@
char *data1_getNodeValue(data1_node* node, char* pTagPath)
}
else
{
}
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
{
}
}
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
{
}
}
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 "";
}
return "";
@@
-173,7
+173,7
@@
data1_node *data1_LookupNode(data1_node* node, char* pTagPath)
}
else
{
}
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);
}
/* Fatal Error */
return(NULL);
}
@@
-196,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 */
/* OK.. We have extracted tagtype, Value and Occurence, see if we can find a node */
@@
-227,7
+227,7
@@
data1_node *data1_LookupNode(data1_node* node, char* pTagPath)
}
else /* Attempt to match real element */
{
}
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;
}
}
current_child = current_child->next;
@@
-246,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)
{
*/
int data1_CountOccurences(data1_node* node, char* pTagPath)
{
@@
-297,3
+292,11
@@
int data1_CountOccurences(data1_node* node, char* pTagPath)
return iRetVal;
}
return iRetVal;
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+