Generate built-in OIDs from oid.csv.

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

diff --git a/include/yaz/oid_db.h b/include/yaz/oid_db.h
index 094a1f4..ca75db7 100644 (file)
--- a/include/yaz/oid_db.h
+++ b/include/yaz/oid_db.h
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: oid_db.h,v 1.1 2007-04-12 13:52:57 adam Exp $ */
+/* $Id: oid_db.h,v 1.5 2007-04-16 21:53:08 adam Exp $ */
 
 /**
  * \file oid_db.h
@@ -40,7 +40,7 @@
 YAZ_BEGIN_CDECL
 
 /** \brief OID database */
-typedef struct yaz_oid_entry *yaz_oid_db_t;
+typedef struct yaz_oid_db *yaz_oid_db_t;
 
 /** \brief returns standard OID database 
     \retval OID database handle
@@ -124,32 +124,27 @@ YAZ_EXPORT void yaz_oid_trav(yaz_oid_db_t oid_db,
 YAZ_EXPORT
 int yaz_oid_is_iso2709(const int *oid);
 
-#define OID_STR_BIB1 "Bib-1"
-#define OID_STR_DIAG1 "Diag-1"
-#define OID_STR_USMARC "USmarc"
-#define OID_STR_XML "XML"
-#define OID_STR_SOIF "SOIF"
-#define OID_STR_APPLICATION_XML "application-XML"
-#define OID_STR_HTML "html"
-#define OID_STR_GRS1 "GRS-1"
-#define OID_STR_POSTSCRIPT "postscript"
-#define OID_STR_SUTRS "SUTRS"
-#define OID_STR_OPAC "OPAC"
-#define OID_STR_EXPLAIN "Explain"
-#define OID_STR_SUMMARY "Summary"
-#define OID_STR_EXTENDED "Extended"
-#define OID_STR_COOKIE "Cookie" 
-#define OID_STR_PROXY "Proxy" 
-#define OID_STR_CLIENT_IP "Client-IP"
-#define OID_STR_ILL_1 "ISOILL-1"
-#define OID_STR_ADMIN "Admin"
-#define OID_STR_XMLES "XML-ES"
-#define OID_STR_EXT_UPDATE "DB. Update"
-#define OID_STR_ITEMORDER "Item order"
-#define OID_STR_USERINFO_1 "UserInfo-1"
-#define OID_STR_ID_CHARSET "ID-Charset"
-#define OID_STR_CHARNEG_3 "CharSetandLanguageNegotiation-3"
-#define OID_STR_CHARNEG_4 "CharSetandLanguageNegotiation-4"
+/** \brief adds new OID entry to database
+    \param oid_db database
+    \param oclass OID class
+    \param name name of OID
+    \param new_oid OID value (raw OID)
+    \retval 0 OID added
+    \retval -1 OID name+oclass already exists
+*/
+YAZ_EXPORT
+int yaz_oid_add(yaz_oid_db_t oid_db, int oclass, const char *name,
+                const int *new_oid);
+
+struct yaz_oid_entry {
+    int oclass;
+    const int *oid;
+    char *name;
+};
+
+#define Z3950_PREFIX 1, 2, 840, 10003
+
+#include <yaz/oid_std.h>
 
 YAZ_END_CDECL