Added missing C decl macros for soap.h and srw.h.

[yaz-moved-to-github.git] / include / yaz / oid.h

diff --git a/include/yaz/oid.h b/include/yaz/oid.h
index 0e745ec..f47911f 100644 (file)
--- a/include/yaz/oid.h
+++ b/include/yaz/oid.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995-2000, Index Data.
+ * Copyright (c) 1995-2003, Index Data.
  *
  * Permission to use, copy, modify, distribute, and sell this software and
  * its documentation, in whole or in part, for any purpose, is hereby granted,
@@ -23,7 +23,7 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  *
- * $Id: oid.h,v 1.9 2002-01-29 13:47:33 adam Exp $
+ * $Id: oid.h,v 1.21 2003-11-19 13:47:20 mike Exp $
  */
 
 #ifndef OID_H
@@ -41,7 +41,8 @@ typedef enum oid_proto
     PROTO_Z3950,
     PROTO_SR,
     PROTO_GENERAL,
-    PROTO_WAIS
+    PROTO_WAIS,
+    PROTO_HTTP
 } oid_proto;
 
 typedef enum oid_class
@@ -61,7 +62,8 @@ typedef enum oid_class
     CLASS_VARSET,
     CLASS_SCHEMA,
     CLASS_TAGSET,
-    CLASS_GENERAL
+    CLASS_GENERAL,
+    CLASS_NEGOT
 } oid_class;
 
 typedef enum oid_value
@@ -195,7 +197,30 @@ typedef enum oid_value
     VAL_ADMINSERVICE,
     VAL_HOLDINGS,
     VAL_HUNMARC,
-/* add new types here... */
+    VAL_CHARNEG3,
+    VAL_LIB1,
+
+    VAL_VIRT,
+    VAL_UCS2,
+    VAL_UCS4,
+    VAL_UTF16,
+    VAL_UTF8,
+/* 110 */
+
+    VAL_IDXPATH,
+    VAL_BIB2,
+    VAL_ZEEREX,
+    VAL_CQL,
+    VAL_DBUPDATE1,
+
+    VAL_OCLCUI,
+    VAL_ID_CHARSET,
+    VAL_EXTLITE,
+    VAL_NACSISCATP,
+    VAL_FINMARC2000,
+/* 120 */
+
+    VAL_MARC21FIN,
 
 /* VAL_DYNAMIC must have highest value */
     VAL_DYNAMIC,
@@ -229,6 +254,10 @@ YAZ_EXPORT void oid_trav (void (*func)(struct oident *oidinfo, void *vp),
 
 YAZ_EXPORT void oid_init(void);
 YAZ_EXPORT void oid_exit(void);
+YAZ_EXPORT int *oid_name_to_oid(oid_class oclass, const char *name, int *oid);
+YAZ_EXPORT char *oid_to_dotstring(const int *oid, char *oidbuf);
+YAZ_EXPORT char *oid_name_to_dotstring(oid_class oclass, const char *name,
+                                      char *oidbuf);
 
 YAZ_END_CDECL