X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=util%2Foid.c;h=a7f6914db63c82bad19d988bf4f806141185ef86;hb=4c6462484342ee50f5d26f9fb3a625481b3d5bba;hp=cbbc81f52f0dfe8825b331fc70c1a569e5244cd1;hpb=836f6f959c8bdde0c0ecc6317ba8d274d868e9e0;p=yaz-moved-to-github.git

diff --git a/util/oid.c b/util/oid.c
index cbbc81f..a7f6914 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.56 2002-08-26 09:25:56 adam Exp $
+ * $Id: oid.c,v 1.62 2003-06-02 12:53:28 adam Exp $
  */
 
 /*
@@ -87,9 +87,16 @@ static oident standard_oids[] =
      "Dan-1"},
     {PROTO_Z3950,   CLASS_ATTSET,  VAL_HOLDINGS,     {3,16,-1},
      "Holdings"},
-
+    {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},
@@ -217,8 +224,10 @@ static oident standard_oids[] =
      "Per'd query"},
     {PROTO_Z3950,   CLASS_EXTSERV, VAL_ITEMORDER,    {9,4,-1},
      "Item order"},
-    {PROTO_Z3950,   CLASS_EXTSERV, VAL_DBUPDATE0,    {9,5,1,-1},
-     "DB. Update (old version)"},
+    {PROTO_Z3950,   CLASS_EXTSERV, VAL_DBUPDATE0,    {9,5,-1},
+     "DB. Update (first version)"},
+    {PROTO_Z3950,   CLASS_EXTSERV, VAL_DBUPDATE1,    {9,5,1,-1},
+     "DB. Update (second version)"},
     {PROTO_Z3950,   CLASS_EXTSERV, VAL_DBUPDATE,     {9,5,1,1,-1},
      "DB. Update"},
     {PROTO_Z3950,   CLASS_EXTSERV, VAL_EXPORTSPEC,   {9,6,-1},
@@ -282,11 +291,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},
@@ -347,14 +360,14 @@ static int match_prefix(int *look, int *prefix)
     return 0;
 }
 
-void oid_transfer (struct oident *oident)
+void oid_transfer (struct oident *oidentp)
 {
-    while (*oident->oidsuffix >= 0)
+    while (*oidentp->oidsuffix >= 0)
     {
-	oid_addent (oident->oidsuffix, oident->proto,
-		    oident->oclass,
-		    oident->desc, oident->value);
-	oident++;
+	oid_addent (oidentp->oidsuffix, oidentp->proto,
+		    oidentp->oclass,
+		    oidentp->desc, oidentp->value);
+	oidentp++;
     }
 }