X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Foid.c;h=6ad4477fe283c4a81de46a71ae42a2ca1876dbdb;hb=c39a893dfdae5f792139177132e7e7a70e010aa7;hp=105787101d111eec579bd25019dd3877aaa79a0e;hpb=a45657fa0bf44a3064c4a42aad9d584b54891ecb;p=yaz-moved-to-github.git

diff --git a/util/oid.c b/util/oid.c
index 1057871..6ad4477 100644
--- a/util/oid.c
+++ b/util/oid.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 1995-2002, Index Data
+ * Copyright (c) 1995-2003, Index Data
  * See the file LICENSE for details.
  *
- * $Id: oid.c,v 1.54 2002-04-01 12:27:15 adam Exp $
+ * $Id: oid.c,v 1.60 2003-04-03 21:01:28 mike Exp $
  */
 
 /*
@@ -87,9 +87,18 @@ static oident standard_oids[] =
      "Dan-1"},
     {PROTO_Z3950,   CLASS_ATTSET,  VAL_HOLDINGS,     {3,16,-1},
      "Holdings"},
-
-    {PROTO_Z3950,   CLASS_ATTSET,  VAL_THESAURUS,    {3,1000,81,1,-1},
+    {PROTO_Z3950,   CLASS_ATTSET,  VAL_USMARC,       {3,17,-1},
+     "MARC"},
+    {PROTO_Z3950,   CLASS_ATTSET,  VAL_BIB2,         {3,18,-1},
+     "Bib-2"},
+    {PROTO_Z3950,   CLASS_ATTSET,  VAL_ZEEREX,       {3,19,-1},
+     "ZeeRex"},
+#if 0  /* This is the spawn of Satan.  Use Zthes-1 instead */
+    {PROTO_Z3950,   CLASS_ATTSET,  VAL_THESAURUS,    {3,1000,81,1,-1},     
      "Thesaurus-attset"},
+#endif /*0*/
+    {PROTO_Z3950,   CLASS_ATTSET,  VAL_IDXPATH,      {3,1000,81,2,-1},
+     "IDXPATH"},
     {PROTO_Z3950,   CLASS_DIAGSET, VAL_BIB1,         {4,1,-1},
      "Bib-1"},
     {PROTO_Z3950,   CLASS_DIAGSET, VAL_DIAG1,        {4,2,-1},
@@ -280,11 +289,15 @@ static oident standard_oids[] =
     {PROTO_Z3950,   CLASS_TAGSET,  VAL_CIMI1,        {14,6,-1},
      "CIMI-tagset"},
     {PROTO_Z3950,   CLASS_TAGSET,  VAL_THESAURUS,    {14,1000,81,1,-1},
-     "thesaurus-tagset"},
+     "thesaurus-tagset"},	/* What is this Satan-spawn doing here? */
     {PROTO_Z3950,   CLASS_TAGSET,  VAL_EXPLAIN,      {14,1000,81,2,-1},
      "Explain-tagset"},
+    {PROTO_Z3950,   CLASS_TAGSET,  VAL_ZTHES,        {14,8,-1},
+     "Zthes-tagset"},
     {PROTO_Z3950,   CLASS_NEGOT,   VAL_CHARNEG3,     {15,3,-1},
      "CharSetandLanguageNegotiation-3"},
+    {PROTO_Z3950,   CLASS_USERINFO,VAL_CQL,          {16, 2, -1},
+     "CQL"},
     {PROTO_GENERAL, CLASS_GENERAL, VAL_UCS2,    {1,0,10646,1,0,2,-1},
      "UCS-2"},
     {PROTO_GENERAL, CLASS_GENERAL, VAL_UCS4,    {1,0,10646,1,0,4,-1},
@@ -472,7 +485,7 @@ struct oident *oid_addent (int *oid, enum oid_proto proto,
 	    int i;
 
 	    sprintf (desc_str, "%d", *oid);
-	    for (i = 1; oid[i] >= 0; i++)
+	    for (i = 1; i < 12 && oid[i] >= 0; i++)
 		sprintf (desc_str+strlen(desc_str), ".%d", oid[i]);
 	    desc = desc_str;
 	}