Towards 2.0.3

[yaz-moved-to-github.git] / util / oid.c

diff --git a/util/oid.c b/util/oid.c
index a8c485b..a7f6914 100644 (file)
--- a/util/oid.c
+++ b/util/oid.c
@@ -2,7 +2,7 @@
  * Copyright (c) 1995-2003, Index Data
  * See the file LICENSE for details.
  *
- * $Id: oid.c,v 1.59 2003-01-06 08:20:28 adam Exp $
+ * $Id: oid.c,v 1.62 2003-06-02 12:53:28 adam Exp $
  */
 
 /*
@@ -93,9 +93,10 @@ static oident standard_oids[] =
      "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},
@@ -223,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},
@@ -357,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++;
     }
 }