X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Foid.c;h=7545112b1d83ded5672ab374a221f70ce373c3f7;hb=4b3d1e197d75fcb2607be8d86d244f20c4180000;hp=44ce5bb189d8b295028aef07818e6642c240a7ce;hpb=94c77ca831e55b3dee31184347f25dd0583085d2;p=yaz-moved-to-github.git

diff --git a/util/oid.c b/util/oid.c
index 44ce5bb..7545112 100644
--- 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.65 2003-07-23 12:07:30 mike Exp $
+ * $Id: oid.c,v 1.67 2003-09-02 12:12:13 adam Exp $
  */
 
 /*
@@ -234,8 +234,7 @@ static oident standard_oids[] =
      "exp. spec."},
     {PROTO_Z3950,   CLASS_EXTSERV, VAL_EXPORTINV,    {9,7,-1},
      "exp. inv."},
-    /* ### Next line should be {9,1000,81,1,-1} */
-    {PROTO_Z3950,   CLASS_EXTSERV, VAL_ADMINSERVICE, {9,81,1,-1},
+    {PROTO_Z3950,   CLASS_EXTSERV, VAL_ADMINSERVICE, {9,1000,81,1,-1},
      "Admin"},
     {PROTO_Z3950,   CLASS_USERINFO,VAL_SEARCHRES1,   {10,1,-1},
      "searchResult-1"},
@@ -299,8 +298,10 @@ static oident standard_oids[] =
      "Zthes-tagset"},
     {PROTO_Z3950,   CLASS_NEGOT,   VAL_CHARNEG3,     {15,3,-1},
      "CharSetandLanguageNegotiation-3"},
+    {PROTO_Z3950,   CLASS_NEGOT,   VAL_ID_CHARSET,   {15,1000,81,1,-1},
+     "ID-Charset" },
     {PROTO_Z3950,   CLASS_USERINFO,VAL_CQL,          {16, 2, -1},
-     "OCLC-userInfo"},
+     "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},
@@ -310,7 +311,7 @@ static oident standard_oids[] =
     {PROTO_GENERAL, CLASS_GENERAL, VAL_UTF8,    {1,0,10646,1,0,8,-1},
      "UTF-8"},
     {PROTO_Z3950,   CLASS_USERINFO,VAL_OCLCUI,  {10, 1000, 17, 1, -1},
-     "CQL"},
+     "OCLC-userInfo"},
     {PROTO_NOP,     CLASS_NOP,     VAL_NOP,       {-1},        0          }
 };