projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
For the CQL parser, make boolean node names lowercase.
[yaz-moved-to-github.git]
/
src
/
z3950oid.c
diff --git
a/src/z3950oid.c
b/src/z3950oid.c
index
db55135
..
1da2652
100644
(file)
--- a/
src/z3950oid.c
+++ b/
src/z3950oid.c
@@
-1,10
+1,14
@@
/*
/*
- * Copyright (C) 1995-2005, Index Data ApS
+ * Copyright (C) 1995-2006, Index Data ApS
* See the file LICENSE for details.
*
* See the file LICENSE for details.
*
- * $Id: z3950oid.c,v 1.3 2005-06-24 19:56:52 adam Exp $
+ * $Id: z3950oid.c,v 1.5 2006-04-20 20:50:51 adam Exp $
*/
*/
+/** \file z3950oid.c
+ \brief Z3950 OID conversion utilities
+*/
+
#if HAVE_CONFIG_H
#include <config.h>
#endif
#if HAVE_CONFIG_H
#include <config.h>
#endif
@@
-21,7
+25,7
@@
Odr_oid *yaz_oidval_to_z3950oid (ODR o, int oid_class, int oid_value)
ident.value = (enum oid_value) oid_value;
if (ident.value == VAL_NONE)
ident.value = (enum oid_value) oid_value;
if (ident.value == VAL_NONE)
- return 0;
+ return 0;
return odr_oiddup(o, oid_ent_to_oid(&ident, oid));
}
return odr_oiddup(o, oid_ent_to_oid(&ident, oid));
}
@@
-36,7
+40,7
@@
Odr_oid *yaz_str_to_z3950oid (ODR o, int oid_class, const char *str)
ident.value = oid_getvalbyname(str);
if (ident.value == VAL_NONE)
ident.value = oid_getvalbyname(str);
if (ident.value == VAL_NONE)
- return 0;
+ return 0;
return odr_oiddup(o, oid_ent_to_oid(&ident, oid));
}
return odr_oiddup(o, oid_ent_to_oid(&ident, oid));
}
@@
-46,7
+50,7
@@
const char *yaz_z3950oid_to_str (Odr_oid *oid, int *oid_class)
struct oident *ident = oid_getentbyoid(oid);
if (!ident || ident->value == VAL_NONE)
struct oident *ident = oid_getentbyoid(oid);
if (!ident || ident->value == VAL_NONE)
- return 0;
+ return 0;
*oid_class = ident->oclass;
return ident->desc;
}
*oid_class = ident->oclass;
return ident->desc;
}
@@
-70,3
+74,11
@@
const char* yaz_z3950_oid_value_to_str(oid_value ov, oid_class oc)
return "";
}
}
return "";
}
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+