New upstream version 6.1.20160908

author: Andreas Tille <tille@debian.org> 2016-12-01 16:38:47 +0100
committer: Andreas Tille <tille@debian.org> 2016-12-01 16:38:47 +0100
commit: 9c3449b3f79213138ad1d315580af98e89d8e1b6 (patch)
tree: 157d2da8682da6cfb9ee28db762c9c94dcdaa98c /network
parent: be323245ea77f0e457e3d42c83b58a82f67ca0f2 (diff)
19 files changed, 993 insertions, 847 deletions
diff --git a/network/id1arch/idfetch.c b/network/id1arch/idfetch.c
index 2a6f6aef..19d31120 100644
--- a/network/id1arch/idfetch.c
+++ b/network/id1arch/idfetch.c
@@ -44,6 +44,8 @@
 #include <ffprint.h>
 #include <ent2api.h>
 
+#include <connect/ncbi_gnutls.h>
+
 static Boolean ProcessOneDocSum (Int4 num, Int4Ptr uids);
 static void EntrezQuery(char *query);
 
@@ -179,6 +181,8 @@ Int2 Main()
                   "/entrez/utils/entrez2server.fcgi");
   */
 
+  SOCK_SetupSSL(NcbiSetupGnuTls);
+
   if(myargs[entrezqueryarg].strvalue || myargs[entrezqueryfilearg].strvalue)
   {
     if(! myargs[dbarg].strvalue ||
@@ -770,6 +774,26 @@ static Entrez2ReplyPtr MyEntrezSynchronousQuery(Entrez2RequestPtr e2rq)
   return NULL;
 }
 
+static Entrez2DocsumListPtr 
+s_GetDocsumList(Int4 num, Int4Ptr uids, const char* db)
+{
+  Entrez2DocsumListPtr  e2dl;
+  Entrez2RequestPtr     e2rq;
+  Entrez2ReplyPtr       e2ry;
+
+  e2rq = EntrezCreateDocSumRequest (db, 0, num, uids, NULL);
+  if (e2rq == NULL) return NULL;
+
+  e2ry = MyEntrezSynchronousQuery (e2rq);
+  e2rq = Entrez2RequestFree(e2rq);
+  e2dl = EntrezExtractDocsumReply (e2ry);
+
+  if (e2dl && (e2dl->count == 0 || e2dl->list == NULL))
+     e2dl = Entrez2DocsumListFree (e2dl);
+
+  return e2dl;
+}
+
 static Boolean ProcessOneDocSum (Int4 num, Int4Ptr uids)
 
 {
@@ -778,19 +802,19 @@ static Boolean ProcessOneDocSum (Int4 num, Int4Ptr uids)
   Entrez2RequestPtr     e2rq;
   Entrez2ReplyPtr       e2ry;
   Entrez2DocsumDataPtr  e2ddp;
-  CharPtr db;
   Boolean result;
 
   if(num == 0)
     return TRUE;
 
-  db = strcmp(myargs[dbarg].strvalue, "n") == 0 ? "Nucleotide" : "Protein";
-  e2rq = EntrezCreateDocSumRequest (db, 0, num, uids, NULL);
-  if (e2rq == NULL) return FALSE;
-
-  e2ry = MyEntrezSynchronousQuery (e2rq);
-  e2rq = Entrez2RequestFree(e2rq);
-  e2dl = EntrezExtractDocsumReply (e2ry);
+  if (strcmp(myargs[dbarg].strvalue, "p") == 0) {
+     e2dl = s_GetDocsumList(num, uids, "Protein");
+  } else { 
+     if ((e2dl = s_GetDocsumList(num, uids, "NucCore")) == NULL) {
+        if ((e2dl = s_GetDocsumList(num, uids, "NucEst")) == NULL)
+           e2dl = s_GetDocsumList(num, uids, "NucGss");
+     }
+  }
 
   if (e2dl == NULL)
     return FALSE;
diff --git a/network/id2arch/id2.asn b/network/id2arch/id2.asn
index 1f51ee3c..3d18d444 100644
--- a/network/id2arch/id2.asn
+++ b/network/id2arch/id2.asn
@@ -1,4 +1,4 @@
---$Revision: 1.23 $
+--$Revision: 1.27 $
 --********************************************************************
 --
 --  Network Id server network access
@@ -16,6 +16,8 @@
 NCBI-ID2Access DEFINITIONS ::=
 BEGIN
 
+EXPORTS ID2-Blob-State;
+
 IMPORTS Seq-id, Seq-loc                                 FROM NCBI-Seqloc
         ID2S-Chunk-Id, ID2S-Seq-annot-Info              FROM NCBI-Seq-split;
 
@@ -72,8 +74,14 @@ ID2-Request-Get-Seq-id ::= SEQUENCE {
                 all     (127),  -- return all qualified Seq-ids of the sequence
                 label   (128),  -- return a sequence string label as string
                                 -- in general id with db "LABEL"
-                taxid   (256)   -- return a sequence taxonomy ID as integer
+                taxid   (256),  -- return a sequence taxonomy ID as integer
                                 -- in general id with db "TAXID"
+                hash    (512),  -- return a sequence hash as integer
+                                -- in general id with db "HASH"
+                seq-length (1024), -- return a sequence Seq-inst.length as int
+                                -- in general id with db "Seq-inst.length"
+                seq-mol    (2048)  -- return a sequence Seq-inst.mol as int
+                                -- in general id with db "Seq-inst.mol"
         } DEFAULT any
 }
 
@@ -292,7 +300,9 @@ ID2-Reply-Get-Seq-id ::= SEQUENCE {
         end-of-reply    NULL OPTIONAL
 }
 
-
+-- Bit numbers for different blob states,
+-- used in blob-state fields of several replies.
+-- For example, dead & protected blob has blob-state 24 - 3rd and 4th bits set.
 ID2-Blob-State ::= ENUMERATED {
         live            (0),
         suppressed-temp (1),
@@ -322,7 +332,7 @@ ID2-Reply-Get-Blob-Id ::= SEQUENCE {
         -- this Blob-id is the last one in the request
         end-of-reply    NULL OPTIONAL,
 
-        -- state of the blob, 0 or missing means regular live data
+        -- state bits of the blob, 0 or missing means regular live data
         blob-state      INTEGER OPTIONAL
 }
 
@@ -347,7 +357,10 @@ ID2-Reply-Get-Blob ::= SEQUENCE {
 
         -- whole blob or blob skeleton
         -- not set if error occurred
-        data            ID2-Reply-Data OPTIONAL
+        data            ID2-Reply-Data OPTIONAL,
+
+        -- state bits of the blob, 0 or missing means regular live data
+        blob-state      INTEGER OPTIONAL
 }
 
 
@@ -360,7 +373,10 @@ ID2S-Reply-Get-Split-Info ::= SEQUENCE {
 
         -- blob split info
         -- not set if error occurred
-        data            ID2-Reply-Data OPTIONAL
+        data            ID2-Reply-Data OPTIONAL,
+
+        -- state bits of the blob, 0 or missing means regular live data
+        blob-state      INTEGER OPTIONAL
 }
 
 
diff --git a/network/id2arch/id2.c b/network/id2arch/id2.c
index a0f8cbb0..c04c1c10 100644
--- a/network/id2arch/id2.c
+++ b/network/id2arch/id2.c
@@ -2972,7 +2972,7 @@ ID2ReplyAsnWrite(ID2ReplyPtr ptr, AsnIoPtr aip, AsnTypePtr orig)
          goto erret;
       }
    }
-   if (ptr -> discard != -1) {
+   if (ptr -> discard != (Uint2)-1) {
       av.intvalue = ptr -> discard;
       retval = AsnWrite(aip, ID2_REPLY_discard,  &av);
    }
@@ -3793,8 +3793,10 @@ ID2ReplyGetBlobIdAsnWrite(ID2ReplyGetBlobIdPtr ptr, AsnIoPtr aip, AsnTypePtr ori
       av.boolvalue = ptr -> end_of_reply;
       retval = AsnWrite(aip, REPLY_GET_BLOB_ID_end_of_reply,  &av);
    }
-   av.intvalue = ptr -> blob_state;
-   retval = AsnWrite(aip, REPLY_GET_BLOB_ID_blob_state,  &av);
+   if (ptr -> blob_state != 0) {
+       av.intvalue = ptr -> blob_state;
+       retval = AsnWrite(aip, REPLY_GET_BLOB_ID_blob_state,  &av);
+   }
    if (! AsnCloseStruct(aip, atp, (Pointer)ptr)) {
       goto erret;
    }
@@ -4080,6 +4082,13 @@ ID2ReplyGetBlobAsnRead(AsnIoPtr aip, AsnTypePtr orig)
       }
       atp = AsnReadId(aip,amp, atp);
    }
+   if (atp == ID2_REPLY_GET_BLOB_blob_state) {
+      if ( AsnReadVal(aip, atp, &av) <= 0) {
+         goto erret;
+      }
+      ptr -> blob_state = av.intvalue;
+      atp = AsnReadId(aip,amp, atp);
+   }
 
    if (AsnReadVal(aip, atp, &av) <= 0) {
       goto erret;
@@ -4143,6 +4152,10 @@ ID2ReplyGetBlobAsnWrite(ID2ReplyGetBlobPtr ptr, AsnIoPtr aip, AsnTypePtr orig)
          goto erret;
       }
    }
+   if (ptr -> blob_state != 0) {
+       av.intvalue = ptr -> blob_state;
+       retval = AsnWrite(aip, ID2_REPLY_GET_BLOB_blob_state,  &av);
+   }
    if (! AsnCloseStruct(aip, atp, (Pointer)ptr)) {
       goto erret;
    }
@@ -4445,6 +4458,13 @@ ID2SReplyGetSplitInfoAsnRead(AsnIoPtr aip, AsnTypePtr orig)
       }
       atp = AsnReadId(aip,amp, atp);
    }
+   if (atp == GET_SPLIT_INFO_blob_state) {
+      if ( AsnReadVal(aip, atp, &av) <= 0) {
+         goto erret;
+      }
+      ptr -> blob_state = av.intvalue;
+      atp = AsnReadId(aip,amp, atp);
+   }
 
    if (AsnReadVal(aip, atp, &av) <= 0) {
       goto erret;
@@ -4508,6 +4528,10 @@ ID2SReplyGetSplitInfoAsnWrite(ID2SReplyGetSplitInfoPtr ptr, AsnIoPtr aip, AsnTyp
          goto erret;
       }
    }
+   if (ptr -> blob_state != 0) {
+       av.intvalue = ptr -> blob_state;
+       retval = AsnWrite(aip, GET_SPLIT_INFO_blob_state,  &av);
+   }
    if (! AsnCloseStruct(aip, atp, (Pointer)ptr)) {
       goto erret;
    }
diff --git a/network/id2arch/id2.h b/network/id2arch/id2.h
index 2092afb5..a2bc9ebc 100644
--- a/network/id2arch/id2.h
+++ b/network/id2arch/id2.h
@@ -9,27 +9,36 @@
 #include <asn.h>
 #endif
 
-static char * asnfilename = "id2.h20";
-static AsnValxNode avnx[63] = {
-    {20,"set-value" ,1,0.0,&avnx[1] } ,
-    {20,"get-value" ,2,0.0,&avnx[2] } ,
-    {20,"force-value" ,3,0.0,&avnx[3] } ,
+static char * asnfilename = "id2.h26";
+static AsnValxNode avnx[66] = {
+    {20,"live" ,0,0.0,&avnx[1] } ,
+    {20,"suppressed-temp" ,1,0.0,&avnx[2] } ,
+    {20,"suppressed" ,2,0.0,&avnx[3] } ,
+    {20,"dead" ,3,0.0,&avnx[4] } ,
+    {20,"protected" ,4,0.0,&avnx[5] } ,
+    {20,"withdrawn" ,5,0.0,NULL } ,
+    {20,"set-value" ,1,0.0,&avnx[7] } ,
+    {20,"get-value" ,2,0.0,&avnx[8] } ,
+    {20,"force-value" ,3,0.0,&avnx[9] } ,
     {20,"use-package" ,4,0.0,NULL } ,
     {3,NULL,1,0.0,NULL } ,
-    {20,"any" ,0,0.0,&avnx[6] } ,
-    {20,"gi" ,1,0.0,&avnx[7] } ,
-    {20,"text" ,2,0.0,&avnx[8] } ,
-    {20,"general" ,4,0.0,&avnx[9] } ,
-    {20,"all" ,127,0.0,NULL } ,
+    {20,"any" ,0,0.0,&avnx[12] } ,
+    {20,"gi" ,1,0.0,&avnx[13] } ,
+    {20,"text" ,2,0.0,&avnx[14] } ,
+    {20,"general" ,4,0.0,&avnx[15] } ,
+    {20,"all" ,127,0.0,&avnx[16] } ,
+    {20,"label" ,128,0.0,&avnx[17] } ,
+    {20,"taxid" ,256,0.0,&avnx[18] } ,
+    {20,"hash" ,512,0.0,NULL } ,
     {3,NULL,0,0.0,NULL } ,
-    {20,"main" ,0,0.0,&avnx[12] } ,
-    {20,"snp" ,1,0.0,&avnx[13] } ,
-    {20,"snp-graph" ,4,0.0,&avnx[14] } ,
-    {20,"cdd" ,8,0.0,&avnx[15] } ,
-    {20,"mgc" ,16,0.0,&avnx[16] } ,
-    {20,"hprd" ,32,0.0,&avnx[17] } ,
-    {20,"sts" ,64,0.0,&avnx[18] } ,
-    {20,"trna" ,128,0.0,&avnx[19] } ,
+    {20,"main" ,0,0.0,&avnx[21] } ,
+    {20,"snp" ,1,0.0,&avnx[22] } ,
+    {20,"snp-graph" ,4,0.0,&avnx[23] } ,
+    {20,"cdd" ,8,0.0,&avnx[24] } ,
+    {20,"mgc" ,16,0.0,&avnx[25] } ,
+    {20,"hprd" ,32,0.0,&avnx[26] } ,
+    {20,"sts" ,64,0.0,&avnx[27] } ,
+    {20,"trna" ,128,0.0,&avnx[28] } ,
     {20,"exon" ,512,0.0,NULL } ,
     {3,NULL,0,0.0,NULL } ,
     {3,NULL,1,0.0,NULL } ,
@@ -37,196 +46,192 @@ static AsnValxNode avnx[63] = {
     {3,NULL,0,0.0,NULL } ,
     {3,NULL,0,0.0,NULL } ,
     {3,NULL,0,0.0,NULL } ,
-    {20,"none" ,0,0.0,&avnx[27] } ,
-    {20,"seq-map" ,1,0.0,&avnx[28] } ,
+    {20,"none" ,0,0.0,&avnx[36] } ,
+    {20,"seq-map" ,1,0.0,&avnx[37] } ,
     {20,"seq-data" ,2,0.0,NULL } ,
     {3,NULL,0,0.0,NULL } ,
-    {20,"warning" ,1,0.0,&avnx[31] } ,
-    {20,"failed-command" ,2,0.0,&avnx[32] } ,
-    {20,"failed-connection" ,3,0.0,&avnx[33] } ,
-    {20,"failed-server" ,4,0.0,&avnx[34] } ,
-    {20,"no-data" ,5,0.0,&avnx[35] } ,
-    {20,"restricted-data" ,6,0.0,&avnx[36] } ,
-    {20,"unsupported-command" ,7,0.0,&avnx[37] } ,
+    {20,"warning" ,1,0.0,&avnx[40] } ,
+    {20,"failed-command" ,2,0.0,&avnx[41] } ,
+    {20,"failed-connection" ,3,0.0,&avnx[42] } ,
+    {20,"failed-server" ,4,0.0,&avnx[43] } ,
+    {20,"no-data" ,5,0.0,&avnx[44] } ,
+    {20,"restricted-data" ,6,0.0,&avnx[45] } ,
+    {20,"unsupported-command" ,7,0.0,&avnx[46] } ,
     {20,"invalid-arguments" ,8,0.0,NULL } ,
     {3,NULL,0,0.0,NULL } ,
-    {20,"live" ,0,0.0,&avnx[40] } ,
-    {20,"suppressed-temp" ,1,0.0,&avnx[41] } ,
-    {20,"suppressed" ,2,0.0,&avnx[42] } ,
-    {20,"dead" ,3,0.0,&avnx[43] } ,
-    {20,"protected" ,4,0.0,&avnx[44] } ,
-    {20,"withdrawn" ,5,0.0,NULL } ,
-    {20,"seq-entry" ,0,0.0,&avnx[46] } ,
-    {20,"seq-annot" ,1,0.0,&avnx[47] } ,
-    {20,"id2s-split-info" ,2,0.0,&avnx[48] } ,
+    {20,"seq-entry" ,0,0.0,&avnx[49] } ,
+    {20,"seq-annot" ,1,0.0,&avnx[50] } ,
+    {20,"id2s-split-info" ,2,0.0,&avnx[51] } ,
     {20,"id2s-chunk" ,3,0.0,NULL } ,
     {3,NULL,0,0.0,NULL } ,
-    {20,"asn-binary" ,0,0.0,&avnx[51] } ,
-    {20,"asn-text" ,1,0.0,&avnx[52] } ,
+    {20,"asn-binary" ,0,0.0,&avnx[54] } ,
+    {20,"asn-text" ,1,0.0,&avnx[55] } ,
     {20,"xml" ,2,0.0,NULL } ,
     {3,NULL,0,0.0,NULL } ,
-    {20,"none" ,0,0.0,&avnx[55] } ,
-    {20,"gzip" ,1,0.0,&avnx[56] } ,
-    {20,"nlmzip" ,2,0.0,&avnx[57] } ,
+    {20,"none" ,0,0.0,&avnx[58] } ,
+    {20,"gzip" ,1,0.0,&avnx[59] } ,
+    {20,"nlmzip" ,2,0.0,&avnx[60] } ,
     {20,"bzip2" ,3,0.0,NULL } ,
     {3,NULL,0,0.0,NULL } ,
     {3,NULL,0,0.0,NULL } ,
-    {20,"reply" ,0,0.0,&avnx[61] } ,
-    {20,"last-octet-string" ,1,0.0,&avnx[62] } ,
+    {20,"reply" ,0,0.0,&avnx[64] } ,
+    {20,"last-octet-string" ,1,0.0,&avnx[65] } ,
     {20,"nothing" ,2,0.0,NULL } };
 
-static AsnType atx[148] = {
-  {401, "Seq-id" ,1,0,0,0,0,0,1,0,NULL,NULL,NULL,0,&atx[1]} ,
-  {402, "Seq-loc" ,1,0,0,0,0,0,1,0,NULL,NULL,NULL,0,&atx[2]} ,
-  {403, "ID2S-Chunk-Id" ,1,0,0,0,0,0,1,0,NULL,NULL,NULL,0,&atx[3]} ,
-  {404, "ID2S-Seq-annot-Info" ,1,0,0,0,0,0,1,0,NULL,NULL,NULL,0,&atx[4]} ,
-  {405, "ID2-Request-Packet" ,1,0,0,0,0,0,0,0,NULL,&atx[17],&atx[5],0,&atx[6]} ,
-  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[6],NULL,0,NULL} ,
-  {406, "ID2-Request" ,1,0,0,0,0,0,0,0,NULL,&atx[20],&atx[7],0,&atx[10]} ,
-  {0, "serial-number" ,128,0,0,1,0,0,0,0,NULL,&atx[8],NULL,0,&atx[9]} ,
+static AsnType atx[150] = {
+  {401, "ID2-Blob-State" ,1,0,0,0,0,1,0,0,NULL,&atx[1],&avnx[0],0,&atx[2]} ,
+  {310, "ENUMERATED" ,0,10,0,0,0,0,0,0,NULL,NULL,NULL,0,NULL} ,
+  {402, "Seq-id" ,1,0,0,0,0,0,1,0,NULL,NULL,NULL,0,&atx[3]} ,
+  {403, "Seq-loc" ,1,0,0,0,0,0,1,0,NULL,NULL,NULL,0,&atx[4]} ,
+  {404, "ID2S-Chunk-Id" ,1,0,0,0,0,0,1,0,NULL,NULL,NULL,0,&atx[5]} ,
+  {405, "ID2S-Seq-annot-Info" ,1,0,0,0,0,0,1,0,NULL,NULL,NULL,0,&atx[6]} ,
+  {406, "ID2-Request-Packet" ,1,0,0,0,0,0,0,0,NULL,&atx[19],&atx[7],0,&atx[8]} ,
+  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[8],NULL,0,NULL} ,
+  {407, "ID2-Request" ,1,0,0,0,0,0,0,0,NULL,&atx[21],&atx[9],0,&atx[12]} ,
+  {0, "serial-number" ,128,0,0,1,0,0,0,0,NULL,&atx[10],NULL,0,&atx[11]} ,
   {302, "INTEGER" ,0,2,0,0,0,0,0,0,NULL,NULL,NULL,0,NULL} ,
-  {0, "params" ,128,1,0,1,0,0,0,0,NULL,&atx[10],NULL,0,&atx[21]} ,
-  {407, "ID2-Params" ,1,0,0,0,0,0,0,0,NULL,&atx[17],&atx[11],0,&atx[25]} ,
-  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[12],NULL,0,NULL} ,
-  {431, "ID2-Param" ,1,0,0,0,0,0,0,0,NULL,&atx[20],&atx[13],0,NULL} ,
-  {0, "name" ,128,0,0,0,0,0,0,0,NULL,&atx[14],NULL,0,&atx[15]} ,
-  {323, "VisibleString" ,0,26,0,0,0,0,0,0,NULL,NULL,NULL,0,NULL} ,
-  {0, "value" ,128,1,0,1,0,0,0,0,NULL,&atx[17],&atx[16],0,&atx[18]} ,
+  {0, "params" ,128,1,0,1,0,0,0,0,NULL,&atx[12],NULL,0,&atx[22]} ,
+  {408, "ID2-Params" ,1,0,0,0,0,0,0,0,NULL,&atx[19],&atx[13],0,&atx[26]} ,
   {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[14],NULL,0,NULL} ,
+  {431, "ID2-Param" ,1,0,0,0,0,0,0,0,NULL,&atx[21],&atx[15],0,NULL} ,
+  {0, "name" ,128,0,0,0,0,0,0,0,NULL,&atx[16],NULL,0,&atx[17]} ,
+  {323, "VisibleString" ,0,26,0,0,0,0,0,0,NULL,NULL,NULL,0,NULL} ,
+  {0, "value" ,128,1,0,1,0,0,0,0,NULL,&atx[19],&atx[18],0,&atx[20]} ,
+  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[16],NULL,0,NULL} ,
   {312, "SEQUENCE OF" ,0,16,0,0,0,0,0,0,NULL,NULL,NULL,0,NULL} ,
-  {0, "type" ,128,2,0,0,1,0,0,0,&avnx[4],&atx[19],&avnx[0],0,NULL} ,
-  {310, "ENUMERATED" ,0,10,0,0,0,0,0,0,NULL,NULL,NULL,0,NULL} ,
+  {0, "type" ,128,2,0,0,1,0,0,0,&avnx[10],&atx[1],&avnx[6],0,NULL} ,
   {311, "SEQUENCE" ,0,16,0,0,0,0,0,0,NULL,NULL,NULL,0,NULL} ,
-  {0, "request" ,128,2,0,0,0,0,0,0,NULL,&atx[35],&atx[22],0,NULL} ,
-  {0, "init" ,128,0,0,0,0,0,0,0,NULL,&atx[23],NULL,0,&atx[24]} ,
+  {0, "request" ,128,2,0,0,0,0,0,0,NULL,&atx[36],&atx[23],0,NULL} ,
+  {0, "init" ,128,0,0,0,0,0,0,0,NULL,&atx[24],NULL,0,&atx[25]} ,
   {305, "NULL" ,0,5,0,0,0,0,0,0,NULL,NULL,NULL,0,NULL} ,
-  {0, "get-packages" ,128,1,0,0,0,0,0,0,NULL,&atx[25],NULL,0,&atx[29]} ,
-  {408, "ID2-Request-Get-Packages" ,1,0,0,0,0,0,0,0,NULL,&atx[20],&atx[26],0,&atx[30]} ,
-  {0, "names" ,128,0,0,1,0,0,0,0,NULL,&atx[17],&atx[27],0,&atx[28]} ,
-  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[14],NULL,0,NULL} ,
-  {0, "no-contents" ,128,1,0,1,0,0,0,0,NULL,&atx[23],NULL,0,NULL} ,
-  {0, "get-seq-id" ,128,2,0,0,0,0,0,0,NULL,&atx[30],NULL,0,&atx[37]} ,
-  {409, "ID2-Request-Get-Seq-id" ,1,0,0,0,0,0,0,0,NULL,&atx[20],&atx[31],0,&atx[38]} ,
-  {0, "seq-id" ,128,0,0,0,0,0,0,0,NULL,&atx[32],NULL,0,&atx[36]} ,
-  {414, "ID2-Seq-id" ,1,0,0,0,0,0,0,0,NULL,&atx[35],&atx[33],0,&atx[47]} ,
-  {0, "string" ,128,0,0,0,0,0,0,0,NULL,&atx[14],NULL,0,&atx[34]} ,
-  {0, "seq-id" ,128,1,0,0,0,0,0,0,NULL,&atx[0],NULL,0,NULL} ,
+  {0, "get-packages" ,128,1,0,0,0,0,0,0,NULL,&atx[26],NULL,0,&atx[30]} ,
+  {409, "ID2-Request-Get-Packages" ,1,0,0,0,0,0,0,0,NULL,&atx[21],&atx[27],0,&atx[31]} ,
+  {0, "names" ,128,0,0,1,0,0,0,0,NULL,&atx[19],&atx[28],0,&atx[29]} ,
+  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[16],NULL,0,NULL} ,
+  {0, "no-contents" ,128,1,0,1,0,0,0,0,NULL,&atx[24],NULL,0,NULL} ,
+  {0, "get-seq-id" ,128,2,0,0,0,0,0,0,NULL,&atx[31],NULL,0,&atx[38]} ,
+  {410, "ID2-Request-Get-Seq-id" ,1,0,0,0,0,0,0,0,NULL,&atx[21],&atx[32],0,&atx[39]} ,
+  {0, "seq-id" ,128,0,0,0,0,0,0,0,NULL,&atx[33],NULL,0,&atx[37]} ,
+  {415, "ID2-Seq-id" ,1,0,0,0,0,0,0,0,NULL,&atx[36],&atx[34],0,&atx[48]} ,
+  {0, "string" ,128,0,0,0,0,0,0,0,NULL,&atx[16],NULL,0,&atx[35]} ,
+  {0, "seq-id" ,128,1,0,0,0,0,0,0,NULL,&atx[2],NULL,0,NULL} ,
   {315, "CHOICE" ,0,-1,0,0,0,0,0,0,NULL,NULL,NULL,0,NULL} ,
-  {0, "seq-id-type" ,128,1,0,0,1,0,0,0,&avnx[10],&atx[8],&avnx[5],0,NULL} ,
-  {0, "get-blob-id" ,128,3,0,0,0,0,0,0,NULL,&atx[38],NULL,0,&atx[43]} ,
-  {410, "ID2-Request-Get-Blob-Id" ,1,0,0,0,0,0,0,0,NULL,&atx[20],&atx[39],0,&atx[44]} ,
-  {0, "seq-id" ,128,0,0,0,0,0,0,0,NULL,&atx[30],NULL,0,&atx[40]} ,
-  {0, "sources" ,128,1,0,1,0,0,0,0,NULL,&atx[17],&atx[41],0,&atx[42]} ,
-  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[14],NULL,0,NULL} ,
-  {0, "external" ,128,2,0,1,0,0,0,0,NULL,&atx[23],NULL,0,NULL} ,
-  {0, "get-blob-info" ,128,4,0,0,0,0,0,0,NULL,&atx[44],NULL,0,&atx[66]} ,
-  {411, "ID2-Request-Get-Blob-Info" ,1,0,0,0,0,0,0,0,NULL,&atx[20],&atx[45],0,&atx[67]} ,
-  {0, "blob-id" ,128,0,0,0,0,0,0,0,NULL,&atx[35],&atx[46],0,&atx[56]} ,
-  {0, "blob-id" ,128,0,0,0,0,0,0,0,NULL,&atx[47],NULL,0,&atx[52]} ,
-  {415, "ID2-Blob-Id" ,1,0,0,0,0,0,0,0,NULL,&atx[20],&atx[48],0,&atx[58]} ,
-  {0, "sat" ,128,0,0,0,0,0,0,0,NULL,&atx[8],NULL,0,&atx[49]} ,
-  {0, "sub-sat" ,128,1,0,0,1,0,0,0,&avnx[20],&atx[8],&avnx[11],0,&atx[50]} ,
-  {0, "sat-key" ,128,2,0,0,0,0,0,0,NULL,&atx[8],NULL,0,&atx[51]} ,
-  {0, "version" ,128,3,0,1,0,0,0,0,NULL,&atx[8],NULL,0,NULL} ,
-  {0, "resolve" ,128,1,0,0,0,0,0,0,NULL,&atx[20],&atx[53],0,NULL} ,
-  {0, "request" ,128,0,0,0,0,0,0,0,NULL,&atx[38],NULL,0,&atx[54]} ,
-  {0, "exclude-blobs" ,128,1,0,1,0,0,0,0,NULL,&atx[17],&atx[55],0,NULL} ,
-  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[47],NULL,0,NULL} ,
-  {0, "get-seq-ids" ,128,1,0,1,0,0,0,0,NULL,&atx[23],NULL,0,&atx[57]} ,
-  {0, "get-data" ,128,2,0,1,0,0,0,0,NULL,&atx[58],NULL,0,NULL} ,
-  {416, "ID2-Get-Blob-Details" ,1,0,0,0,0,0,0,0,NULL,&atx[20],&atx[59],0,&atx[77]} ,
-  {0, "location" ,128,0,0,1,0,0,0,0,NULL,&atx[1],NULL,0,&atx[60]} ,
-  {0, "seq-class-level" ,128,1,0,0,1,0,0,0,&avnx[21],&atx[8],NULL,0,&atx[61]} ,
-  {0, "descr-level" ,128,2,0,0,1,0,0,0,&avnx[22],&atx[8],NULL,0,&atx[62]} ,
-  {0, "descr-type-mask" ,128,3,0,0,1,0,0,0,&avnx[23],&atx[8],NULL,0,&atx[63]} ,
-  {0, "annot-type-mask" ,128,4,0,0,1,0,0,0,&avnx[24],&atx[8],NULL,0,&atx[64]} ,
-  {0, "feat-type-mask" ,128,5,0,0,1,0,0,0,&avnx[25],&atx[8],NULL,0,&atx[65]} ,
-  {0, "sequence-level" ,128,6,0,0,1,0,0,0,&avnx[29],&atx[19],&avnx[26],0,NULL} ,
-  {0, "reget-blob" ,128,5,0,0,0,0,0,0,NULL,&atx[67],NULL,0,&atx[71]} ,
-  {412, "ID2-Request-ReGet-Blob" ,1,0,0,0,0,0,0,0,NULL,&atx[20],&atx[68],0,&atx[72]} ,
-  {0, "blob-id" ,128,0,0,0,0,0,0,0,NULL,&atx[47],NULL,0,&atx[69]} ,
-  {0, "split-version" ,128,1,0,0,0,0,0,0,NULL,&atx[8],NULL,0,&atx[70]} ,
-  {0, "offset" ,128,2,0,0,0,0,0,0,NULL,&atx[8],NULL,0,NULL} ,
-  {0, "get-chunks" ,128,6,0,0,0,0,0,0,NULL,&atx[72],NULL,0,NULL} ,
-  {413, "ID2S-Request-Get-Chunks" ,1,0,0,0,0,0,0,0,NULL,&atx[20],&atx[73],0,&atx[32]} ,
-  {0, "blob-id" ,128,0,0,0,0,0,0,0,NULL,&atx[47],NULL,0,&atx[74]} ,
-  {0, "chunks" ,128,1,0,0,0,0,0,0,NULL,&atx[17],&atx[75],0,&atx[76]} ,
+  {0, "seq-id-type" ,128,1,0,0,1,0,0,0,&avnx[19],&atx[10],&avnx[11],0,NULL} ,
+  {0, "get-blob-id" ,128,3,0,0,0,0,0,0,NULL,&atx[39],NULL,0,&atx[44]} ,
+  {411, "ID2-Request-Get-Blob-Id" ,1,0,0,0,0,0,0,0,NULL,&atx[21],&atx[40],0,&atx[45]} ,
+  {0, "seq-id" ,128,0,0,0,0,0,0,0,NULL,&atx[31],NULL,0,&atx[41]} ,
+  {0, "sources" ,128,1,0,1,0,0,0,0,NULL,&atx[19],&atx[42],0,&atx[43]} ,
+  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[16],NULL,0,NULL} ,
+  {0, "external" ,128,2,0,1,0,0,0,0,NULL,&atx[24],NULL,0,NULL} ,
+  {0, "get-blob-info" ,128,4,0,0,0,0,0,0,NULL,&atx[45],NULL,0,&atx[67]} ,
+  {412, "ID2-Request-Get-Blob-Info" ,1,0,0,0,0,0,0,0,NULL,&atx[21],&atx[46],0,&atx[68]} ,
+  {0, "blob-id" ,128,0,0,0,0,0,0,0,NULL,&atx[36],&atx[47],0,&atx[57]} ,
+  {0, "blob-id" ,128,0,0,0,0,0,0,0,NULL,&atx[48],NULL,0,&atx[53]} ,
+  {416, "ID2-Blob-Id" ,1,0,0,0,0,0,0,0,NULL,&atx[21],&atx[49],0,&atx[59]} ,
+  {0, "sat" ,128,0,0,0,0,0,0,0,NULL,&atx[10],NULL,0,&atx[50]} ,
+  {0, "sub-sat" ,128,1,0,0,1,0,0,0,&avnx[29],&atx[10],&avnx[20],0,&atx[51]} ,
+  {0, "sat-key" ,128,2,0,0,0,0,0,0,NULL,&atx[10],NULL,0,&atx[52]} ,
+  {0, "version" ,128,3,0,1,0,0,0,0,NULL,&atx[10],NULL,0,NULL} ,
+  {0, "resolve" ,128,1,0,0,0,0,0,0,NULL,&atx[21],&atx[54],0,NULL} ,
+  {0, "request" ,128,0,0,0,0,0,0,0,NULL,&atx[39],NULL,0,&atx[55]} ,
+  {0, "exclude-blobs" ,128,1,0,1,0,0,0,0,NULL,&atx[19],&atx[56],0,NULL} ,
+  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[48],NULL,0,NULL} ,
+  {0, "get-seq-ids" ,128,1,0,1,0,0,0,0,NULL,&atx[24],NULL,0,&atx[58]} ,
+  {0, "get-data" ,128,2,0,1,0,0,0,0,NULL,&atx[59],NULL,0,NULL} ,
+  {417, "ID2-Get-Blob-Details" ,1,0,0,0,0,0,0,0,NULL,&atx[21],&atx[60],0,&atx[78]} ,
+  {0, "location" ,128,0,0,1,0,0,0,0,NULL,&atx[3],NULL,0,&atx[61]} ,
+  {0, "seq-class-level" ,128,1,0,0,1,0,0,0,&avnx[30],&atx[10],NULL,0,&atx[62]} ,
+  {0, "descr-level" ,128,2,0,0,1,0,0,0,&avnx[31],&atx[10],NULL,0,&atx[63]} ,
+  {0, "descr-type-mask" ,128,3,0,0,1,0,0,0,&avnx[32],&atx[10],NULL,0,&atx[64]} ,
+  {0, "annot-type-mask" ,128,4,0,0,1,0,0,0,&avnx[33],&atx[10],NULL,0,&atx[65]} ,
+  {0, "feat-type-mask" ,128,5,0,0,1,0,0,0,&avnx[34],&atx[10],NULL,0,&atx[66]} ,
+  {0, "sequence-level" ,128,6,0,0,1,0,0,0,&avnx[38],&atx[1],&avnx[35],0,NULL} ,
+  {0, "reget-blob" ,128,5,0,0,0,0,0,0,NULL,&atx[68],NULL,0,&atx[72]} ,
+  {413, "ID2-Request-ReGet-Blob" ,1,0,0,0,0,0,0,0,NULL,&atx[21],&atx[69],0,&atx[73]} ,
+  {0, "blob-id" ,128,0,0,0,0,0,0,0,NULL,&atx[48],NULL,0,&atx[70]} ,
+  {0, "split-version" ,128,1,0,0,0,0,0,0,NULL,&atx[10],NULL,0,&atx[71]} ,
+  {0, "offset" ,128,2,0,0,0,0,0,0,NULL,&atx[10],NULL,0,NULL} ,
+  {0, "get-chunks" ,128,6,0,0,0,0,0,0,NULL,&atx[73],NULL,0,NULL} ,
+  {414, "ID2S-Request-Get-Chunks" ,1,0,0,0,0,0,0,0,NULL,&atx[21],&atx[74],0,&atx[33]} ,
+  {0, "blob-id" ,128,0,0,0,0,0,0,0,NULL,&atx[48],NULL,0,&atx[75]} ,
+  {0, "chunks" ,128,1,0,0,0,0,0,0,NULL,&atx[19],&atx[76],0,&atx[77]} ,
+  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[4],NULL,0,NULL} ,
+  {0, "split-version" ,128,2,0,1,0,0,0,0,NULL,&atx[10],NULL,0,NULL} ,
+  {418, "ID2-Reply" ,1,0,0,0,0,0,0,0,NULL,&atx[21],&atx[79],0,&atx[83]} ,
+  {0, "serial-number" ,128,0,0,1,0,0,0,0,NULL,&atx[10],NULL,0,&atx[80]} ,
+  {0, "params" ,128,1,0,1,0,0,0,0,NULL,&atx[12],NULL,0,&atx[81]} ,
+  {0, "error" ,128,2,0,1,0,0,0,0,NULL,&atx[19],&atx[82],0,&atx[87]} ,
+  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[83],NULL,0,NULL} ,
+  {419, "ID2-Error" ,1,0,0,0,0,0,0,0,NULL,&atx[21],&atx[84],0,&atx[92]} ,
+  {0, "severity" ,128,0,0,0,0,0,0,0,NULL,&atx[1],&avnx[39],0,&atx[85]} ,
+  {0, "retry-delay" ,128,1,0,1,0,0,0,0,NULL,&atx[10],NULL,0,&atx[86]} ,
+  {0, "message" ,128,2,0,1,0,0,0,0,NULL,&atx[16],NULL,0,NULL} ,
+  {0, "end-of-reply" ,128,3,0,1,0,0,0,0,NULL,&atx[24],NULL,0,&atx[88]} ,
+  {0, "reply" ,128,4,0,0,0,0,0,0,NULL,&atx[36],&atx[89],0,&atx[144]} ,
+  {0, "init" ,128,0,0,0,0,0,0,0,NULL,&atx[24],NULL,0,&atx[90]} ,
+  {0, "empty" ,128,1,0,0,0,0,0,0,NULL,&atx[24],NULL,0,&atx[91]} ,
+  {0, "get-package" ,128,2,0,0,0,0,0,0,NULL,&atx[92],NULL,0,&atx[95]} ,
+  {420, "ID2-Reply-Get-Package" ,1,0,0,0,0,0,0,0,NULL,&atx[21],&atx[93],0,&atx[96]} ,
+  {0, "name" ,128,0,0,0,0,0,0,0,NULL,&atx[16],NULL,0,&atx[94]} ,
+  {0, "params" ,128,1,0,1,0,0,0,0,NULL,&atx[12],NULL,0,NULL} ,
+  {0, "get-seq-id" ,128,3,0,0,0,0,0,0,NULL,&atx[96],NULL,0,&atx[101]} ,
+  {421, "ID2-Reply-Get-Seq-id" ,1,0,0,0,0,0,0,0,NULL,&atx[21],&atx[97],0,&atx[102]} ,
+  {0, "request" ,128,0,0,0,0,0,0,0,NULL,&atx[31],NULL,0,&atx[98]} ,
+  {0, "seq-id" ,128,1,0,1,0,0,0,0,NULL,&atx[19],&atx[99],0,&atx[100]} ,
   {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[2],NULL,0,NULL} ,
-  {0, "split-version" ,128,2,0,1,0,0,0,0,NULL,&atx[8],NULL,0,NULL} ,
-  {417, "ID2-Reply" ,1,0,0,0,0,0,0,0,NULL,&atx[20],&atx[78],0,&atx[82]} ,
-  {0, "serial-number" ,128,0,0,1,0,0,0,0,NULL,&atx[8],NULL,0,&atx[79]} ,
-  {0, "params" ,128,1,0,1,0,0,0,0,NULL,&atx[10],NULL,0,&atx[80]} ,
-  {0, "error" ,128,2,0,1,0,0,0,0,NULL,&atx[17],&atx[81],0,&atx[86]} ,
-  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[82],NULL,0,NULL} ,
-  {418, "ID2-Error" ,1,0,0,0,0,0,0,0,NULL,&atx[20],&atx[83],0,&atx[91]} ,
-  {0, "severity" ,128,0,0,0,0,0,0,0,NULL,&atx[19],&avnx[30],0,&atx[84]} ,
-  {0, "retry-delay" ,128,1,0,1,0,0,0,0,NULL,&atx[8],NULL,0,&atx[85]} ,
-  {0, "message" ,128,2,0,1,0,0,0,0,NULL,&atx[14],NULL,0,NULL} ,
-  {0, "end-of-reply" ,128,3,0,1,0,0,0,0,NULL,&atx[23],NULL,0,&atx[87]} ,
-  {0, "reply" ,128,4,0,0,0,0,0,0,NULL,&atx[35],&atx[88],0,&atx[142]} ,
-  {0, "init" ,128,0,0,0,0,0,0,0,NULL,&atx[23],NULL,0,&atx[89]} ,
-  {0, "empty" ,128,1,0,0,0,0,0,0,NULL,&atx[23],NULL,0,&atx[90]} ,
-  {0, "get-package" ,128,2,0,0,0,0,0,0,NULL,&atx[91],NULL,0,&atx[94]} ,
-  {419, "ID2-Reply-Get-Package" ,1,0,0,0,0,0,0,0,NULL,&atx[20],&atx[92],0,&atx[95]} ,
-  {0, "name" ,128,0,0,0,0,0,0,0,NULL,&atx[14],NULL,0,&atx[93]} ,
-  {0, "params" ,128,1,0,1,0,0,0,0,NULL,&atx[10],NULL,0,NULL} ,
-  {0, "get-seq-id" ,128,3,0,0,0,0,0,0,NULL,&atx[95],NULL,0,&atx[100]} ,
-  {420, "ID2-Reply-Get-Seq-id" ,1,0,0,0,0,0,0,0,NULL,&atx[20],&atx[96],0,&atx[101]} ,
-  {0, "request" ,128,0,0,0,0,0,0,0,NULL,&atx[30],NULL,0,&atx[97]} ,
-  {0, "seq-id" ,128,1,0,1,0,0,0,0,NULL,&atx[17],&atx[98],0,&atx[99]} ,
-  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[0],NULL,0,NULL} ,
-  {0, "end-of-reply" ,128,2,0,1,0,0,0,0,NULL,&atx[23],NULL,0,NULL} ,
-  {0, "get-blob-id" ,128,4,0,0,0,0,0,0,NULL,&atx[101],NULL,0,&atx[110]} ,
-  {421, "ID2-Reply-Get-Blob-Id" ,1,0,0,0,0,0,0,0,NULL,&atx[20],&atx[102],0,&atx[111]} ,
-  {0, "seq-id" ,128,0,0,0,0,0,0,0,NULL,&atx[0],NULL,0,&atx[103]} ,
-  {0, "blob-id" ,128,1,0,1,0,0,0,0,NULL,&atx[47],NULL,0,&atx[104]} ,
-  {0, "split-version" ,128,2,0,0,1,0,0,0,&avnx[38],&atx[8],NULL,0,&atx[105]} ,
-  {0, "annot-info" ,128,3,0,1,0,0,0,0,NULL,&atx[17],&atx[106],0,&atx[107]} ,
-  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[3],NULL,0,NULL} ,
-  {0, "end-of-reply" ,128,4,0,1,0,0,0,0,NULL,&atx[23],NULL,0,&atx[108]} ,
-  {0, "blob-state" ,128,5,0,1,0,0,0,0,NULL,&atx[109],NULL,0,NULL} ,
-  {427, "ID2-Blob-State" ,1,0,0,0,0,0,0,0,NULL,&atx[19],&avnx[39],0,&atx[114]} ,
+  {0, "end-of-reply" ,128,2,0,1,0,0,0,0,NULL,&atx[24],NULL,0,NULL} ,
+  {0, "get-blob-id" ,128,4,0,0,0,0,0,0,NULL,&atx[102],NULL,0,&atx[110]} ,
+  {422, "ID2-Reply-Get-Blob-Id" ,1,0,0,0,0,0,0,0,NULL,&atx[21],&atx[103],0,&atx[111]} ,
+  {0, "seq-id" ,128,0,0,0,0,0,0,0,NULL,&atx[2],NULL,0,&atx[104]} ,
+  {0, "blob-id" ,128,1,0,1,0,0,0,0,NULL,&atx[48],NULL,0,&atx[105]} ,
+  {0, "split-version" ,128,2,0,0,1,0,0,0,&avnx[47],&atx[10],NULL,0,&atx[106]} ,
+  {0, "annot-info" ,128,3,0,1,0,0,0,0,NULL,&atx[19],&atx[107],0,&atx[108]} ,
+  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[5],NULL,0,NULL} ,
+  {0, "end-of-reply" ,128,4,0,1,0,0,0,0,NULL,&atx[24],NULL,0,&atx[109]} ,
+  {0, "blob-state" ,128,5,0,1,0,0,0,0,NULL,&atx[10],NULL,0,NULL} ,
   {0, "get-blob-seq-ids" ,128,5,0,0,0,0,0,0,NULL,&atx[111],NULL,0,&atx[121]} ,
-  {422, "ID2-Reply-Get-Blob-Seq-ids" ,1,0,0,0,0,0,0,0,NULL,&atx[20],&atx[112],0,&atx[122]} ,
-  {0, "blob-id" ,128,0,0,0,0,0,0,0,NULL,&atx[47],NULL,0,&atx[113]} ,
+  {423, "ID2-Reply-Get-Blob-Seq-ids" ,1,0,0,0,0,0,0,0,NULL,&atx[21],&atx[112],0,&atx[122]} ,
+  {0, "blob-id" ,128,0,0,0,0,0,0,0,NULL,&atx[48],NULL,0,&atx[113]} ,
   {0, "ids" ,128,1,0,1,0,0,0,0,NULL,&atx[114],NULL,0,NULL} ,
-  {428, "ID2-Reply-Data" ,1,0,0,0,0,0,0,0,NULL,&atx[20],&atx[115],0,&atx[143]} ,
-  {0, "data-type" ,128,0,0,0,1,0,0,0,&avnx[49],&atx[8],&avnx[45],0,&atx[116]} ,
-  {0, "data-format" ,128,1,0,0,1,0,0,0,&avnx[53],&atx[8],&avnx[50],0,&atx[117]} ,
-  {0, "data-compression" ,128,2,0,0,1,0,0,0,&avnx[58],&atx[8],&avnx[54],0,&atx[118]} ,
-  {0, "data" ,128,3,0,0,0,0,0,0,NULL,&atx[17],&atx[119],0,NULL} ,
+  {428, "ID2-Reply-Data" ,1,0,0,0,0,0,0,0,NULL,&atx[21],&atx[115],0,&atx[145]} ,
+  {0, "data-type" ,128,0,0,0,1,0,0,0,&avnx[52],&atx[10],&avnx[48],0,&atx[116]} ,
+  {0, "data-format" ,128,1,0,0,1,0,0,0,&avnx[56],&atx[10],&avnx[53],0,&atx[117]} ,
+  {0, "data-compression" ,128,2,0,0,1,0,0,0,&avnx[61],&atx[10],&avnx[57],0,&atx[118]} ,
+  {0, "data" ,128,3,0,0,0,0,0,0,NULL,&atx[19],&atx[119],0,NULL} ,
   {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[120],NULL,0,NULL} ,
   {304, "OCTET STRING" ,0,4,0,0,0,0,0,0,NULL,NULL,NULL,0,NULL} ,
-  {0, "get-blob" ,128,6,0,0,0,0,0,0,NULL,&atx[122],NULL,0,&atx[126]} ,
-  {423, "ID2-Reply-Get-Blob" ,1,0,0,0,0,0,0,0,NULL,&atx[20],&atx[123],0,&atx[127]} ,
-  {0, "blob-id" ,128,0,0,0,0,0,0,0,NULL,&atx[47],NULL,0,&atx[124]} ,
-  {0, "split-version" ,128,1,0,0,1,0,0,0,&avnx[59],&atx[8],NULL,0,&atx[125]} ,
-  {0, "data" ,128,2,0,1,0,0,0,0,NULL,&atx[114],NULL,0,NULL} ,
-  {0, "reget-blob" ,128,7,0,0,0,0,0,0,NULL,&atx[127],NULL,0,&atx[132]} ,
-  {424, "ID2-Reply-ReGet-Blob" ,1,0,0,0,0,0,0,0,NULL,&atx[20],&atx[128],0,&atx[133]} ,
-  {0, "blob-id" ,128,0,0,0,0,0,0,0,NULL,&atx[47],NULL,0,&atx[129]} ,
-  {0, "split-version" ,128,1,0,0,0,0,0,0,NULL,&atx[8],NULL,0,&atx[130]} ,
-  {0, "offset" ,128,2,0,0,0,0,0,0,NULL,&atx[8],NULL,0,&atx[131]} ,
+  {0, "get-blob" ,128,6,0,0,0,0,0,0,NULL,&atx[122],NULL,0,&atx[127]} ,
+  {424, "ID2-Reply-Get-Blob" ,1,0,0,0,0,0,0,0,NULL,&atx[21],&atx[123],0,&atx[128]} ,
+  {0, "blob-id" ,128,0,0,0,0,0,0,0,NULL,&atx[48],NULL,0,&atx[124]} ,
+  {0, "split-version" ,128,1,0,0,1,0,0,0,&avnx[62],&atx[10],NULL,0,&atx[125]} ,
+  {0, "data" ,128,2,0,1,0,0,0,0,NULL,&atx[114],NULL,0,&atx[126]} ,
+  {0, "blob-state" ,128,3,0,1,0,0,0,0,NULL,&atx[10],NULL,0,NULL} ,
+  {0, "reget-blob" ,128,7,0,0,0,0,0,0,NULL,&atx[128],NULL,0,&atx[133]} ,
+  {425, "ID2-Reply-ReGet-Blob" ,1,0,0,0,0,0,0,0,NULL,&atx[21],&atx[129],0,&atx[134]} ,
+  {0, "blob-id" ,128,0,0,0,0,0,0,0,NULL,&atx[48],NULL,0,&atx[130]} ,
+  {0, "split-version" ,128,1,0,0,0,0,0,0,NULL,&atx[10],NULL,0,&atx[131]} ,
+  {0, "offset" ,128,2,0,0,0,0,0,0,NULL,&atx[10],NULL,0,&atx[132]} ,
   {0, "data" ,128,3,0,1,0,0,0,0,NULL,&atx[114],NULL,0,NULL} ,
-  {0, "get-split-info" ,128,8,0,0,0,0,0,0,NULL,&atx[133],NULL,0,&atx[137]} ,
-  {425, "ID2S-Reply-Get-Split-Info" ,1,0,0,0,0,0,0,0,NULL,&atx[20],&atx[134],0,&atx[138]} ,
-  {0, "blob-id" ,128,0,0,0,0,0,0,0,NULL,&atx[47],NULL,0,&atx[135]} ,
-  {0, "split-version" ,128,1,0,0,0,0,0,0,NULL,&atx[8],NULL,0,&atx[136]} ,
+  {0, "get-split-info" ,128,8,0,0,0,0,0,0,NULL,&atx[134],NULL,0,&atx[139]} ,
+  {426, "ID2S-Reply-Get-Split-Info" ,1,0,0,0,0,0,0,0,NULL,&atx[21],&atx[135],0,&atx[140]} ,
+  {0, "blob-id" ,128,0,0,0,0,0,0,0,NULL,&atx[48],NULL,0,&atx[136]} ,
+  {0, "split-version" ,128,1,0,0,0,0,0,0,NULL,&atx[10],NULL,0,&atx[137]} ,
+  {0, "data" ,128,2,0,1,0,0,0,0,NULL,&atx[114],NULL,0,&atx[138]} ,
+  {0, "blob-state" ,128,3,0,1,0,0,0,0,NULL,&atx[10],NULL,0,NULL} ,
+  {0, "get-chunk" ,128,9,0,0,0,0,0,0,NULL,&atx[140],NULL,0,NULL} ,
+  {427, "ID2S-Reply-Get-Chunk" ,1,0,0,0,0,0,0,0,NULL,&atx[21],&atx[141],0,&atx[114]} ,
+  {0, "blob-id" ,128,0,0,0,0,0,0,0,NULL,&atx[48],NULL,0,&atx[142]} ,
+  {0, "chunk-id" ,128,1,0,0,0,0,0,0,NULL,&atx[4],NULL,0,&atx[143]} ,
   {0, "data" ,128,2,0,1,0,0,0,0,NULL,&atx[114],NULL,0,NULL} ,
-  {0, "get-chunk" ,128,9,0,0,0,0,0,0,NULL,&atx[138],NULL,0,NULL} ,
-  {426, "ID2S-Reply-Get-Chunk" ,1,0,0,0,0,0,0,0,NULL,&atx[20],&atx[139],0,&atx[109]} ,
-  {0, "blob-id" ,128,0,0,0,0,0,0,0,NULL,&atx[47],NULL,0,&atx[140]} ,
-  {0, "chunk-id" ,128,1,0,0,0,0,0,0,NULL,&atx[2],NULL,0,&atx[141]} ,
-  {0, "data" ,128,2,0,1,0,0,0,0,NULL,&atx[114],NULL,0,NULL} ,
-  {0, "discard" ,128,5,0,1,0,0,0,0,NULL,&atx[19],&avnx[60],0,NULL} ,
-  {429, "ID2-Blob-Seq-ids" ,1,0,0,0,0,0,0,0,NULL,&atx[17],&atx[144],0,&atx[145]} ,
-  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[145],NULL,0,NULL} ,
-  {430, "ID2-Blob-Seq-id" ,1,0,0,0,0,0,0,0,NULL,&atx[20],&atx[146],0,&atx[12]} ,
-  {0, "seq-id" ,128,0,0,0,0,0,0,0,NULL,&atx[0],NULL,0,&atx[147]} ,
-  {0, "replaced" ,128,1,0,1,0,0,0,0,NULL,&atx[23],NULL,0,NULL} };
+  {0, "discard" ,128,5,0,1,0,0,0,0,NULL,&atx[1],&avnx[63],0,NULL} ,
+  {429, "ID2-Blob-Seq-ids" ,1,0,0,0,0,0,0,0,NULL,&atx[19],&atx[146],0,&atx[147]} ,
+  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[147],NULL,0,NULL} ,
+  {430, "ID2-Blob-Seq-id" ,1,0,0,0,0,0,0,0,NULL,&atx[21],&atx[148],0,&atx[14]} ,
+  {0, "seq-id" ,128,0,0,0,0,0,0,0,NULL,&atx[2],NULL,0,&atx[149]} ,
+  {0, "replaced" ,128,1,0,1,0,0,0,0,NULL,&atx[24],NULL,0,NULL} };
 
 static AsnModule ampx[1] = {
-  { "NCBI-ID2Access" , "id2.h20",&atx[0],NULL,NULL,0,0} };
+  { "NCBI-ID2Access" , "id2.h26",&atx[0],NULL,NULL,0,0} };
 
 static AsnValxNodePtr avn = avnx;
 static AsnTypePtr at = atx;
@@ -240,121 +245,123 @@ static AsnModulePtr amp = ampx;
 *
 **************************************************/
 
-#define ID2_REQUEST_PACKET &at[4]
-#define ID2_REQUEST_PACKET_E &at[5]
-
-#define ID2_REQUEST &at[6]
-#define ID2_REQUEST_serial_number &at[7]
-#define ID2_REQUEST_params &at[9]
-#define ID2_REQUEST_request &at[21]
-#define ID2_REQUEST_request_init &at[22]
-#define REQUEST_request_get_packages &at[24]
-#define ID2_REQUEST_request_get_seq_id &at[29]
-#define ID2_REQUEST_request_get_blob_id &at[37]
-#define REQUEST_request_get_blob_info &at[43]
-#define ID2_REQUEST_request_reget_blob &at[66]
-#define ID2_REQUEST_request_get_chunks &at[71]
-
-#define ID2_PARAMS &at[10]
-#define ID2_PARAMS_E &at[11]
-
-#define ID2_REQUEST_GET_PACKAGES &at[25]
-#define ID2_REQUEST_GET_PACKAGES_names &at[26]
-#define REQUEST_GET_PACKAGES_names_E &at[27]
-#define GET_PACKAGES_no_contents &at[28]
-
-#define ID2_REQUEST_GET_SEQ_ID &at[30]
-#define ID2_REQUEST_GET_SEQ_ID_seq_id &at[31]
-#define REQUEST_GET_SEQ_ID_seq_id_type &at[36]
-
-#define ID2_REQUEST_GET_BLOB_ID &at[38]
-#define ID2_REQUEST_GET_BLOB_ID_seq_id &at[39]
-#define ID2_REQUEST_GET_BLOB_ID_sources &at[40]
-#define REQUEST_GET_BLOB_ID_sources_E &at[41]
-#define REQUEST_GET_BLOB_ID_external &at[42]
-
-#define ID2_REQUEST_GET_BLOB_INFO &at[44]
-#define REQUEST_GET_BLOB_INFO_blob_id &at[45]
-#define GET_BLOB_INFO_blob_id_blob_id &at[46]
-#define GET_BLOB_INFO_blob_id_resolve &at[52]
-#define INFO_blob_id_resolve_request &at[53]
-#define blob_id_resolve_exclude_blobs &at[54]
-#define id_resolve_exclude_blobs_E &at[55]
-#define GET_BLOB_INFO_get_seq_ids &at[56]
-#define REQUEST_GET_BLOB_INFO_get_data &at[57]
-
-#define ID2_REQUEST_REGET_BLOB &at[67]
-#define ID2_REQUEST_REGET_BLOB_blob_id &at[68]
-#define REGET_BLOB_split_version &at[69]
-#define ID2_REQUEST_REGET_BLOB_offset &at[70]
-
-#define ID2S_REQUEST_GET_CHUNKS &at[72]
-#define ID2S_REQUEST_GET_CHUNKS_blob_id &at[73]
-#define ID2S_REQUEST_GET_CHUNKS_chunks &at[74]
-#define REQUEST_GET_CHUNKS_chunks_E &at[75]
-#define GET_CHUNKS_split_version &at[76]
-
-#define ID2_SEQ_ID &at[32]
-#define ID2_SEQ_ID_string &at[33]
-#define ID2_SEQ_ID_seq_id &at[34]
-
-#define ID2_BLOB_ID &at[47]
-#define ID2_BLOB_ID_sat &at[48]
-#define ID2_BLOB_ID_sub_sat &at[49]
-#define ID2_BLOB_ID_sat_key &at[50]
-#define ID2_BLOB_ID_version &at[51]
-
-#define ID2_GET_BLOB_DETAILS &at[58]
-#define ID2_GET_BLOB_DETAILS_location &at[59]
-#define BLOB_DETAILS_seq_class_level &at[60]
-#define GET_BLOB_DETAILS_descr_level &at[61]
-#define BLOB_DETAILS_descr_type_mask &at[62]
-#define BLOB_DETAILS_annot_type_mask &at[63]
-#define BLOB_DETAILS_feat_type_mask &at[64]
-#define BLOB_DETAILS_sequence_level &at[65]
-
-#define ID2_REPLY &at[77]
-#define ID2_REPLY_serial_number &at[78]
-#define ID2_REPLY_params &at[79]
-#define ID2_REPLY_error &at[80]
-#define ID2_REPLY_error_E &at[81]
-#define ID2_REPLY_end_of_reply &at[86]
-#define ID2_REPLY_reply &at[87]
-#define ID2_REPLY_reply_init &at[88]
-#define ID2_REPLY_reply_empty &at[89]
-#define ID2_REPLY_reply_get_package &at[90]
-#define ID2_REPLY_reply_get_seq_id &at[94]
-#define ID2_REPLY_reply_get_blob_id &at[100]
+#define ID2_BLOB_STATE &at[0]
+
+#define ID2_REQUEST_PACKET &at[6]
+#define ID2_REQUEST_PACKET_E &at[7]
+
+#define ID2_REQUEST &at[8]
+#define ID2_REQUEST_serial_number &at[9]
+#define ID2_REQUEST_params &at[11]
+#define ID2_REQUEST_request &at[22]
+#define ID2_REQUEST_request_init &at[23]
+#define REQUEST_request_get_packages &at[25]
+#define ID2_REQUEST_request_get_seq_id &at[30]
+#define ID2_REQUEST_request_get_blob_id &at[38]
+#define REQUEST_request_get_blob_info &at[44]
+#define ID2_REQUEST_request_reget_blob &at[67]
+#define ID2_REQUEST_request_get_chunks &at[72]
+
+#define ID2_PARAMS &at[12]
+#define ID2_PARAMS_E &at[13]
+
+#define ID2_REQUEST_GET_PACKAGES &at[26]
+#define ID2_REQUEST_GET_PACKAGES_names &at[27]
+#define REQUEST_GET_PACKAGES_names_E &at[28]
+#define GET_PACKAGES_no_contents &at[29]
+
+#define ID2_REQUEST_GET_SEQ_ID &at[31]
+#define ID2_REQUEST_GET_SEQ_ID_seq_id &at[32]
+#define REQUEST_GET_SEQ_ID_seq_id_type &at[37]
+
+#define ID2_REQUEST_GET_BLOB_ID &at[39]
+#define ID2_REQUEST_GET_BLOB_ID_seq_id &at[40]
+#define ID2_REQUEST_GET_BLOB_ID_sources &at[41]
+#define REQUEST_GET_BLOB_ID_sources_E &at[42]
+#define REQUEST_GET_BLOB_ID_external &at[43]
+
+#define ID2_REQUEST_GET_BLOB_INFO &at[45]
+#define REQUEST_GET_BLOB_INFO_blob_id &at[46]
+#define GET_BLOB_INFO_blob_id_blob_id &at[47]
+#define GET_BLOB_INFO_blob_id_resolve &at[53]
+#define INFO_blob_id_resolve_request &at[54]
+#define blob_id_resolve_exclude_blobs &at[55]
+#define id_resolve_exclude_blobs_E &at[56]
+#define GET_BLOB_INFO_get_seq_ids &at[57]
+#define REQUEST_GET_BLOB_INFO_get_data &at[58]
+
+#define ID2_REQUEST_REGET_BLOB &at[68]
+#define ID2_REQUEST_REGET_BLOB_blob_id &at[69]
+#define REGET_BLOB_split_version &at[70]
+#define ID2_REQUEST_REGET_BLOB_offset &at[71]
+
+#define ID2S_REQUEST_GET_CHUNKS &at[73]
+#define ID2S_REQUEST_GET_CHUNKS_blob_id &at[74]
+#define ID2S_REQUEST_GET_CHUNKS_chunks &at[75]
+#define REQUEST_GET_CHUNKS_chunks_E &at[76]
+#define GET_CHUNKS_split_version &at[77]
+
+#define ID2_SEQ_ID &at[33]
+#define ID2_SEQ_ID_string &at[34]
+#define ID2_SEQ_ID_seq_id &at[35]
+
+#define ID2_BLOB_ID &at[48]
+#define ID2_BLOB_ID_sat &at[49]
+#define ID2_BLOB_ID_sub_sat &at[50]
+#define ID2_BLOB_ID_sat_key &at[51]
+#define ID2_BLOB_ID_version &at[52]
+
+#define ID2_GET_BLOB_DETAILS &at[59]
+#define ID2_GET_BLOB_DETAILS_location &at[60]
+#define BLOB_DETAILS_seq_class_level &at[61]
+#define GET_BLOB_DETAILS_descr_level &at[62]
+#define BLOB_DETAILS_descr_type_mask &at[63]
+#define BLOB_DETAILS_annot_type_mask &at[64]
+#define BLOB_DETAILS_feat_type_mask &at[65]
+#define BLOB_DETAILS_sequence_level &at[66]
+
+#define ID2_REPLY &at[78]
+#define ID2_REPLY_serial_number &at[79]
+#define ID2_REPLY_params &at[80]
+#define ID2_REPLY_error &at[81]
+#define ID2_REPLY_error_E &at[82]
+#define ID2_REPLY_end_of_reply &at[87]
+#define ID2_REPLY_reply &at[88]
+#define ID2_REPLY_reply_init &at[89]
+#define ID2_REPLY_reply_empty &at[90]
+#define ID2_REPLY_reply_get_package &at[91]
+#define ID2_REPLY_reply_get_seq_id &at[95]
+#define ID2_REPLY_reply_get_blob_id &at[101]
 #define REPLY_reply_get_blob_seq_ids &at[110]
 #define ID2_REPLY_reply_get_blob &at[121]
-#define ID2_REPLY_reply_reget_blob &at[126]
-#define ID2_REPLY_reply_get_split_info &at[132]
-#define ID2_REPLY_reply_get_chunk &at[137]
-#define ID2_REPLY_discard &at[142]
-
-#define ID2_ERROR &at[82]
-#define ID2_ERROR_severity &at[83]
-#define ID2_ERROR_retry_delay &at[84]
-#define ID2_ERROR_message &at[85]
-
-#define ID2_REPLY_GET_PACKAGE &at[91]
-#define ID2_REPLY_GET_PACKAGE_name &at[92]
-#define ID2_REPLY_GET_PACKAGE_params &at[93]
-
-#define ID2_REPLY_GET_SEQ_ID &at[95]
-#define ID2_REPLY_GET_SEQ_ID_request &at[96]
-#define ID2_REPLY_GET_SEQ_ID_seq_id &at[97]
-#define ID2_REPLY_GET_SEQ_ID_seq_id_E &at[98]
-#define REPLY_GET_SEQ_ID_end_of_reply &at[99]
-
-#define ID2_REPLY_GET_BLOB_ID &at[101]
-#define ID2_REPLY_GET_BLOB_ID_seq_id &at[102]
-#define ID2_REPLY_GET_BLOB_ID_blob_id &at[103]
-#define GET_BLOB_ID_split_version &at[104]
-#define REPLY_GET_BLOB_ID_annot_info &at[105]
-#define REPLY_GET_BLOB_ID_annot_info_E &at[106]
-#define REPLY_GET_BLOB_ID_end_of_reply &at[107]
-#define REPLY_GET_BLOB_ID_blob_state &at[108]
+#define ID2_REPLY_reply_reget_blob &at[127]
+#define ID2_REPLY_reply_get_split_info &at[133]
+#define ID2_REPLY_reply_get_chunk &at[139]
+#define ID2_REPLY_discard &at[144]
+
+#define ID2_ERROR &at[83]
+#define ID2_ERROR_severity &at[84]
+#define ID2_ERROR_retry_delay &at[85]
+#define ID2_ERROR_message &at[86]
+
+#define ID2_REPLY_GET_PACKAGE &at[92]
+#define ID2_REPLY_GET_PACKAGE_name &at[93]
+#define ID2_REPLY_GET_PACKAGE_params &at[94]
+
+#define ID2_REPLY_GET_SEQ_ID &at[96]
+#define ID2_REPLY_GET_SEQ_ID_request &at[97]
+#define ID2_REPLY_GET_SEQ_ID_seq_id &at[98]
+#define ID2_REPLY_GET_SEQ_ID_seq_id_E &at[99]
+#define REPLY_GET_SEQ_ID_end_of_reply &at[100]
+
+#define ID2_REPLY_GET_BLOB_ID &at[102]
+#define ID2_REPLY_GET_BLOB_ID_seq_id &at[103]
+#define ID2_REPLY_GET_BLOB_ID_blob_id &at[104]
+#define GET_BLOB_ID_split_version &at[105]
+#define REPLY_GET_BLOB_ID_annot_info &at[106]
+#define REPLY_GET_BLOB_ID_annot_info_E &at[107]
+#define REPLY_GET_BLOB_ID_end_of_reply &at[108]
+#define REPLY_GET_BLOB_ID_blob_state &at[109]
 
 #define ID2_REPLY_GET_BLOB_SEQ_IDS &at[111]
 #define REPLY_GET_BLOB_SEQ_IDS_blob_id &at[112]
@@ -364,24 +371,24 @@ static AsnModulePtr amp = ampx;
 #define ID2_REPLY_GET_BLOB_blob_id &at[123]
 #define REPLY_GET_BLOB_split_version &at[124]
 #define ID2_REPLY_GET_BLOB_data &at[125]
+#define ID2_REPLY_GET_BLOB_blob_state &at[126]
 
-#define ID2_REPLY_REGET_BLOB &at[127]
-#define ID2_REPLY_REGET_BLOB_blob_id &at[128]
-#define REPLY_REGET_BLOB_split_version &at[129]
-#define ID2_REPLY_REGET_BLOB_offset &at[130]
-#define ID2_REPLY_REGET_BLOB_data &at[131]
-
-#define ID2S_REPLY_GET_SPLIT_INFO &at[133]
-#define REPLY_GET_SPLIT_INFO_blob_id &at[134]
-#define GET_SPLIT_INFO_split_version &at[135]
-#define ID2S_REPLY_GET_SPLIT_INFO_data &at[136]
+#define ID2_REPLY_REGET_BLOB &at[128]
+#define ID2_REPLY_REGET_BLOB_blob_id &at[129]
+#define REPLY_REGET_BLOB_split_version &at[130]
+#define ID2_REPLY_REGET_BLOB_offset &at[131]
+#define ID2_REPLY_REGET_BLOB_data &at[132]
 
-#define ID2S_REPLY_GET_CHUNK &at[138]
-#define ID2S_REPLY_GET_CHUNK_blob_id &at[139]
-#define ID2S_REPLY_GET_CHUNK_chunk_id &at[140]
-#define ID2S_REPLY_GET_CHUNK_data &at[141]
+#define ID2S_REPLY_GET_SPLIT_INFO &at[134]
+#define REPLY_GET_SPLIT_INFO_blob_id &at[135]
+#define GET_SPLIT_INFO_split_version &at[136]
+#define ID2S_REPLY_GET_SPLIT_INFO_data &at[137]
+#define GET_SPLIT_INFO_blob_state &at[138]
 
-#define ID2_BLOB_STATE &at[109]
+#define ID2S_REPLY_GET_CHUNK &at[140]
+#define ID2S_REPLY_GET_CHUNK_blob_id &at[141]
+#define ID2S_REPLY_GET_CHUNK_chunk_id &at[142]
+#define ID2S_REPLY_GET_CHUNK_data &at[143]
 
 #define ID2_REPLY_DATA &at[114]
 #define ID2_REPLY_DATA_data_type &at[115]
@@ -390,15 +397,15 @@ static AsnModulePtr amp = ampx;
 #define ID2_REPLY_DATA_data &at[118]
 #define ID2_REPLY_DATA_data_E &at[119]
 
-#define ID2_BLOB_SEQ_IDS &at[143]
-#define ID2_BLOB_SEQ_IDS_E &at[144]
+#define ID2_BLOB_SEQ_IDS &at[145]
+#define ID2_BLOB_SEQ_IDS_E &at[146]
 
-#define ID2_BLOB_SEQ_ID &at[145]
-#define ID2_BLOB_SEQ_ID_seq_id &at[146]
-#define ID2_BLOB_SEQ_ID_replaced &at[147]
+#define ID2_BLOB_SEQ_ID &at[147]
+#define ID2_BLOB_SEQ_ID_seq_id &at[148]
+#define ID2_BLOB_SEQ_ID_replaced &at[149]
 
-#define ID2_PARAM &at[12]
-#define ID2_PARAM_name &at[13]
-#define ID2_PARAM_value &at[15]
-#define ID2_PARAM_value_E &at[16]
-#define ID2_PARAM_type &at[18]
+#define ID2_PARAM &at[14]
+#define ID2_PARAM_name &at[15]
+#define ID2_PARAM_value &at[17]
+#define ID2_PARAM_value_E &at[18]
+#define ID2_PARAM_type &at[20]
diff --git a/network/id2arch/id2.patch b/network/id2arch/id2.patch
index 069fb0e2..07649f2a 100644
--- a/network/id2arch/id2.patch
+++ b/network/id2arch/id2.patch
@@ -1,143 +1,82 @@
-*** id2.c	Thu Jan  7 15:08:05 2010
---- id2.c.new	Thu Jan  7 13:58:12 2010
-*************** ID2ReplyAsnRead(AsnIoPtr aip, AsnTypePtr
-*** 2766,2772 ****
-        if ( AsnReadVal(aip, atp, &av) <= 0) {
+*** id2.c	Tue Apr 14 10:59:39 2015
+--- id2.c.new	Tue Apr 14 10:59:30 2015
+*************** ID2ReplyAsnWrite(ID2ReplyPtr ptr, AsnIoP
+*** 2972,2978 ****
            goto erret;
         }
-!       ptr -> end_of_reply = av.boolvalue;
-        atp = AsnReadId(aip,amp, atp);
      }
-     if (atp == ID2_REPLY_reply) {
---- 2766,2772 ----
-        if ( AsnReadVal(aip, atp, &av) <= 0) {
-           goto erret;
-        }
-!       ptr -> end_of_reply = TRUE;
-        atp = AsnReadId(aip,amp, atp);
+!    if (ptr -> discard != -1) {
+        av.intvalue = ptr -> discard;
+        retval = AsnWrite(aip, ID2_REPLY_discard,  &av);
      }
-     if (atp == ID2_REPLY_reply) {
-*************** ID2ReplyAsnRead(AsnIoPtr aip, AsnTypePtr
-*** 2782,2787 ****
---- 2782,2789 ----
+--- 2972,2978 ----
+           goto erret;
         }
-        ptr -> discard = av.intvalue;
-        atp = AsnReadId(aip,amp, atp);
-+    } else {
-+       ptr -> discard = -1;
      }
-  
-     if (AsnReadVal(aip, atp, &av) <= 0) {
-*************** ID2ReplyAsnWrite(ID2ReplyPtr ptr, AsnIoP
-*** 2961,2975 ****
-        }
+!    if (ptr -> discard != (Uint2)-1) {
+        av.intvalue = ptr -> discard;
+        retval = AsnWrite(aip, ID2_REPLY_discard,  &av);
      }
-     AsnGenericUserSeqOfAsnWrite(ptr -> error, (AsnWriteFunc) ID2ErrorAsnWrite, aip, ID2_REPLY_error, ID2_REPLY_error_E);
-!    av.boolvalue = ptr -> end_of_reply;
-!    retval = AsnWrite(aip, ID2_REPLY_end_of_reply,  &av);
-     if (ptr -> Reply_reply != NULL) {
-        if ( ! Reply_replyAsnWrite(ptr -> Reply_reply, aip, ID2_REPLY_reply)) {
-           goto erret;
-        }
+*************** ID2ReplyGetBlobIdAsnWrite(ID2ReplyGetBlo
+*** 3793,3800 ****
+        av.boolvalue = ptr -> end_of_reply;
+        retval = AsnWrite(aip, REPLY_GET_BLOB_ID_end_of_reply,  &av);
      }
-!    av.intvalue = ptr -> discard;
-!    retval = AsnWrite(aip, ID2_REPLY_discard,  &av);
+!    av.intvalue = ptr -> blob_state;
+!    retval = AsnWrite(aip, REPLY_GET_BLOB_ID_blob_state,  &av);
      if (! AsnCloseStruct(aip, atp, (Pointer)ptr)) {
         goto erret;
      }
---- 2963,2981 ----
-        }
+--- 3793,3802 ----
+        av.boolvalue = ptr -> end_of_reply;
+        retval = AsnWrite(aip, REPLY_GET_BLOB_ID_end_of_reply,  &av);
      }
-     AsnGenericUserSeqOfAsnWrite(ptr -> error, (AsnWriteFunc) ID2ErrorAsnWrite, aip, ID2_REPLY_error, ID2_REPLY_error_E);
-!    if (ptr -> end_of_reply) {
-!       av.boolvalue = ptr -> end_of_reply;
-!       retval = AsnWrite(aip, ID2_REPLY_end_of_reply,  &av);
-!    }
-     if (ptr -> Reply_reply != NULL) {
-        if ( ! Reply_replyAsnWrite(ptr -> Reply_reply, aip, ID2_REPLY_reply)) {
-           goto erret;
-        }
-     }
-!    if (ptr -> discard != -1) {
-!       av.intvalue = ptr -> discard;
-!       retval = AsnWrite(aip, ID2_REPLY_discard,  &av);
+!    if (ptr -> blob_state != 0) {
+!        av.intvalue = ptr -> blob_state;
+!        retval = AsnWrite(aip, REPLY_GET_BLOB_ID_blob_state,  &av);
 !    }
      if (! AsnCloseStruct(aip, atp, (Pointer)ptr)) {
         goto erret;
      }
-*************** ID2ReplyGetSeqIdAsnRead(AsnIoPtr aip, As
-*** 3517,3523 ****
-        if ( AsnReadVal(aip, atp, &av) <= 0) {
-           goto erret;
-        }
-!       ptr -> end_of_reply = av.boolvalue;
-        atp = AsnReadId(aip,amp, atp);
-     }
-  
---- 3523,3529 ----
-        if ( AsnReadVal(aip, atp, &av) <= 0) {
+*************** ID2ReplyGetBlobAsnWrite(ID2ReplyGetBlobP
+*** 4150,4157 ****
            goto erret;
         }
-!       ptr -> end_of_reply = TRUE;
-        atp = AsnReadId(aip,amp, atp);
      }
-  
-*************** ID2ReplyGetSeqIdAsnWrite(ID2ReplyGetSeqI
-*** 3577,3584 ****
-        }
-     }
-     AsnGenericChoiceSeqOfAsnWrite(ptr -> seq_id, (AsnWriteFunc) SeqIdAsnWrite, aip, ID2_REPLY_GET_SEQ_ID_seq_id, ID2_REPLY_GET_SEQ_ID_seq_id_E);
-!    av.boolvalue = ptr -> end_of_reply;
-!    retval = AsnWrite(aip, REPLY_GET_SEQ_ID_end_of_reply,  &av);
+!    av.intvalue = ptr -> blob_state;
+!    retval = AsnWrite(aip, ID2_REPLY_GET_BLOB_blob_state,  &av);
      if (! AsnCloseStruct(aip, atp, (Pointer)ptr)) {
         goto erret;
      }
---- 3583,3592 ----
+--- 4152,4161 ----
+           goto erret;
         }
      }
-     AsnGenericChoiceSeqOfAsnWrite(ptr -> seq_id, (AsnWriteFunc) SeqIdAsnWrite, aip, ID2_REPLY_GET_SEQ_ID_seq_id, ID2_REPLY_GET_SEQ_ID_seq_id_E);
-!    if (ptr -> end_of_reply) {
-!       av.boolvalue = ptr -> end_of_reply;
-!       retval = AsnWrite(aip, REPLY_GET_SEQ_ID_end_of_reply,  &av);
+!    if (ptr -> blob_state != 0) {
+!        av.intvalue = ptr -> blob_state;
+!        retval = AsnWrite(aip, ID2_REPLY_GET_BLOB_blob_state,  &av);
 !    }
      if (! AsnCloseStruct(aip, atp, (Pointer)ptr)) {
         goto erret;
      }
-*************** ID2ReplyGetBlobIdAsnRead(AsnIoPtr aip, A
-*** 3707,3713 ****
-        if ( AsnReadVal(aip, atp, &av) <= 0) {
+*************** ID2SReplyGetSplitInfoAsnWrite(ID2SReplyG
+*** 4524,4531 ****
            goto erret;
         }
-!       ptr -> end_of_reply = av.boolvalue;
-        atp = AsnReadId(aip,amp, atp);
      }
-     if (atp == REPLY_GET_BLOB_ID_blob_state) {
---- 3715,3721 ----
-        if ( AsnReadVal(aip, atp, &av) <= 0) {
+!    av.intvalue = ptr -> blob_state;
+!    retval = AsnWrite(aip, GET_SPLIT_INFO_blob_state,  &av);
+     if (! AsnCloseStruct(aip, atp, (Pointer)ptr)) {
+        goto erret;
+     }
+--- 4528,4537 ----
            goto erret;
         }
-!       ptr -> end_of_reply = TRUE;
-        atp = AsnReadId(aip,amp, atp);
      }
-     if (atp == REPLY_GET_BLOB_ID_blob_state) {
-*************** ID2ReplyGetBlobIdAsnWrite(ID2ReplyGetBlo
-*** 3781,3788 ****
-     av.intvalue = ptr -> split_version;
-     retval = AsnWrite(aip, GET_BLOB_ID_split_version,  &av);
-     AsnGenericUserSeqOfAsnWrite(ptr -> annot_info, (AsnWriteFunc) ID2SSeqAnnotInfoAsnWrite, aip, REPLY_GET_BLOB_ID_annot_info, REPLY_GET_BLOB_ID_annot_info_E);
-!    av.boolvalue = ptr -> end_of_reply;
-!    retval = AsnWrite(aip, REPLY_GET_BLOB_ID_end_of_reply,  &av);
-     av.intvalue = ptr -> blob_state;
-     retval = AsnWrite(aip, REPLY_GET_BLOB_ID_blob_state,  &av);
-     if (! AsnCloseStruct(aip, atp, (Pointer)ptr)) {
---- 3789,3798 ----
-     av.intvalue = ptr -> split_version;
-     retval = AsnWrite(aip, GET_BLOB_ID_split_version,  &av);
-     AsnGenericUserSeqOfAsnWrite(ptr -> annot_info, (AsnWriteFunc) ID2SSeqAnnotInfoAsnWrite, aip, REPLY_GET_BLOB_ID_annot_info, REPLY_GET_BLOB_ID_annot_info_E);
-!    if (ptr -> end_of_reply) {
-!       av.boolvalue = ptr -> end_of_reply;
-!       retval = AsnWrite(aip, REPLY_GET_BLOB_ID_end_of_reply,  &av);
+!    if (ptr -> blob_state != 0) {
+!        av.intvalue = ptr -> blob_state;
+!        retval = AsnWrite(aip, GET_SPLIT_INFO_blob_state,  &av);
 !    }
-     av.intvalue = ptr -> blob_state;
-     retval = AsnWrite(aip, REPLY_GET_BLOB_ID_blob_state,  &av);
      if (! AsnCloseStruct(aip, atp, (Pointer)ptr)) {
+        goto erret;
+     }
diff --git a/network/id2arch/id2gen.h b/network/id2arch/id2gen.h
index 033b9797..be8b841b 100644
--- a/network/id2arch/id2gen.h
+++ b/network/id2arch/id2gen.h
@@ -21,6 +21,14 @@ extern "C" { /* } */
 
 NLM_EXTERN Boolean LIBCALL
 id2genAsnLoad PROTO((void));
+/* following #defines are for enumerated type, not used by object loaders */
+#define ID2_Blob_State_live 0
+#define ID2_Blob_State_suppressed_temp 1
+#define ID2_Blob_State_suppressed 2
+#define ID2_Blob_State_dead 3
+#define ID2_Blob_State_protected__ 4
+#define ID2_Blob_State_withdrawn 5
+
 
 
 /**************************************************
@@ -28,9 +36,9 @@ id2genAsnLoad PROTO((void));
 *    ID2RequestPacket
 *
 **************************************************/
-typedef struct struct_ID2Request ID2RequestPacket;
-typedef struct struct_ID2Request PNTR ID2RequestPacketPtr;
-#define ID2RequestPacketNew() ID2RequestNew() 
+typedef struct struct_ID2_Request ID2RequestPacket;
+typedef struct struct_ID2_Request PNTR ID2RequestPacketPtr;
+#define ID2RequestPacketNew() ID2_RequestNew() 
 
 #ifdef NLM_GENERATED_CODE_PROTO
 
@@ -92,9 +100,9 @@ static Boolean LIBCALL Request_requestAsnWrite PROTO (( Request_requestPtr , Asn
 *    ID2Params
 *
 **************************************************/
-typedef struct struct_ID2Param ID2Params;
-typedef struct struct_ID2Param PNTR ID2ParamsPtr;
-#define ID2ParamsNew() ID2ParamNew() 
+typedef struct struct_ID2_Param ID2Params;
+typedef struct struct_ID2_Param PNTR ID2ParamsPtr;
+#define ID2ParamsNew() ID2_ParamNew() 
 
 #ifdef NLM_GENERATED_CODE_PROTO
 
@@ -282,7 +290,7 @@ typedef struct struct_ID2_Blob_Id {
    struct struct_ID2_Blob_Id PNTR next;
    Int4   sat;
    Int4   sub_sat;
-   Int4   sat_key;
+   BIG_ID sat_key; /* There is a case (CId2Server::Reply_get_blob_id()) where PubSeqOS stores gi here */
    Int4   version;
 } ID2BlobId, PNTR ID2BlobIdPtr;
 
@@ -454,7 +462,7 @@ typedef struct struct_ID2_Reply_Get_Blob_Id {
    Int4   split_version;
    struct struct_ID2S_Seq_annot_Info PNTR   annot_info;
    Uint1   end_of_reply;
-   Uint2   blob_state;
+   Int4   blob_state;
 } ID2ReplyGetBlobId, PNTR ID2ReplyGetBlobIdPtr;
 
 
@@ -492,6 +500,7 @@ typedef struct struct_ID2_Reply_Get_Blob {
    struct struct_ID2_Blob_Id PNTR   blob_id;
    Int4   split_version;
    struct struct_ID2_Reply_Data PNTR   data;
+   Int4   blob_state;
 } ID2ReplyGetBlob, PNTR ID2ReplyGetBlobPtr;
 
 
@@ -531,6 +540,7 @@ typedef struct struct_ID2S_Reply_Get_Split_Info {
    struct struct_ID2_Blob_Id PNTR   blob_id;
    Int4   split_version;
    struct struct_ID2_Reply_Data PNTR   data;
+   Int4   blob_state;
 } ID2SReplyGetSplitInfo, PNTR ID2SReplyGetSplitInfoPtr;
 
 
@@ -558,14 +568,6 @@ NLM_EXTERN ID2SReplyGetChunkPtr LIBCALL ID2SReplyGetChunkNew PROTO (( void ));
 NLM_EXTERN ID2SReplyGetChunkPtr LIBCALL ID2SReplyGetChunkAsnRead PROTO (( AsnIoPtr, AsnTypePtr));
 NLM_EXTERN Boolean LIBCALL ID2SReplyGetChunkAsnWrite PROTO (( ID2SReplyGetChunkPtr , AsnIoPtr, AsnTypePtr));
 
-/* following #defines are for enumerated type, not used by object loaders */
-#define ID2_Blob_State_live 0
-#define ID2_Blob_State_suppressed_temp 1
-#define ID2_Blob_State_suppressed 2
-#define ID2_Blob_State_dead 3
-#define ID2_Blob_State_protected__ 4
-#define ID2_Blob_State_withdrawn 5
-
 
 
 /**************************************************
@@ -593,9 +595,9 @@ NLM_EXTERN Boolean LIBCALL ID2ReplyDataAsnWrite PROTO (( ID2ReplyDataPtr , AsnIo
 *    ID2BlobSeqIds
 *
 **************************************************/
-typedef struct struct_ID2BlobSeqId ID2BlobSeqIds;
-typedef struct struct_ID2BlobSeqId PNTR ID2BlobSeqIdsPtr;
-#define ID2BlobSeqIdsNew() ID2BlobSeqIdNew() 
+typedef struct struct_ID2_Blob_Seq_id ID2BlobSeqIds;
+typedef struct struct_ID2_Blob_Seq_id PNTR ID2BlobSeqIdsPtr;
+#define ID2BlobSeqIdsNew() ID2_Blob_Seq_idNew() 
 
 #ifdef NLM_GENERATED_CODE_PROTO
 
diff --git a/network/id2arch/id2sgen.c b/network/id2arch/id2sgen.c
index db2ee5a6..19913bcd 100644
--- a/network/id2arch/id2sgen.c
+++ b/network/id2arch/id2sgen.c
@@ -2152,6 +2152,7 @@ ID2SSeqFeatIdsInfoFree(ID2SSeqFeatIdsInfoPtr ptr)
    AsnGenericUserSeqOfFree(ptr -> feat_types, (AsnOptFreeFunc) ID2SFeatTypeInfoFree);
    AsnGenericUserSeqOfFree(ptr -> xref_types, (AsnOptFreeFunc) ID2SFeatTypeInfoFree);
    AsnGenericBaseSeqOfFree(ptr -> local_ids ,ASNCODE_INTVAL_SLOT);
+   AsnGenericBaseSeqOfFree(ptr -> local_str_ids ,ASNCODE_PTRVAL_SLOT);
    return MemFree(ptr);
 }
 
@@ -2224,6 +2225,13 @@ ID2SSeqFeatIdsInfoAsnRead(AsnIoPtr aip, AsnTypePtr orig)
       }
       atp = AsnReadId(aip,amp, atp);
    }
+   if (atp == FEAT_IDS_INFO_local_str_ids) {
+      ptr -> local_str_ids = AsnGenericBaseSeqOfAsnRead(aip, amp, atp, ASNCODE_PTRVAL_SLOT, &isError);
+      if (isError && ptr -> local_str_ids == NULL) {
+         goto erret;
+      }
+      atp = AsnReadId(aip,amp, atp);
+   }
 
    if (AsnReadVal(aip, atp, &av) <= 0) {
       goto erret;
@@ -2278,6 +2286,7 @@ ID2SSeqFeatIdsInfoAsnWrite(ID2SSeqFeatIdsInfoPtr ptr, AsnIoPtr aip, AsnTypePtr o
    AsnGenericUserSeqOfAsnWrite(ptr -> feat_types, (AsnWriteFunc) ID2SFeatTypeInfoAsnWrite, aip, SEQ_FEAT_IDS_INFO_feat_types, SEQ_FEAT_IDS_INFO_feat_types_E);
    AsnGenericUserSeqOfAsnWrite(ptr -> xref_types, (AsnWriteFunc) ID2SFeatTypeInfoAsnWrite, aip, SEQ_FEAT_IDS_INFO_xref_types, SEQ_FEAT_IDS_INFO_xref_types_E);
    retval = AsnGenericBaseSeqOfAsnWrite(ptr -> local_ids ,ASNCODE_INTVAL_SLOT, aip, SEQ_FEAT_IDS_INFO_local_ids, SEQ_FEAT_IDS_INFO_local_ids_E);
+   retval = AsnGenericBaseSeqOfAsnWrite(ptr -> local_str_ids ,ASNCODE_PTRVAL_SLOT, aip, FEAT_IDS_INFO_local_str_ids, FEAT_IDS_INFO_local_str_ids_E);
    if (! AsnCloseStruct(aip, atp, (Pointer)ptr)) {
       goto erret;
    }
diff --git a/network/id2arch/id2sgen.h b/network/id2arch/id2sgen.h
index 950b0d40..e8cc489f 100644
--- a/network/id2arch/id2sgen.h
+++ b/network/id2arch/id2sgen.h
@@ -276,6 +276,7 @@ typedef struct struct_ID2S_Seq_feat_Ids_Info {
    struct struct_ID2S_Feat_type_Info PNTR   feat_types;
    struct struct_ID2S_Feat_type_Info PNTR   xref_types;
    ValNodePtr   local_ids;
+   ValNodePtr   local_str_ids;
 } ID2SSeqFeatIdsInfo, PNTR ID2SSeqFeatIdsInfoPtr;
 
 
diff --git a/network/id2arch/seqsplit.asn b/network/id2arch/seqsplit.asn
index d1b24322..8af86df3 100644
--- a/network/id2arch/seqsplit.asn
+++ b/network/id2arch/seqsplit.asn
@@ -1,4 +1,4 @@
---$Revision: 1.10 $
+--$Revision: 1.11 $
 --********************************************************************
 --
 --  Network Id server network access
@@ -21,8 +21,7 @@ EXPORTS ID2S-Chunk-Id, ID2S-Seq-annot-Info;
 IMPORTS Seq-id                                      FROM NCBI-Seqloc
         Seq-entry                                   FROM NCBI-Seqset
         Bioseq, Seq-annot, Seq-descr, Seq-literal   FROM NCBI-Sequence
-        Seq-align                                   FROM NCBI-Seqalign
-        Feat-id                                     FROM NCBI-Seqfeat;
+        Seq-align                                   FROM NCBI-Seqalign;
 
 ----------------------------------------------------------------------------
 -- Blob split info types
diff --git a/network/id2arch/seqsplit.h b/network/id2arch/seqsplit.h
index af22edcd..adc47935 100644
--- a/network/id2arch/seqsplit.h
+++ b/network/id2arch/seqsplit.h
@@ -9,14 +9,14 @@
 #include <asn.h>
 #endif
 
-static char * asnfilename = "seqsplit.h19";
+static char * asnfilename = "seqsplit.h11";
 static AsnValxNode avnx[4] = {
     {3,NULL,1,0.0,NULL } ,
     {3,NULL,1,0.0,NULL } ,
     {3,NULL,1,0.0,NULL } ,
     {3,NULL,1,0.0,NULL } };
 
-static AsnType atx[139] = {
+static AsnType atx[140] = {
   {401, "ID2S-Chunk-Id" ,1,0,0,0,0,1,0,0,NULL,&atx[1],NULL,0,&atx[2]} ,
   {302, "INTEGER" ,0,2,0,0,0,0,0,0,NULL,NULL,NULL,0,NULL} ,
   {402, "ID2S-Seq-annot-Info" ,1,0,0,0,0,1,0,0,NULL,&atx[15],&atx[3],0,&atx[20]} ,
@@ -27,41 +27,41 @@ static AsnType atx[139] = {
   {0, "graph" ,128,2,0,1,0,0,0,0,NULL,&atx[6],NULL,0,&atx[8]} ,
   {0, "feat" ,128,3,0,1,0,0,0,0,NULL,&atx[14],&atx[9],0,&atx[16]} ,
   {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[10],NULL,0,NULL} ,
-  {425, "ID2S-Feat-type-Info" ,1,0,0,0,0,0,0,0,NULL,&atx[15],&atx[11],0,&atx[17]} ,
+  {424, "ID2S-Feat-type-Info" ,1,0,0,0,0,0,0,0,NULL,&atx[15],&atx[11],0,&atx[17]} ,
   {0, "type" ,128,0,0,0,0,0,0,0,NULL,&atx[1],NULL,0,&atx[12]} ,
   {0, "subtypes" ,128,1,0,1,0,0,0,0,NULL,&atx[14],&atx[13],0,NULL} ,
   {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[1],NULL,0,NULL} ,
   {314, "SET OF" ,0,17,0,0,0,0,0,0,NULL,NULL,NULL,0,NULL} ,
   {311, "SEQUENCE" ,0,16,0,0,0,0,0,0,NULL,NULL,NULL,0,NULL} ,
   {0, "seq-loc" ,128,4,0,1,0,0,0,0,NULL,&atx[17],NULL,0,NULL} ,
-  {426, "ID2S-Seq-loc" ,1,0,0,0,0,0,0,0,NULL,&atx[50],&atx[18],0,&atx[115]} ,
+  {425, "ID2S-Seq-loc" ,1,0,0,0,0,0,0,0,NULL,&atx[50],&atx[18],0,&atx[116]} ,
   {0, "whole-gi" ,128,0,0,0,0,0,0,0,NULL,&atx[1],NULL,0,&atx[19]} ,
   {0, "whole-seq-id" ,128,1,0,0,0,0,0,0,NULL,&atx[20],NULL,0,&atx[21]} ,
   {403, "Seq-id" ,1,0,0,0,0,0,1,0,NULL,NULL,NULL,0,&atx[51]} ,
   {0, "whole-gi-range" ,128,2,0,0,0,0,0,0,NULL,&atx[22],NULL,0,&atx[25]} ,
-  {430, "ID2S-Gi-Range" ,1,0,0,0,0,0,0,0,NULL,&atx[15],&atx[23],0,&atx[26]} ,
+  {429, "ID2S-Gi-Range" ,1,0,0,0,0,0,0,0,NULL,&atx[15],&atx[23],0,&atx[26]} ,
   {0, "start" ,128,0,0,0,0,0,0,0,NULL,&atx[1],NULL,0,&atx[24]} ,
   {0, "count" ,128,1,0,0,1,0,0,0,&avnx[0],&atx[1],NULL,0,NULL} ,
   {0, "gi-interval" ,128,3,0,0,0,0,0,0,NULL,&atx[26],NULL,0,&atx[30]} ,
-  {431, "ID2S-Gi-Interval" ,1,0,0,0,0,0,0,0,NULL,&atx[15],&atx[27],0,&atx[31]} ,
+  {430, "ID2S-Gi-Interval" ,1,0,0,0,0,0,0,0,NULL,&atx[15],&atx[27],0,&atx[31]} ,
   {0, "gi" ,128,0,0,0,0,0,0,0,NULL,&atx[1],NULL,0,&atx[28]} ,
   {0, "start" ,128,1,0,0,0,0,0,0,NULL,&atx[1],NULL,0,&atx[29]} ,
   {0, "length" ,128,2,0,0,1,0,0,0,&avnx[1],&atx[1],NULL,0,NULL} ,
   {0, "seq-id-interval" ,128,4,0,0,0,0,0,0,NULL,&atx[31],NULL,0,&atx[35]} ,
-  {432, "ID2S-Seq-id-Interval" ,1,0,0,0,0,0,0,0,NULL,&atx[15],&atx[32],0,&atx[36]} ,
+  {431, "ID2S-Seq-id-Interval" ,1,0,0,0,0,0,0,0,NULL,&atx[15],&atx[32],0,&atx[36]} ,
   {0, "seq-id" ,128,0,0,0,0,0,0,0,NULL,&atx[20],NULL,0,&atx[33]} ,
   {0, "start" ,128,1,0,0,0,0,0,0,NULL,&atx[1],NULL,0,&atx[34]} ,
   {0, "length" ,128,2,0,0,1,0,0,0,&avnx[2],&atx[1],NULL,0,NULL} ,
   {0, "gi-ints" ,128,5,0,0,0,0,0,0,NULL,&atx[36],NULL,0,&atx[43]} ,
-  {433, "ID2S-Gi-Ints" ,1,0,0,0,0,0,0,0,NULL,&atx[15],&atx[37],0,&atx[44]} ,
+  {432, "ID2S-Gi-Ints" ,1,0,0,0,0,0,0,0,NULL,&atx[15],&atx[37],0,&atx[44]} ,
   {0, "gi" ,128,0,0,0,0,0,0,0,NULL,&atx[1],NULL,0,&atx[38]} ,
   {0, "ints" ,128,1,0,0,0,0,0,0,NULL,&atx[14],&atx[39],0,NULL} ,
   {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[40],NULL,0,NULL} ,
-  {435, "ID2S-Interval" ,1,0,0,0,0,0,0,0,NULL,&atx[15],&atx[41],0,NULL} ,
+  {434, "ID2S-Interval" ,1,0,0,0,0,0,0,0,NULL,&atx[15],&atx[41],0,NULL} ,
   {0, "start" ,128,0,0,0,0,0,0,0,NULL,&atx[1],NULL,0,&atx[42]} ,
   {0, "length" ,128,1,0,0,1,0,0,0,&avnx[3],&atx[1],NULL,0,NULL} ,
   {0, "seq-id-ints" ,128,6,0,0,0,0,0,0,NULL,&atx[44],NULL,0,&atx[48]} ,
-  {434, "ID2S-Seq-id-Ints" ,1,0,0,0,0,0,0,0,NULL,&atx[15],&atx[45],0,&atx[40]} ,
+  {433, "ID2S-Seq-id-Ints" ,1,0,0,0,0,0,0,0,NULL,&atx[15],&atx[45],0,&atx[40]} ,
   {0, "seq-id" ,128,0,0,0,0,0,0,0,NULL,&atx[20],NULL,0,&atx[46]} ,
   {0, "ints" ,128,1,0,0,0,0,0,0,NULL,&atx[14],&atx[47],0,NULL} ,
   {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[40],NULL,0,NULL} ,
@@ -74,91 +74,92 @@ static AsnType atx[139] = {
   {407, "Seq-descr" ,1,0,0,0,0,0,1,0,NULL,NULL,NULL,0,&atx[55]} ,
   {408, "Seq-literal" ,1,0,0,0,0,0,1,0,NULL,NULL,NULL,0,&atx[56]} ,
   {409, "Seq-align" ,1,0,0,0,0,0,1,0,NULL,NULL,NULL,0,&atx[57]} ,
-  {410, "Feat-id" ,1,0,0,0,0,0,1,0,NULL,NULL,NULL,0,&atx[58]} ,
-  {411, "ID2S-Split-Info" ,1,0,0,0,0,0,0,0,NULL,&atx[15],&atx[59],0,&atx[61]} ,
-  {0, "bioseqs-info" ,128,0,0,1,0,0,0,0,NULL,&atx[14],&atx[60],0,&atx[73]} ,
-  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[61],NULL,0,NULL} ,
-  {412, "ID2S-Bioseqs-Info" ,1,0,0,0,0,0,0,0,NULL,&atx[15],&atx[62],0,&atx[75]} ,
-  {0, "info" ,128,0,0,0,0,0,0,0,NULL,&atx[63],NULL,0,&atx[67]} ,
-  {414, "ID2S-Bioseq-Info" ,1,0,0,0,0,0,0,0,NULL,&atx[15],&atx[64],0,&atx[68]} ,
-  {0, "gap-count" ,128,0,0,1,0,0,0,0,NULL,&atx[1],NULL,0,&atx[65]} ,
-  {0, "seq-map-has-ref" ,128,1,0,1,0,0,0,0,NULL,&atx[66],NULL,0,NULL} ,
+  {410, "ID2S-Split-Info" ,1,0,0,0,0,0,0,0,NULL,&atx[15],&atx[58],0,&atx[60]} ,
+  {0, "bioseqs-info" ,128,0,0,1,0,0,0,0,NULL,&atx[14],&atx[59],0,&atx[72]} ,
+  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[60],NULL,0,NULL} ,
+  {411, "ID2S-Bioseqs-Info" ,1,0,0,0,0,0,0,0,NULL,&atx[15],&atx[61],0,&atx[74]} ,
+  {0, "info" ,128,0,0,0,0,0,0,0,NULL,&atx[62],NULL,0,&atx[66]} ,
+  {413, "ID2S-Bioseq-Info" ,1,0,0,0,0,0,0,0,NULL,&atx[15],&atx[63],0,&atx[67]} ,
+  {0, "gap-count" ,128,0,0,1,0,0,0,0,NULL,&atx[1],NULL,0,&atx[64]} ,
+  {0, "seq-map-has-ref" ,128,1,0,1,0,0,0,0,NULL,&atx[65],NULL,0,NULL} ,
   {301, "BOOLEAN" ,0,1,0,0,0,0,0,0,NULL,NULL,NULL,0,NULL} ,
-  {0, "bioseqs" ,128,1,0,0,0,0,0,0,NULL,&atx[68],NULL,0,NULL} ,
-  {415, "ID2S-Bioseq-Ids" ,1,0,0,0,0,0,0,0,NULL,&atx[14],&atx[69],0,&atx[79]} ,
-  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[50],&atx[70],0,NULL} ,
-  {0, "gi" ,128,0,0,0,0,0,0,0,NULL,&atx[1],NULL,0,&atx[71]} ,
-  {0, "seq-id" ,128,1,0,0,0,0,0,0,NULL,&atx[20],NULL,0,&atx[72]} ,
+  {0, "bioseqs" ,128,1,0,0,0,0,0,0,NULL,&atx[67],NULL,0,NULL} ,
+  {414, "ID2S-Bioseq-Ids" ,1,0,0,0,0,0,0,0,NULL,&atx[14],&atx[68],0,&atx[78]} ,
+  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[50],&atx[69],0,NULL} ,
+  {0, "gi" ,128,0,0,0,0,0,0,0,NULL,&atx[1],NULL,0,&atx[70]} ,
+  {0, "seq-id" ,128,1,0,0,0,0,0,0,NULL,&atx[20],NULL,0,&atx[71]} ,
   {0, "gi-range" ,128,2,0,0,0,0,0,0,NULL,&atx[22],NULL,0,NULL} ,
-  {0, "chunks" ,128,1,0,0,0,0,0,0,NULL,&atx[14],&atx[74],0,&atx[114]} ,
-  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[75],NULL,0,NULL} ,
-  {413, "ID2S-Chunk-Info" ,1,0,0,0,0,0,0,0,NULL,&atx[15],&atx[76],0,&atx[63]} ,
-  {0, "id" ,128,0,0,0,0,0,0,0,NULL,&atx[0],NULL,0,&atx[77]} ,
-  {0, "content" ,128,1,0,0,0,0,0,0,NULL,&atx[14],&atx[78],0,NULL} ,
-  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[79],NULL,0,NULL} ,
-  {416, "ID2S-Chunk-Content" ,1,0,0,0,0,0,0,0,NULL,&atx[50],&atx[80],0,&atx[81]} ,
-  {0, "seq-descr" ,128,0,0,0,0,0,0,0,NULL,&atx[81],NULL,0,&atx[87]} ,
-  {417, "ID2S-Seq-descr-Info" ,1,0,0,0,0,0,0,0,NULL,&atx[15],&atx[82],0,&atx[89]} ,
-  {0, "type-mask" ,128,0,0,0,0,0,0,0,NULL,&atx[1],NULL,0,&atx[83]} ,
-  {0, "bioseqs" ,128,1,0,1,0,0,0,0,NULL,&atx[68],NULL,0,&atx[84]} ,
-  {0, "bioseq-sets" ,128,2,0,1,0,0,0,0,NULL,&atx[85],NULL,0,NULL} ,
-  {424, "ID2S-Bioseq-set-Ids" ,1,0,0,0,0,0,0,0,NULL,&atx[14],&atx[86],0,&atx[10]} ,
+  {0, "chunks" ,128,1,0,0,0,0,0,0,NULL,&atx[14],&atx[73],0,&atx[115]} ,
+  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[74],NULL,0,NULL} ,
+  {412, "ID2S-Chunk-Info" ,1,0,0,0,0,0,0,0,NULL,&atx[15],&atx[75],0,&atx[62]} ,
+  {0, "id" ,128,0,0,0,0,0,0,0,NULL,&atx[0],NULL,0,&atx[76]} ,
+  {0, "content" ,128,1,0,0,0,0,0,0,NULL,&atx[14],&atx[77],0,NULL} ,
+  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[78],NULL,0,NULL} ,
+  {415, "ID2S-Chunk-Content" ,1,0,0,0,0,0,0,0,NULL,&atx[50],&atx[79],0,&atx[80]} ,
+  {0, "seq-descr" ,128,0,0,0,0,0,0,0,NULL,&atx[80],NULL,0,&atx[86]} ,
+  {416, "ID2S-Seq-descr-Info" ,1,0,0,0,0,0,0,0,NULL,&atx[15],&atx[81],0,&atx[88]} ,
+  {0, "type-mask" ,128,0,0,0,0,0,0,0,NULL,&atx[1],NULL,0,&atx[82]} ,
+  {0, "bioseqs" ,128,1,0,1,0,0,0,0,NULL,&atx[67],NULL,0,&atx[83]} ,
+  {0, "bioseq-sets" ,128,2,0,1,0,0,0,0,NULL,&atx[84],NULL,0,NULL} ,
+  {423, "ID2S-Bioseq-set-Ids" ,1,0,0,0,0,0,0,0,NULL,&atx[14],&atx[85],0,&atx[10]} ,
   {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[1],NULL,0,NULL} ,
-  {0, "seq-annot" ,128,1,0,0,0,0,0,0,NULL,&atx[2],NULL,0,&atx[88]} ,
-  {0, "seq-assembly" ,128,2,0,0,0,0,0,0,NULL,&atx[89],NULL,0,&atx[91]} ,
-  {418, "ID2S-Seq-assembly-Info" ,1,0,0,0,0,0,0,0,NULL,&atx[15],&atx[90],0,&atx[92]} ,
-  {0, "bioseqs" ,128,0,0,0,0,0,0,0,NULL,&atx[68],NULL,0,NULL} ,
-  {0, "seq-map" ,128,3,0,0,0,0,0,0,NULL,&atx[92],NULL,0,&atx[93]} ,
-  {419, "ID2S-Seq-map-Info" ,1,0,0,0,0,0,0,0,NULL,&atx[17],NULL,0,&atx[94]} ,
-  {0, "seq-data" ,128,4,0,0,0,0,0,0,NULL,&atx[94],NULL,0,&atx[95]} ,
-  {420, "ID2S-Seq-data-Info" ,1,0,0,0,0,0,0,0,NULL,&atx[17],NULL,0,&atx[96]} ,
-  {0, "seq-annot-place" ,128,5,0,0,0,0,0,0,NULL,&atx[96],NULL,0,&atx[100]} ,
-  {421, "ID2S-Seq-annot-place-Info" ,1,0,0,0,0,0,0,0,NULL,&atx[15],&atx[97],0,&atx[102]} ,
-  {0, "name" ,128,0,0,1,0,0,0,0,NULL,&atx[4],NULL,0,&atx[98]} ,
-  {0, "bioseqs" ,128,1,0,1,0,0,0,0,NULL,&atx[68],NULL,0,&atx[99]} ,
-  {0, "bioseq-sets" ,128,2,0,1,0,0,0,0,NULL,&atx[85],NULL,0,NULL} ,
-  {0, "bioseq-place" ,128,6,0,0,0,0,0,0,NULL,&atx[14],&atx[101],0,&atx[105]} ,
-  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[102],NULL,0,NULL} ,
-  {422, "ID2S-Bioseq-place-Info" ,1,0,0,0,0,0,0,0,NULL,&atx[15],&atx[103],0,&atx[107]} ,
-  {0, "bioseq-set" ,128,0,0,0,0,0,0,0,NULL,&atx[1],NULL,0,&atx[104]} ,
-  {0, "seq-ids" ,128,1,0,0,0,0,0,0,NULL,&atx[68],NULL,0,NULL} ,
-  {0, "feat-ids" ,128,7,0,0,0,0,0,0,NULL,&atx[14],&atx[106],0,NULL} ,
-  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[107],NULL,0,NULL} ,
-  {423, "ID2S-Seq-feat-Ids-Info" ,1,0,0,0,0,0,0,0,NULL,&atx[15],&atx[108],0,&atx[85]} ,
-  {0, "feat-types" ,128,0,0,1,0,0,0,0,NULL,&atx[14],&atx[109],0,&atx[110]} ,
+  {0, "seq-annot" ,128,1,0,0,0,0,0,0,NULL,&atx[2],NULL,0,&atx[87]} ,
+  {0, "seq-assembly" ,128,2,0,0,0,0,0,0,NULL,&atx[88],NULL,0,&atx[90]} ,
+  {417, "ID2S-Seq-assembly-Info" ,1,0,0,0,0,0,0,0,NULL,&atx[15],&atx[89],0,&atx[91]} ,
+  {0, "bioseqs" ,128,0,0,0,0,0,0,0,NULL,&atx[67],NULL,0,NULL} ,
+  {0, "seq-map" ,128,3,0,0,0,0,0,0,NULL,&atx[91],NULL,0,&atx[92]} ,
+  {418, "ID2S-Seq-map-Info" ,1,0,0,0,0,0,0,0,NULL,&atx[17],NULL,0,&atx[93]} ,
+  {0, "seq-data" ,128,4,0,0,0,0,0,0,NULL,&atx[93],NULL,0,&atx[94]} ,
+  {419, "ID2S-Seq-data-Info" ,1,0,0,0,0,0,0,0,NULL,&atx[17],NULL,0,&atx[95]} ,
+  {0, "seq-annot-place" ,128,5,0,0,0,0,0,0,NULL,&atx[95],NULL,0,&atx[99]} ,
+  {420, "ID2S-Seq-annot-place-Info" ,1,0,0,0,0,0,0,0,NULL,&atx[15],&atx[96],0,&atx[101]} ,
+  {0, "name" ,128,0,0,1,0,0,0,0,NULL,&atx[4],NULL,0,&atx[97]} ,
+  {0, "bioseqs" ,128,1,0,1,0,0,0,0,NULL,&atx[67],NULL,0,&atx[98]} ,
+  {0, "bioseq-sets" ,128,2,0,1,0,0,0,0,NULL,&atx[84],NULL,0,NULL} ,
+  {0, "bioseq-place" ,128,6,0,0,0,0,0,0,NULL,&atx[14],&atx[100],0,&atx[104]} ,
+  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[101],NULL,0,NULL} ,
+  {421, "ID2S-Bioseq-place-Info" ,1,0,0,0,0,0,0,0,NULL,&atx[15],&atx[102],0,&atx[106]} ,
+  {0, "bioseq-set" ,128,0,0,0,0,0,0,0,NULL,&atx[1],NULL,0,&atx[103]} ,
+  {0, "seq-ids" ,128,1,0,0,0,0,0,0,NULL,&atx[67],NULL,0,NULL} ,
+  {0, "feat-ids" ,128,7,0,0,0,0,0,0,NULL,&atx[14],&atx[105],0,NULL} ,
+  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[106],NULL,0,NULL} ,
+  {422, "ID2S-Seq-feat-Ids-Info" ,1,0,0,0,0,0,0,0,NULL,&atx[15],&atx[107],0,&atx[84]} ,
+  {0, "feat-types" ,128,0,0,1,0,0,0,0,NULL,&atx[14],&atx[108],0,&atx[109]} ,
   {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[10],NULL,0,NULL} ,
-  {0, "xref-types" ,128,1,0,1,0,0,0,0,NULL,&atx[14],&atx[111],0,&atx[112]} ,
+  {0, "xref-types" ,128,1,0,1,0,0,0,0,NULL,&atx[14],&atx[110],0,&atx[111]} ,
   {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[10],NULL,0,NULL} ,
-  {0, "local-ids" ,128,2,0,1,0,0,0,0,NULL,&atx[14],&atx[113],0,NULL} ,
+  {0, "local-ids" ,128,2,0,1,0,0,0,0,NULL,&atx[14],&atx[112],0,&atx[113]} ,
   {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[1],NULL,0,NULL} ,
+  {0, "local-str-ids" ,128,3,0,1,0,0,0,0,NULL,&atx[14],&atx[114],0,NULL} ,
+  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[4],NULL,0,NULL} ,
   {0, "skeleton" ,128,2,0,1,0,0,0,0,NULL,&atx[51],NULL,0,NULL} ,
-  {427, "ID2S-Chunk" ,1,0,0,0,0,0,0,0,NULL,&atx[15],&atx[116],0,&atx[118]} ,
-  {0, "data" ,128,0,0,0,0,0,0,0,NULL,&atx[14],&atx[117],0,NULL} ,
-  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[118],NULL,0,NULL} ,
-  {428, "ID2S-Chunk-Data" ,1,0,0,0,0,0,0,0,NULL,&atx[15],&atx[119],0,&atx[130]} ,
-  {0, "id" ,128,0,0,0,0,0,0,0,NULL,&atx[50],&atx[120],0,&atx[123]} ,
-  {0, "bioseq-set" ,128,0,0,0,0,0,0,0,NULL,&atx[1],NULL,0,&atx[121]} ,
-  {0, "gi" ,128,1,0,0,0,0,0,0,NULL,&atx[1],NULL,0,&atx[122]} ,
+  {426, "ID2S-Chunk" ,1,0,0,0,0,0,0,0,NULL,&atx[15],&atx[117],0,&atx[119]} ,
+  {0, "data" ,128,0,0,0,0,0,0,0,NULL,&atx[14],&atx[118],0,NULL} ,
+  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[119],NULL,0,NULL} ,
+  {427, "ID2S-Chunk-Data" ,1,0,0,0,0,0,0,0,NULL,&atx[15],&atx[120],0,&atx[131]} ,
+  {0, "id" ,128,0,0,0,0,0,0,0,NULL,&atx[50],&atx[121],0,&atx[124]} ,
+  {0, "bioseq-set" ,128,0,0,0,0,0,0,0,NULL,&atx[1],NULL,0,&atx[122]} ,
+  {0, "gi" ,128,1,0,0,0,0,0,0,NULL,&atx[1],NULL,0,&atx[123]} ,
   {0, "seq-id" ,128,2,0,0,0,0,0,0,NULL,&atx[20],NULL,0,NULL} ,
-  {0, "descr" ,128,1,0,1,0,0,0,0,NULL,&atx[54],NULL,0,&atx[124]} ,
-  {0, "annots" ,128,2,0,1,0,0,0,0,NULL,&atx[14],&atx[125],0,&atx[126]} ,
+  {0, "descr" ,128,1,0,1,0,0,0,0,NULL,&atx[54],NULL,0,&atx[125]} ,
+  {0, "annots" ,128,2,0,1,0,0,0,0,NULL,&atx[14],&atx[126],0,&atx[127]} ,
   {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[53],NULL,0,NULL} ,
-  {0, "assembly" ,128,3,0,1,0,0,0,0,NULL,&atx[14],&atx[127],0,&atx[128]} ,
+  {0, "assembly" ,128,3,0,1,0,0,0,0,NULL,&atx[14],&atx[128],0,&atx[129]} ,
   {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[56],NULL,0,NULL} ,
-  {0, "seq-map" ,128,4,0,1,0,0,0,0,NULL,&atx[134],&atx[129],0,&atx[135]} ,
-  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[130],NULL,0,NULL} ,
-  {429, "ID2S-Sequence-Piece" ,1,0,0,0,0,0,0,0,NULL,&atx[15],&atx[131],0,&atx[22]} ,
-  {0, "start" ,128,0,0,0,0,0,0,0,NULL,&atx[1],NULL,0,&atx[132]} ,
-  {0, "data" ,128,1,0,0,0,0,0,0,NULL,&atx[134],&atx[133],0,NULL} ,
+  {0, "seq-map" ,128,4,0,1,0,0,0,0,NULL,&atx[135],&atx[130],0,&atx[136]} ,
+  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[131],NULL,0,NULL} ,
+  {428, "ID2S-Sequence-Piece" ,1,0,0,0,0,0,0,0,NULL,&atx[15],&atx[132],0,&atx[22]} ,
+  {0, "start" ,128,0,0,0,0,0,0,0,NULL,&atx[1],NULL,0,&atx[133]} ,
+  {0, "data" ,128,1,0,0,0,0,0,0,NULL,&atx[135],&atx[134],0,NULL} ,
   {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[55],NULL,0,NULL} ,
   {312, "SEQUENCE OF" ,0,16,0,0,0,0,0,0,NULL,NULL,NULL,0,NULL} ,
-  {0, "seq-data" ,128,5,0,1,0,0,0,0,NULL,&atx[134],&atx[136],0,&atx[137]} ,
-  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[130],NULL,0,NULL} ,
-  {0, "bioseqs" ,128,6,0,1,0,0,0,0,NULL,&atx[14],&atx[138],0,NULL} ,
+  {0, "seq-data" ,128,5,0,1,0,0,0,0,NULL,&atx[135],&atx[137],0,&atx[138]} ,
+  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[131],NULL,0,NULL} ,
+  {0, "bioseqs" ,128,6,0,1,0,0,0,0,NULL,&atx[14],&atx[139],0,NULL} ,
   {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[52],NULL,0,NULL} };
 
 static AsnModule ampx[1] = {
-  { "NCBI-Seq-split" , "seqsplit.h19",&atx[0],NULL,NULL,0,0} };
+  { "NCBI-Seq-split" , "seqsplit.h11",&atx[0],NULL,NULL,0,0} };
 
 static AsnValxNodePtr avn = avnx;
 static AsnTypePtr at = atx;
@@ -182,75 +183,77 @@ static AsnModulePtr amp = ampx;
 #define ID2S_SEQ_ANNOT_INFO_feat_E &at[9]
 #define ID2S_SEQ_ANNOT_INFO_seq_loc &at[16]
 
-#define ID2S_SPLIT_INFO &at[58]
-#define ID2S_SPLIT_INFO_bioseqs_info &at[59]
-#define ID2S_SPLIT_INFO_bioseqs_info_E &at[60]
-#define ID2S_SPLIT_INFO_chunks &at[73]
-#define ID2S_SPLIT_INFO_chunks_E &at[74]
-#define ID2S_SPLIT_INFO_skeleton &at[114]
-
-#define ID2S_BIOSEQS_INFO &at[61]
-#define ID2S_BIOSEQS_INFO_info &at[62]
-#define ID2S_BIOSEQS_INFO_bioseqs &at[67]
-
-#define ID2S_CHUNK_INFO &at[75]
-#define ID2S_CHUNK_INFO_id &at[76]
-#define ID2S_CHUNK_INFO_content &at[77]
-#define ID2S_CHUNK_INFO_content_E &at[78]
-
-#define ID2S_BIOSEQ_INFO &at[63]
-#define ID2S_BIOSEQ_INFO_gap_count &at[64]
-#define BIOSEQ_INFO_seq_map_has_ref &at[65]
-
-#define ID2S_BIOSEQ_IDS &at[68]
-#define ID2S_BIOSEQ_IDS_E &at[69]
-#define ID2S_BIOSEQ_IDS_E_gi &at[70]
-#define ID2S_BIOSEQ_IDS_E_seq_id &at[71]
-#define ID2S_BIOSEQ_IDS_E_gi_range &at[72]
-
-#define ID2S_CHUNK_CONTENT &at[79]
-#define ID2S_CHUNK_CONTENT_seq_descr &at[80]
-#define ID2S_CHUNK_CONTENT_seq_annot &at[87]
-#define ID2S_CHUNK_CONTENT_seq_assembly &at[88]
-#define ID2S_CHUNK_CONTENT_seq_map &at[91]
-#define ID2S_CHUNK_CONTENT_seq_data &at[93]
-#define CHUNK_CONTENT_seq_annot_place &at[95]
-#define ID2S_CHUNK_CONTENT_bioseq_place &at[100]
-#define CHUNK_CONTENT_bioseq_place_E &at[101]
-#define ID2S_CHUNK_CONTENT_feat_ids &at[105]
-#define ID2S_CHUNK_CONTENT_feat_ids_E &at[106]
-
-#define ID2S_SEQ_DESCR_INFO &at[81]
-#define ID2S_SEQ_DESCR_INFO_type_mask &at[82]
-#define ID2S_SEQ_DESCR_INFO_bioseqs &at[83]
-#define ID2S_SEQ_DESCR_INFO_bioseq_sets &at[84]
-
-#define ID2S_SEQ_ASSEMBLY_INFO &at[89]
-#define ID2S_SEQ_ASSEMBLY_INFO_bioseqs &at[90]
-
-#define ID2S_SEQ_MAP_INFO &at[92]
-
-#define ID2S_SEQ_DATA_INFO &at[94]
-
-#define ID2S_SEQ_ANNOT_PLACE_INFO &at[96]
-#define ID2S_SEQ_ANNOT_PLACE_INFO_name &at[97]
-#define SEQ_ANNOT_PLACE_INFO_bioseqs &at[98]
-#define ANNOT_PLACE_INFO_bioseq_sets &at[99]
-
-#define ID2S_BIOSEQ_PLACE_INFO &at[102]
-#define BIOSEQ_PLACE_INFO_bioseq_set &at[103]
-#define ID2S_BIOSEQ_PLACE_INFO_seq_ids &at[104]
-
-#define ID2S_SEQ_FEAT_IDS_INFO &at[107]
-#define SEQ_FEAT_IDS_INFO_feat_types &at[108]
-#define SEQ_FEAT_IDS_INFO_feat_types_E &at[109]
-#define SEQ_FEAT_IDS_INFO_xref_types &at[110]
-#define SEQ_FEAT_IDS_INFO_xref_types_E &at[111]
-#define SEQ_FEAT_IDS_INFO_local_ids &at[112]
-#define SEQ_FEAT_IDS_INFO_local_ids_E &at[113]
-
-#define ID2S_BIOSEQ_SET_IDS &at[85]
-#define ID2S_BIOSEQ_SET_IDS_E &at[86]
+#define ID2S_SPLIT_INFO &at[57]
+#define ID2S_SPLIT_INFO_bioseqs_info &at[58]
+#define ID2S_SPLIT_INFO_bioseqs_info_E &at[59]
+#define ID2S_SPLIT_INFO_chunks &at[72]
+#define ID2S_SPLIT_INFO_chunks_E &at[73]
+#define ID2S_SPLIT_INFO_skeleton &at[115]
+
+#define ID2S_BIOSEQS_INFO &at[60]
+#define ID2S_BIOSEQS_INFO_info &at[61]
+#define ID2S_BIOSEQS_INFO_bioseqs &at[66]
+
+#define ID2S_CHUNK_INFO &at[74]
+#define ID2S_CHUNK_INFO_id &at[75]
+#define ID2S_CHUNK_INFO_content &at[76]
+#define ID2S_CHUNK_INFO_content_E &at[77]
+
+#define ID2S_BIOSEQ_INFO &at[62]
+#define ID2S_BIOSEQ_INFO_gap_count &at[63]
+#define BIOSEQ_INFO_seq_map_has_ref &at[64]
+
+#define ID2S_BIOSEQ_IDS &at[67]
+#define ID2S_BIOSEQ_IDS_E &at[68]
+#define ID2S_BIOSEQ_IDS_E_gi &at[69]
+#define ID2S_BIOSEQ_IDS_E_seq_id &at[70]
+#define ID2S_BIOSEQ_IDS_E_gi_range &at[71]
+
+#define ID2S_CHUNK_CONTENT &at[78]
+#define ID2S_CHUNK_CONTENT_seq_descr &at[79]
+#define ID2S_CHUNK_CONTENT_seq_annot &at[86]
+#define ID2S_CHUNK_CONTENT_seq_assembly &at[87]
+#define ID2S_CHUNK_CONTENT_seq_map &at[90]
+#define ID2S_CHUNK_CONTENT_seq_data &at[92]
+#define CHUNK_CONTENT_seq_annot_place &at[94]
+#define ID2S_CHUNK_CONTENT_bioseq_place &at[99]
+#define CHUNK_CONTENT_bioseq_place_E &at[100]
+#define ID2S_CHUNK_CONTENT_feat_ids &at[104]
+#define ID2S_CHUNK_CONTENT_feat_ids_E &at[105]
+
+#define ID2S_SEQ_DESCR_INFO &at[80]
+#define ID2S_SEQ_DESCR_INFO_type_mask &at[81]
+#define ID2S_SEQ_DESCR_INFO_bioseqs &at[82]
+#define ID2S_SEQ_DESCR_INFO_bioseq_sets &at[83]
+
+#define ID2S_SEQ_ASSEMBLY_INFO &at[88]
+#define ID2S_SEQ_ASSEMBLY_INFO_bioseqs &at[89]
+
+#define ID2S_SEQ_MAP_INFO &at[91]
+
+#define ID2S_SEQ_DATA_INFO &at[93]
+
+#define ID2S_SEQ_ANNOT_PLACE_INFO &at[95]
+#define ID2S_SEQ_ANNOT_PLACE_INFO_name &at[96]
+#define SEQ_ANNOT_PLACE_INFO_bioseqs &at[97]
+#define ANNOT_PLACE_INFO_bioseq_sets &at[98]
+
+#define ID2S_BIOSEQ_PLACE_INFO &at[101]
+#define BIOSEQ_PLACE_INFO_bioseq_set &at[102]
+#define ID2S_BIOSEQ_PLACE_INFO_seq_ids &at[103]
+
+#define ID2S_SEQ_FEAT_IDS_INFO &at[106]
+#define SEQ_FEAT_IDS_INFO_feat_types &at[107]
+#define SEQ_FEAT_IDS_INFO_feat_types_E &at[108]
+#define SEQ_FEAT_IDS_INFO_xref_types &at[109]
+#define SEQ_FEAT_IDS_INFO_xref_types_E &at[110]
+#define SEQ_FEAT_IDS_INFO_local_ids &at[111]
+#define SEQ_FEAT_IDS_INFO_local_ids_E &at[112]
+#define FEAT_IDS_INFO_local_str_ids &at[113]
+#define FEAT_IDS_INFO_local_str_ids_E &at[114]
+
+#define ID2S_BIOSEQ_SET_IDS &at[84]
+#define ID2S_BIOSEQ_SET_IDS_E &at[85]
 
 #define ID2S_FEAT_TYPE_INFO &at[10]
 #define ID2S_FEAT_TYPE_INFO_type &at[11]
@@ -268,31 +271,31 @@ static AsnModulePtr amp = ampx;
 #define ID2S_SEQ_LOC_loc_set &at[48]
 #define ID2S_SEQ_LOC_loc_set_E &at[49]
 
-#define ID2S_CHUNK &at[115]
-#define ID2S_CHUNK_data &at[116]
-#define ID2S_CHUNK_data_E &at[117]
-
-#define ID2S_CHUNK_DATA &at[118]
-#define ID2S_CHUNK_DATA_id &at[119]
-#define ID2S_CHUNK_DATA_id_bioseq_set &at[120]
-#define ID2S_CHUNK_DATA_id_gi &at[121]
-#define ID2S_CHUNK_DATA_id_seq_id &at[122]
-#define ID2S_CHUNK_DATA_descr &at[123]
-#define ID2S_CHUNK_DATA_annots &at[124]
-#define ID2S_CHUNK_DATA_annots_E &at[125]
-#define ID2S_CHUNK_DATA_assembly &at[126]
-#define ID2S_CHUNK_DATA_assembly_E &at[127]
-#define ID2S_CHUNK_DATA_seq_map &at[128]
-#define ID2S_CHUNK_DATA_seq_map_E &at[129]
-#define ID2S_CHUNK_DATA_seq_data &at[135]
-#define ID2S_CHUNK_DATA_seq_data_E &at[136]
-#define ID2S_CHUNK_DATA_bioseqs &at[137]
-#define ID2S_CHUNK_DATA_bioseqs_E &at[138]
-
-#define ID2S_SEQUENCE_PIECE &at[130]
-#define ID2S_SEQUENCE_PIECE_start &at[131]
-#define ID2S_SEQUENCE_PIECE_data &at[132]
-#define ID2S_SEQUENCE_PIECE_data_E &at[133]
+#define ID2S_CHUNK &at[116]
+#define ID2S_CHUNK_data &at[117]
+#define ID2S_CHUNK_data_E &at[118]
+
+#define ID2S_CHUNK_DATA &at[119]
+#define ID2S_CHUNK_DATA_id &at[120]
+#define ID2S_CHUNK_DATA_id_bioseq_set &at[121]
+#define ID2S_CHUNK_DATA_id_gi &at[122]
+#define ID2S_CHUNK_DATA_id_seq_id &at[123]
+#define ID2S_CHUNK_DATA_descr &at[124]
+#define ID2S_CHUNK_DATA_annots &at[125]
+#define ID2S_CHUNK_DATA_annots_E &at[126]
+#define ID2S_CHUNK_DATA_assembly &at[127]
+#define ID2S_CHUNK_DATA_assembly_E &at[128]
+#define ID2S_CHUNK_DATA_seq_map &at[129]
+#define ID2S_CHUNK_DATA_seq_map_E &at[130]
+#define ID2S_CHUNK_DATA_seq_data &at[136]
+#define ID2S_CHUNK_DATA_seq_data_E &at[137]
+#define ID2S_CHUNK_DATA_bioseqs &at[138]
+#define ID2S_CHUNK_DATA_bioseqs_E &at[139]
+
+#define ID2S_SEQUENCE_PIECE &at[131]
+#define ID2S_SEQUENCE_PIECE_start &at[132]
+#define ID2S_SEQUENCE_PIECE_data &at[133]
+#define ID2S_SEQUENCE_PIECE_data_E &at[134]
 
 #define ID2S_GI_RANGE &at[22]
 #define ID2S_GI_RANGE_start &at[23]
diff --git a/network/medarch/client/mdrcherr.h b/network/medarch/client/mdrcherr.h
index e5c56bc9..8dc4f559 100644
--- a/network/medarch/client/mdrcherr.h
+++ b/network/medarch/client/mdrcherr.h
@@ -3,6 +3,11 @@
 *
 * RCS Modification History:
 * $Log: mdrcherr.h,v $
+* Revision 6.5  2013/12/05 18:05:35  bazhin
+* Performs MedArch lookup for in-press articles the same way as
+* it does for regular ones, with slightly different error messages
+* in case of success or failure.
+*
 * Revision 6.4  2011/04/14 19:28:40  kans
 * added ERR_REFERENCE_NoPmidJournalNotInPubMed
 *
@@ -53,6 +58,8 @@
 #define ERR_REFERENCE_SuccessfulPmidLookup  1,15
 #define ERR_REFERENCE_PmidNotFound  1,16
 #define ERR_REFERENCE_NoPmidJournalNotInPubMed  1,17
+#define ERR_REFERENCE_PmidNotFoundInPress  1,18
+#define ERR_REFERENCE_NoPmidJournalNotInPubMedInPress  1,19
 #define ERR_PRINT  2,0
 #define ERR_PRINT_Failed  2,1
 
diff --git a/network/medarch/client/medarch.msg b/network/medarch/client/medarch.msg
index c8b2b009..92b50554 100644
--- a/network/medarch/client/medarch.msg
+++ b/network/medarch/client/medarch.msg
@@ -17,5 +17,7 @@ $^   MedArchMatchIgnored, 14, SEV_ERROR
 $^   SuccessfulPmidLookup, 15, SEV_INFO
 $^   PmidNotFound, 16, SEV_WARNING
 $^   NoPmidJournalNotInPubMed, 17, SEV_INFO
+$^   PmidNotFoundInPress, 18, SEV_WARNING
+$^   NoPmidJournalNotInPubMedInPress, 19, SEV_INFO
 $$ PRINT, 2
 $^   Failed, 1, SEV_WARNING
diff --git a/network/medarch/client/medutil.c b/network/medarch/client/medutil.c
index 814f9ade..cc0bb104 100644
--- a/network/medarch/client/medutil.c
+++ b/network/medarch/client/medutil.c
@@ -28,7 +28,7 @@
 *   
 * Version Creation Date: 8/31/93
 *
-* $Revision: 6.38 $
+* $Revision: 6.42 $
 *
 * File Description:  Medline Utilities for MedArch
 *   Assumes user calls MedArchInit and Fini
@@ -138,14 +138,14 @@ static Boolean MUIsJournalIndexed (CharPtr journal)
   CompressSpaces (title);
 
   if (MULooksLikeISSN (title)) {
-    str = QUERY_UrlSynchronousQuery ("eutils.ncbi.nlm.nih.gov", 80,
+    str = QUERY_UrlSynchronousQuery ("eutils.ncbi.nlm.nih.gov", 0,
                                      "/entrez/eutils/esearch.fcgi",
                                      "db=nlmcatalog&retmax=200&term=",
                                      title, "%5Bissn%5D", NULL);
   }
 
   if (str == NULL) {
-    str = QUERY_UrlSynchronousQuery ("eutils.ncbi.nlm.nih.gov", 80,
+    str = QUERY_UrlSynchronousQuery ("eutils.ncbi.nlm.nih.gov", 0,
                                      "/entrez/eutils/esearch.fcgi",
                                      "db=nlmcatalog&retmax=200&term=",
                                      title, "%5Bmulti%5D+AND+ncbijournals%5Bsb%5D", NULL);
@@ -177,7 +177,7 @@ static Boolean MUIsJournalIndexed (CharPtr journal)
     microbiology reading, england
     */
 
-    str = QUERY_UrlSynchronousQuery ("eutils.ncbi.nlm.nih.gov", 80,
+    str = QUERY_UrlSynchronousQuery ("eutils.ncbi.nlm.nih.gov", 0,
                                      "/entrez/eutils/esearch.fcgi",
                                      "db=nlmcatalog&retmax=200&term=",
                                      title, "%5Bjour%5D", NULL);
@@ -211,7 +211,7 @@ static Boolean MUIsJournalIndexed (CharPtr journal)
 
   if (jids == NULL) return FALSE;
 
-  str = QUERY_UrlSynchronousQuery ("eutils.ncbi.nlm.nih.gov", 80,
+  str = QUERY_UrlSynchronousQuery ("eutils.ncbi.nlm.nih.gov", 0,
                                    "/entrez/eutils/esummary.fcgi",
                                    "db=nlmcatalog&retmax=200&version=2.0&id=",
                                    jids, NULL, NULL);
@@ -350,48 +350,69 @@ void print_pub(ValNodePtr pub, Boolean found, Boolean auth, Int4 muid)
     {
         yr = 0;
         dp = DateCurr();
-        if (dp != NULL) {
-          yr = (Int2) dp->data[1];
-          DateFree(dp);
-        }
-        if(year && yr + 1900 - year > 2)
+        if(dp != NULL)
         {
+            yr = (Int2) dp->data[1];
+            DateFree(dp);
+        }
+        if(year != 0 && yr + 1900 - year > 2)
             ErrPostEx(SEV_WARNING, ERR_REFERENCE_OldInPress, 
                       "encountered in-press article more than 2 years old: %s %s|%s|(%d)|%s|%s",
                       last, first, s_title, (int) year, vol, page);
-        }
     }
-    else
+
+    if(found != FALSE)
+        ErrPostEx(SEV_INFO, ERR_REFERENCE_SuccessfulPmidLookup,
+                  "%ld|%s %s|%s|(%d)|%s|%s", (long) muid, last, first,
+                  s_title, (int) year, vol, page);
+    else if(MUIsJournalIndexed(s_title))
     {
-        if(found)
+        if(muid == 0)
         {
-            ErrPostEx(SEV_INFO, ERR_REFERENCE_SuccessfulPmidLookup, 
-                      "%ld|%s %s|%s|(%d)|%s|%s", (long) muid, last, first,
-                      s_title, (int) year, vol, page);
-        }
-        else if (MUIsJournalIndexed (s_title))
-        {
-            if (muid == 0) {
-                ErrPostEx(SEV_WARNING, ERR_REFERENCE_PmidNotFound,  
+            if(imp != NULL && imp->prepub == 2) /* in-press */
+                ErrPostEx(SEV_WARNING, ERR_REFERENCE_PmidNotFoundInPress,
                           "%s %s|%s|(%d)|%s|%s", last, first, s_title,
                           (int) year, vol, page);
-            } else {
-                ErrPostEx(SEV_WARNING, ERR_REFERENCE_PmidNotFound,  
+            else
+                ErrPostEx(SEV_WARNING, ERR_REFERENCE_PmidNotFound,
+                          "%s %s|%s|(%d)|%s|%s", last, first, s_title,
+                          (int) year, vol, page);
+        }
+        else
+        {
+            if(imp != NULL && imp->prepub == 2) /* in-press */
+                ErrPostEx(SEV_WARNING, ERR_REFERENCE_PmidNotFoundInPress,
+                          ">>%ld<<|%s %s|%s|(%d)|%s|%s", (long) muid, last,
+                          first, s_title, (int) year, vol, page);
+            else
+                ErrPostEx(SEV_WARNING, ERR_REFERENCE_PmidNotFound,
                           ">>%ld<<|%s %s|%s|(%d)|%s|%s", (long) muid, last,
                           first, s_title, (int) year, vol, page);
-            }
         }
-        else
+    }
+    else
+    {
+        if(muid == 0)
         {
-            if (muid == 0) {
-                ErrPostEx(SEV_WARNING, ERR_REFERENCE_NoPmidJournalNotInPubMed,  
+            if(imp != NULL && imp->prepub == 2) /* in-press */
+                ErrPostEx(SEV_WARNING, ERR_REFERENCE_NoPmidJournalNotInPubMedInPress,
                           "%s %s|%s|(%d)|%s|%s", last, first, s_title,
                           (int) year, vol, page);
-            } else {
-                ErrPostEx(SEV_INFO, ERR_REFERENCE_NoPmidJournalNotInPubMed,  
+            else
+                ErrPostEx(SEV_WARNING, ERR_REFERENCE_NoPmidJournalNotInPubMed,
+                          "%s %s|%s|(%d)|%s|%s", last, first, s_title,
+                          (int) year, vol, page);
+        }
+        else
+        {
+            if(imp != NULL && imp->prepub == 2) /* in-press */
+                ErrPostEx(SEV_INFO, ERR_REFERENCE_NoPmidJournalNotInPubMedInPress,
+                          ">>%ld<<|%s %s|%s|(%d)|%s|%s", (long) muid, last,
+                          first, s_title, (int) year, vol, page);
+            else
+                ErrPostEx(SEV_INFO, ERR_REFERENCE_NoPmidJournalNotInPubMed,
                           ">>%ld<<|%s %s|%s|(%d)|%s|%s", (long) muid, last,
                           first, s_title, (int) year, vol, page);
-            }
         }
     }
 }
@@ -421,6 +442,10 @@ static Boolean ten_authors_compare(CitArtPtr capold, CitArtPtr capnew)
     old = capold->authors->names;
     new = capnew->authors->names;
 
+    for(i = 0; i < 10; i++) {
+      namesnew [i] = NULL;
+    }
+
     for(numnew = 0, vnp = old; vnp != NULL; vnp = vnp->next)
         if(vnp->data.ptrvalue != NULL)
             numnew++;
@@ -868,8 +893,7 @@ ValNodePtr FixPub(ValNodePtr pub, FindPubOptionPtr fpop)
             break;
         case PUB_Article:
             cit = pub->data.ptrvalue;
-            if(cit->from == 2 || in_press(cit)) /* article from book or
-                                                   in press */
+            if(cit->from == 2)          /* article from book */
                 return(pub);
 
             fpop->lookups_attempted++;
@@ -1133,7 +1157,7 @@ ValNodePtr FixPubEquiv(ValNodePtr pube, FindPubOptionPtr fpop)
         else if(tmp->choice == PUB_Article)
         {
             cit = tmp->data.ptrvalue;
-            if(cit->from == 2 || (in_press(cit) != FALSE && got == FALSE))
+            if(cit->from == 2)
                 otherptr = PubEquivAdd(otherptr, tmp);
             else
                 citartptr = PubEquivAdd(citartptr, tmp);
@@ -1491,15 +1515,17 @@ ValNodePtr MedlineToISO (ValNodePtr tmp)
     if(is_iso == FALSE)
     {
         titlenode = cjp->title;
-        title = (CharPtr) titlenode->data.ptrvalue;
-        titlenum = MedArchGetTitles(titles, types, title,
-                                    (Int1) titlenode->choice,
-                                    Cit_title_iso_jta, 1);
-        if(titlenum != 0)
-        {
-            MemFree(title);
-            titlenode->choice = types[0];
-            titlenode->data.ptrvalue = titles[0];
+        if (titlenode != NULL) {
+          title = (CharPtr) titlenode->data.ptrvalue;
+          titlenum = MedArchGetTitles(titles, types, title,
+                                      (Int1) titlenode->choice,
+                                      Cit_title_iso_jta, 1);
+          if(titlenum != 0)
+          {
+              MemFree(title);
+              titlenode->choice = types[0];
+              titlenode->data.ptrvalue = titles[0];
+          }
         }
     }
     ip = cjp->imp;                      /* remove Eng language */
diff --git a/network/nsclilib/ni_service.c b/network/nsclilib/ni_service.c
index 10f9c94c..69f32fb5 100644
--- a/network/nsclilib/ni_service.c
+++ b/network/nsclilib/ni_service.c
@@ -1,4 +1,4 @@
-/*  $RCSfile: ni_service.c,v $  $Revision: 6.28 $  $Date: 2012/02/19 03:45:25 $
+/*  $RCSfile: ni_service.c,v $  $Revision: 6.29 $  $Date: 2014/11/10 19:38:38 $
  * ==========================================================================
  *
  *                            PUBLIC DOMAIN NOTICE
@@ -30,6 +30,9 @@
  *
  * --------------------------------------------------------------------------
  * $Log: ni_service.c,v $
+ * Revision 6.29  2014/11/10 19:38:38  lavr
+ * -SRV_PROXY_HOST
+ *
  * Revision 6.28  2012/02/19 03:45:25  lavr
  * Cleanup of obsolete features
  *
@@ -145,7 +148,6 @@
 #define ENV_CONN_TRY        "SRV_CONN_TRY"
 #define ENV_HTTP_PROXY_HOST "SRV_HTTP_PROXY_HOST"
 #define ENV_HTTP_PROXY_PORT "SRV_HTTP_PROXY_PORT"
-#define ENV_PROXY_HOST      "SRV_PROXY_HOST"
 #define ENV_DEBUG_PRINTOUT  "SRV_DEBUG_PRINTOUT"
 #define ENV_NO_LB_DIRECT    "SRV_NO_LB_DIRECT"
 
@@ -241,11 +243,6 @@ static NI_HandPtr s_GenericGetService
     if (*str  &&  (val = atoi(str)) != 0)
         net_info->http_proxy_port = val;
 
-    /* alternate non-transparent CERN-like firewall proxy server */
-    NI_GetEnvParam(configFile, SRV_SECTION, ENV_PROXY_HOST,
-                   net_info->proxy_host, sizeof(net_info->proxy_host),
-                   def_info->proxy_host);
-
     /* alternate connection timeout */
     NI_GetEnvParam(configFile, SRV_SECTION, ENV_TIMEOUT,
                    str, sizeof(str), "");
diff --git a/network/taxon1/common/asntax1.h b/network/taxon1/common/asntax1.h
index 34ee471b..06ec5cc1 100644
--- a/network/taxon1/common/asntax1.h
+++ b/network/taxon1/common/asntax1.h
@@ -9,7 +9,7 @@
 #include <asn.h>
 #endif
 
-static char * asnfilename = "asntax1.h14";
+static char * asnfilename = "taxon1.h67";
 static AsnValxNode avnx[5] = {
     {20,"none" ,0,0.0,&avnx[1] } ,
     {20,"info" ,1,0.0,&avnx[2] } ,
@@ -17,9 +17,9 @@ static AsnValxNode avnx[5] = {
     {20,"error" ,3,0.0,&avnx[4] } ,
     {20,"fatal" ,4,0.0,NULL } };
 
-static AsnType atx[88] = {
+static AsnType atx[100] = {
   {401, "Org-ref" ,1,0,0,0,0,0,1,0,NULL,NULL,NULL,0,&atx[1]} ,
-  {402, "Taxon1-req" ,1,0,0,0,0,0,0,0,NULL,&atx[30],&atx[2],0,&atx[20]} ,
+  {402, "Taxon1-req" ,1,0,0,0,0,0,0,0,NULL,&atx[34],&atx[2],0,&atx[20]} ,
   {0, "init" ,128,0,0,0,0,0,0,0,NULL,&atx[3],NULL,0,&atx[4]} ,
   {305, "NULL" ,0,5,0,0,0,0,0,0,NULL,NULL,NULL,0,NULL} ,
   {0, "findname" ,128,1,0,0,0,0,0,0,NULL,&atx[5],NULL,0,&atx[6]} ,
@@ -38,7 +38,7 @@ static AsnType atx[88] = {
   {0, "getbyid" ,128,12,0,0,0,0,0,0,NULL,&atx[10],NULL,0,&atx[18]} ,
   {0, "lookup" ,128,13,0,0,0,0,0,0,NULL,&atx[0],NULL,0,&atx[19]} ,
   {0, "getorgmod" ,128,14,0,0,0,0,0,0,NULL,&atx[20],NULL,0,&atx[25]} ,
-  {403, "Taxon1-info" ,1,0,0,0,0,0,0,0,NULL,&atx[24],&atx[21],0,&atx[31]} ,
+  {403, "Taxon1-info" ,1,0,0,0,0,0,0,0,NULL,&atx[24],&atx[21],0,&atx[35]} ,
   {0, "ival1" ,128,0,0,0,0,0,0,0,NULL,&atx[10],NULL,0,&atx[22]} ,
   {0, "ival2" ,128,1,0,0,0,0,0,0,NULL,&atx[10],NULL,0,&atx[23]} ,
   {0, "sval" ,128,2,0,1,0,0,0,0,NULL,&atx[5],NULL,0,NULL} ,
@@ -47,68 +47,80 @@ static AsnType atx[88] = {
   {0, "id4gi" ,128,16,0,0,0,0,0,0,NULL,&atx[10],NULL,0,&atx[27]} ,
   {0, "taxachildren" ,128,17,0,0,0,0,0,0,NULL,&atx[10],NULL,0,&atx[28]} ,
   {0, "taxalineage" ,128,18,0,0,0,0,0,0,NULL,&atx[10],NULL,0,&atx[29]} ,
-  {0, "maxtaxid" ,128,19,0,0,0,0,0,0,NULL,&atx[3],NULL,0,NULL} ,
+  {0, "maxtaxid" ,128,19,0,0,0,0,0,0,NULL,&atx[3],NULL,0,&atx[30]} ,
+  {0, "getproptypes" ,128,20,0,0,0,0,0,0,NULL,&atx[3],NULL,0,&atx[31]} ,
+  {0, "getorgprop" ,128,21,0,0,0,0,0,0,NULL,&atx[20],NULL,0,&atx[32]} ,
+  {0, "searchname" ,128,22,0,0,0,0,0,0,NULL,&atx[20],NULL,0,&atx[33]} ,
+  {0, "dumpnames4class" ,128,23,0,0,0,0,0,0,NULL,&atx[10],NULL,0,NULL} ,
   {315, "CHOICE" ,0,-1,0,0,0,0,0,0,NULL,NULL,NULL,0,NULL} ,
-  {404, "Taxon1-resp" ,1,0,0,0,0,0,0,0,NULL,&atx[30],&atx[32],0,&atx[33]} ,
-  {0, "error" ,128,0,0,0,0,0,0,0,NULL,&atx[33],NULL,0,&atx[37]} ,
-  {405, "Taxon1-error" ,1,0,0,0,0,0,0,0,NULL,&atx[24],&atx[34],0,&atx[40]} ,
-  {0, "level" ,128,0,0,0,0,0,0,0,NULL,&atx[35],&avnx[0],0,&atx[36]} ,
+  {404, "Taxon1-resp" ,1,0,0,0,0,0,0,0,NULL,&atx[34],&atx[36],0,&atx[37]} ,
+  {0, "error" ,128,0,0,0,0,0,0,0,NULL,&atx[37],NULL,0,&atx[41]} ,
+  {405, "Taxon1-error" ,1,0,0,0,0,0,0,0,NULL,&atx[24],&atx[38],0,&atx[44]} ,
+  {0, "level" ,128,0,0,0,0,0,0,0,NULL,&atx[39],&avnx[0],0,&atx[40]} ,
   {310, "ENUMERATED" ,0,10,0,0,0,0,0,0,NULL,NULL,NULL,0,NULL} ,
   {0, "msg" ,128,1,0,1,0,0,0,0,NULL,&atx[5],NULL,0,NULL} ,
-  {0, "init" ,128,1,0,0,0,0,0,0,NULL,&atx[3],NULL,0,&atx[38]} ,
-  {0, "findname" ,128,2,0,0,0,0,0,0,NULL,&atx[45],&atx[39],0,&atx[46]} ,
-  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[40],NULL,0,NULL} ,
-  {406, "Taxon1-name" ,1,0,0,0,0,0,0,0,NULL,&atx[24],&atx[41],0,&atx[64]} ,
-  {0, "taxid" ,128,0,0,0,0,0,0,0,NULL,&atx[10],NULL,0,&atx[42]} ,
-  {0, "cde" ,128,1,0,0,0,0,0,0,NULL,&atx[10],NULL,0,&atx[43]} ,
-  {0, "oname" ,128,2,0,1,0,0,0,0,NULL,&atx[5],NULL,0,&atx[44]} ,
+  {0, "init" ,128,1,0,0,0,0,0,0,NULL,&atx[3],NULL,0,&atx[42]} ,
+  {0, "findname" ,128,2,0,0,0,0,0,0,NULL,&atx[49],&atx[43],0,&atx[50]} ,
+  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[44],NULL,0,NULL} ,
+  {406, "Taxon1-name" ,1,0,0,0,0,0,0,0,NULL,&atx[24],&atx[45],0,&atx[68]} ,
+  {0, "taxid" ,128,0,0,0,0,0,0,0,NULL,&atx[10],NULL,0,&atx[46]} ,
+  {0, "cde" ,128,1,0,0,0,0,0,0,NULL,&atx[10],NULL,0,&atx[47]} ,
+  {0, "oname" ,128,2,0,1,0,0,0,0,NULL,&atx[5],NULL,0,&atx[48]} ,
   {0, "uname" ,128,3,0,1,0,0,0,0,NULL,&atx[5],NULL,0,NULL} ,
   {314, "SET OF" ,0,17,0,0,0,0,0,0,NULL,NULL,NULL,0,NULL} ,
-  {0, "getdesignator" ,128,3,0,0,0,0,0,0,NULL,&atx[10],NULL,0,&atx[47]} ,
-  {0, "getunique" ,128,4,0,0,0,0,0,0,NULL,&atx[10],NULL,0,&atx[48]} ,
-  {0, "getidbyorg" ,128,5,0,0,0,0,0,0,NULL,&atx[10],NULL,0,&atx[49]} ,
-  {0, "getorgnames" ,128,6,0,0,0,0,0,0,NULL,&atx[45],&atx[50],0,&atx[51]} ,
-  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[40],NULL,0,NULL} ,
-  {0, "getcde" ,128,7,0,0,0,0,0,0,NULL,&atx[45],&atx[52],0,&atx[53]} ,
+  {0, "getdesignator" ,128,3,0,0,0,0,0,0,NULL,&atx[10],NULL,0,&atx[51]} ,
+  {0, "getunique" ,128,4,0,0,0,0,0,0,NULL,&atx[10],NULL,0,&atx[52]} ,
+  {0, "getidbyorg" ,128,5,0,0,0,0,0,0,NULL,&atx[10],NULL,0,&atx[53]} ,
+  {0, "getorgnames" ,128,6,0,0,0,0,0,0,NULL,&atx[49],&atx[54],0,&atx[55]} ,
+  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[44],NULL,0,NULL} ,
+  {0, "getcde" ,128,7,0,0,0,0,0,0,NULL,&atx[49],&atx[56],0,&atx[57]} ,
   {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[20],NULL,0,NULL} ,
-  {0, "getranks" ,128,8,0,0,0,0,0,0,NULL,&atx[45],&atx[54],0,&atx[55]} ,
+  {0, "getranks" ,128,8,0,0,0,0,0,0,NULL,&atx[49],&atx[58],0,&atx[59]} ,
   {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[20],NULL,0,NULL} ,
-  {0, "getdivs" ,128,9,0,0,0,0,0,0,NULL,&atx[45],&atx[56],0,&atx[57]} ,
+  {0, "getdivs" ,128,9,0,0,0,0,0,0,NULL,&atx[49],&atx[60],0,&atx[61]} ,
   {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[20],NULL,0,NULL} ,
-  {0, "getgcs" ,128,10,0,0,0,0,0,0,NULL,&atx[45],&atx[58],0,&atx[59]} ,
+  {0, "getgcs" ,128,10,0,0,0,0,0,0,NULL,&atx[49],&atx[62],0,&atx[63]} ,
   {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[20],NULL,0,NULL} ,
-  {0, "getlineage" ,128,11,0,0,0,0,0,0,NULL,&atx[45],&atx[60],0,&atx[61]} ,
+  {0, "getlineage" ,128,11,0,0,0,0,0,0,NULL,&atx[49],&atx[64],0,&atx[65]} ,
   {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[20],NULL,0,NULL} ,
-  {0, "getchildren" ,128,12,0,0,0,0,0,0,NULL,&atx[45],&atx[62],0,&atx[63]} ,
+  {0, "getchildren" ,128,12,0,0,0,0,0,0,NULL,&atx[49],&atx[66],0,&atx[67]} ,
   {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[20],NULL,0,NULL} ,
-  {0, "getbyid" ,128,13,0,0,0,0,0,0,NULL,&atx[64],NULL,0,&atx[70]} ,
-  {407, "Taxon1-data" ,1,0,0,0,0,0,0,0,NULL,&atx[24],&atx[65],0,&atx[76]} ,
-  {0, "org" ,128,0,0,1,0,0,0,0,NULL,&atx[0],NULL,0,&atx[66]} ,
-  {0, "div" ,128,1,0,0,0,0,0,0,NULL,&atx[5],NULL,0,&atx[67]} ,
-  {0, "embl-code" ,128,2,0,1,0,0,0,0,NULL,&atx[5],NULL,0,&atx[68]} ,
-  {0, "is-species-level" ,128,3,0,0,0,0,0,0,NULL,&atx[69],NULL,0,NULL} ,
+  {0, "getbyid" ,128,13,0,0,0,0,0,0,NULL,&atx[68],NULL,0,&atx[74]} ,
+  {407, "Taxon1-data" ,1,0,0,0,0,0,0,0,NULL,&atx[24],&atx[69],0,&atx[80]} ,
+  {0, "org" ,128,0,0,1,0,0,0,0,NULL,&atx[0],NULL,0,&atx[70]} ,
+  {0, "div" ,128,1,0,0,0,0,0,0,NULL,&atx[5],NULL,0,&atx[71]} ,
+  {0, "embl-code" ,128,2,0,1,0,0,0,0,NULL,&atx[5],NULL,0,&atx[72]} ,
+  {0, "is-species-level" ,128,3,0,0,0,0,0,0,NULL,&atx[73],NULL,0,NULL} ,
   {301, "BOOLEAN" ,0,1,0,0,0,0,0,0,NULL,NULL,NULL,0,NULL} ,
-  {0, "lookup" ,128,14,0,0,0,0,0,0,NULL,&atx[64],NULL,0,&atx[71]} ,
-  {0, "getorgmod" ,128,15,0,0,0,0,0,0,NULL,&atx[45],&atx[72],0,&atx[73]} ,
+  {0, "lookup" ,128,14,0,0,0,0,0,0,NULL,&atx[68],NULL,0,&atx[75]} ,
+  {0, "getorgmod" ,128,15,0,0,0,0,0,0,NULL,&atx[49],&atx[76],0,&atx[77]} ,
   {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[20],NULL,0,NULL} ,
-  {0, "fini" ,128,16,0,0,0,0,0,0,NULL,&atx[3],NULL,0,&atx[74]} ,
-  {0, "id4gi" ,128,17,0,0,0,0,0,0,NULL,&atx[10],NULL,0,&atx[75]} ,
-  {0, "taxabyid" ,128,18,0,0,0,0,0,0,NULL,&atx[76],NULL,0,&atx[83]} ,
-  {408, "Taxon2-data" ,1,0,0,0,0,0,0,0,NULL,&atx[24],&atx[77],0,NULL} ,
-  {0, "org" ,128,0,0,1,0,0,0,0,NULL,&atx[0],NULL,0,&atx[78]} ,
-  {0, "blast-name" ,128,1,0,1,0,0,0,0,NULL,&atx[80],&atx[79],0,&atx[81]} ,
+  {0, "fini" ,128,16,0,0,0,0,0,0,NULL,&atx[3],NULL,0,&atx[78]} ,
+  {0, "id4gi" ,128,17,0,0,0,0,0,0,NULL,&atx[10],NULL,0,&atx[79]} ,
+  {0, "taxabyid" ,128,18,0,0,0,0,0,0,NULL,&atx[80],NULL,0,&atx[87]} ,
+  {408, "Taxon2-data" ,1,0,0,0,0,0,0,0,NULL,&atx[24],&atx[81],0,NULL} ,
+  {0, "org" ,128,0,0,1,0,0,0,0,NULL,&atx[0],NULL,0,&atx[82]} ,
+  {0, "blast-name" ,128,1,0,1,0,0,0,0,NULL,&atx[84],&atx[83],0,&atx[85]} ,
   {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[5],NULL,0,NULL} ,
   {312, "SEQUENCE OF" ,0,16,0,0,0,0,0,0,NULL,NULL,NULL,0,NULL} ,
-  {0, "is-uncultured" ,128,2,0,0,0,0,0,0,NULL,&atx[69],NULL,0,&atx[82]} ,
-  {0, "is-species-level" ,128,3,0,0,0,0,0,0,NULL,&atx[69],NULL,0,NULL} ,
-  {0, "taxachildren" ,128,19,0,0,0,0,0,0,NULL,&atx[80],&atx[84],0,&atx[85]} ,
-  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[40],NULL,0,NULL} ,
-  {0, "taxalineage" ,128,20,0,0,0,0,0,0,NULL,&atx[80],&atx[86],0,&atx[87]} ,
-  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[40],NULL,0,NULL} ,
-  {0, "maxtaxid" ,128,21,0,0,0,0,0,0,NULL,&atx[10],NULL,0,NULL} };
+  {0, "is-uncultured" ,128,2,0,0,0,0,0,0,NULL,&atx[73],NULL,0,&atx[86]} ,
+  {0, "is-species-level" ,128,3,0,0,0,0,0,0,NULL,&atx[73],NULL,0,NULL} ,
+  {0, "taxachildren" ,128,19,0,0,0,0,0,0,NULL,&atx[84],&atx[88],0,&atx[89]} ,
+  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[44],NULL,0,NULL} ,
+  {0, "taxalineage" ,128,20,0,0,0,0,0,0,NULL,&atx[84],&atx[90],0,&atx[91]} ,
+  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[44],NULL,0,NULL} ,
+  {0, "maxtaxid" ,128,21,0,0,0,0,0,0,NULL,&atx[10],NULL,0,&atx[92]} ,
+  {0, "getproptypes" ,128,22,0,0,0,0,0,0,NULL,&atx[49],&atx[93],0,&atx[94]} ,
+  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[20],NULL,0,NULL} ,
+  {0, "getorgprop" ,128,23,0,0,0,0,0,0,NULL,&atx[49],&atx[95],0,&atx[96]} ,
+  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[20],NULL,0,NULL} ,
+  {0, "searchname" ,128,24,0,0,0,0,0,0,NULL,&atx[49],&atx[97],0,&atx[98]} ,
+  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[44],NULL,0,NULL} ,
+  {0, "dumpnames4class" ,128,25,0,0,0,0,0,0,NULL,&atx[49],&atx[99],0,NULL} ,
+  {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[44],NULL,0,NULL} };
 
 static AsnModule ampx[1] = {
-  { "NCBI-Taxon1" , "asntax1.h14",&atx[0],NULL,NULL,0,0} };
+  { "NCBI-Taxon1" , "taxon1.h67",&atx[0],NULL,NULL,0,0} };
 
 static AsnValxNodePtr avn = avnx;
 static AsnTypePtr at = atx;
@@ -143,66 +155,78 @@ static AsnModulePtr amp = ampx;
 #define TAXON1_REQ_taxachildren &at[27]
 #define TAXON1_REQ_taxalineage &at[28]
 #define TAXON1_REQ_maxtaxid &at[29]
+#define TAXON1_REQ_getproptypes &at[30]
+#define TAXON1_REQ_getorgprop &at[31]
+#define TAXON1_REQ_searchname &at[32]
+#define TAXON1_REQ_dumpnames4class &at[33]
 
 #define TAXON1_INFO &at[20]
 #define TAXON1_INFO_ival1 &at[21]
 #define TAXON1_INFO_ival2 &at[22]
 #define TAXON1_INFO_sval &at[23]
 
-#define TAXON1_RESP &at[31]
-#define TAXON1_RESP_error &at[32]
-#define TAXON1_RESP_init &at[37]
-#define TAXON1_RESP_findname &at[38]
-#define TAXON1_RESP_findname_E &at[39]
-#define TAXON1_RESP_getdesignator &at[46]
-#define TAXON1_RESP_getunique &at[47]
-#define TAXON1_RESP_getidbyorg &at[48]
-#define TAXON1_RESP_getorgnames &at[49]
-#define TAXON1_RESP_getorgnames_E &at[50]
-#define TAXON1_RESP_getcde &at[51]
-#define TAXON1_RESP_getcde_E &at[52]
-#define TAXON1_RESP_getranks &at[53]
-#define TAXON1_RESP_getranks_E &at[54]
-#define TAXON1_RESP_getdivs &at[55]
-#define TAXON1_RESP_getdivs_E &at[56]
-#define TAXON1_RESP_getgcs &at[57]
-#define TAXON1_RESP_getgcs_E &at[58]
-#define TAXON1_RESP_getlineage &at[59]
-#define TAXON1_RESP_getlineage_E &at[60]
-#define TAXON1_RESP_getchildren &at[61]
-#define TAXON1_RESP_getchildren_E &at[62]
-#define TAXON1_RESP_getbyid &at[63]
-#define TAXON1_RESP_lookup &at[70]
-#define TAXON1_RESP_getorgmod &at[71]
-#define TAXON1_RESP_getorgmod_E &at[72]
-#define TAXON1_RESP_fini &at[73]
-#define TAXON1_RESP_id4gi &at[74]
-#define TAXON1_RESP_taxabyid &at[75]
-#define TAXON1_RESP_taxachildren &at[83]
-#define TAXON1_RESP_taxachildren_E &at[84]
-#define TAXON1_RESP_taxalineage &at[85]
-#define TAXON1_RESP_taxalineage_E &at[86]
-#define TAXON1_RESP_maxtaxid &at[87]
+#define TAXON1_RESP &at[35]
+#define TAXON1_RESP_error &at[36]
+#define TAXON1_RESP_init &at[41]
+#define TAXON1_RESP_findname &at[42]
+#define TAXON1_RESP_findname_E &at[43]
+#define TAXON1_RESP_getdesignator &at[50]
+#define TAXON1_RESP_getunique &at[51]
+#define TAXON1_RESP_getidbyorg &at[52]
+#define TAXON1_RESP_getorgnames &at[53]
+#define TAXON1_RESP_getorgnames_E &at[54]
+#define TAXON1_RESP_getcde &at[55]
+#define TAXON1_RESP_getcde_E &at[56]
+#define TAXON1_RESP_getranks &at[57]
+#define TAXON1_RESP_getranks_E &at[58]
+#define TAXON1_RESP_getdivs &at[59]
+#define TAXON1_RESP_getdivs_E &at[60]
+#define TAXON1_RESP_getgcs &at[61]
+#define TAXON1_RESP_getgcs_E &at[62]
+#define TAXON1_RESP_getlineage &at[63]
+#define TAXON1_RESP_getlineage_E &at[64]
+#define TAXON1_RESP_getchildren &at[65]
+#define TAXON1_RESP_getchildren_E &at[66]
+#define TAXON1_RESP_getbyid &at[67]
+#define TAXON1_RESP_lookup &at[74]
+#define TAXON1_RESP_getorgmod &at[75]
+#define TAXON1_RESP_getorgmod_E &at[76]
+#define TAXON1_RESP_fini &at[77]
+#define TAXON1_RESP_id4gi &at[78]
+#define TAXON1_RESP_taxabyid &at[79]
+#define TAXON1_RESP_taxachildren &at[87]
+#define TAXON1_RESP_taxachildren_E &at[88]
+#define TAXON1_RESP_taxalineage &at[89]
+#define TAXON1_RESP_taxalineage_E &at[90]
+#define TAXON1_RESP_maxtaxid &at[91]
+#define TAXON1_RESP_getproptypes &at[92]
+#define TAXON1_RESP_getproptypes_E &at[93]
+#define TAXON1_RESP_getorgprop &at[94]
+#define TAXON1_RESP_getorgprop_E &at[95]
+#define TAXON1_RESP_searchname &at[96]
+#define TAXON1_RESP_searchname_E &at[97]
+#define TAXON1_RESP_dumpnames4class &at[98]
+#define TAXON1_RESP_dumpnames4class_E &at[99]
 
-#define TAXON1_ERROR &at[33]
-#define TAXON1_ERROR_level &at[34]
-#define TAXON1_ERROR_msg &at[36]
+#define TAXON1_ERROR &at[37]
+#define TAXON1_ERROR_level &at[38]
+#define TAXON1_ERROR_msg &at[40]
 
-#define TAXON1_NAME &at[40]
-#define TAXON1_NAME_taxid &at[41]
-#define TAXON1_NAME_cde &at[42]
-#define TAXON1_NAME_oname &at[43]
-#define TAXON1_NAME_uname &at[44]
+#define TAXON1_NAME &at[44]
+#define TAXON1_NAME_taxid &at[45]
+#define TAXON1_NAME_cde &at[46]
+#define TAXON1_NAME_oname &at[47]
+#define TAXON1_NAME_uname &at[48]
 
-#define TAXON1_DATA &at[64]
-#define TAXON1_DATA_org &at[65]
-#define TAXON1_DATA_div &at[66]
-#define TAXON1_DATA_embl_code &at[67]
-#define TAXON1_DATA_is_species_level &at[68]
+#define TAXON1_DATA &at[68]
+#define TAXON1_DATA_org &at[69]
+#define TAXON1_DATA_div &at[70]
+#define TAXON1_DATA_embl_code &at[71]
+#define TAXON1_DATA_is_species_level &at[72]
 
-#define TAXON2_DATA &at[76]
-#define TAXON2_DATA_org &at[77]
-#define TAXON2_DATA_blast_name &at[78]
-#define TAXON2_DATA_blast_name_E &at[79]
-#define TAXON2_DATA_is_uncultured &at[81]
-#define TAXON2_DATA_is_species_level &at[82]
+#define TAXON2_DATA &at[80]
+#define TAXON2_DATA_org &at[81]
+#define TAXON2_DATA_blast_name &at[82]
+#define TAXON2_DATA_blast_name_E &at[83]
+#define TAXON2_DATA_is_uncultured &at[85]
+#define TAXON2_DATA_is_species_level &at[86]
diff --git a/network/taxon1/common/objtax1.c b/network/taxon1/common/objtax1.c
index 9db06419..e0f0cacb 100644
--- a/network/taxon1/common/objtax1.c
+++ b/network/taxon1/common/objtax1.c
@@ -58,21 +58,17 @@ Taxon1ReqFree(ValNodePtr anp)
    default:
       break;
    case Taxon1Req_findname:
-      MemFree(anp -> data.ptrvalue);
-      break;
    case Taxon1Req_getdesignator:
-      MemFree(anp -> data.ptrvalue);
-      break;
    case Taxon1Req_getunique:
       MemFree(anp -> data.ptrvalue);
       break;
    case Taxon1Req_getidbyorg:
-      OrgRefFree(anp -> data.ptrvalue);
-      break;
    case Taxon1Req_lookup:
       OrgRefFree(anp -> data.ptrvalue);
       break;
    case Taxon1Req_getorgmod:
+   case Taxon1Req_getorgprop:
+   case Taxon1Req_searchname:
       Taxon1InfoFree(anp -> data.ptrvalue);
       break;
    }
@@ -262,6 +258,29 @@ Taxon1ReqAsnRead(AsnIoPtr aip, AsnTypePtr orig)
       }
       anp->data.boolvalue = av.boolvalue;
    }
+   else if (atp == TAXON1_REQ_getproptypes) {
+      choice = Taxon1Req_getproptypes;
+      if (AsnReadVal(aip, atp, &av) <= 0) {
+         goto erret;
+      }
+      anp->data.boolvalue = av.boolvalue;
+   }
+   else if (atp == TAXON1_REQ_getorgprop) {
+      choice = Taxon1Req_getorgprop;
+      func = (AsnReadFunc) Taxon1InfoAsnRead;
+   }
+   else if (atp == TAXON1_REQ_searchname) {
+      choice = Taxon1Req_searchname;
+      func = (AsnReadFunc) Taxon1InfoAsnRead;
+   }
+   else if (atp == TAXON1_REQ_dumpnames4class) {
+      choice = Taxon1Req_dumpnames4class;
+      if (AsnReadVal(aip, atp, &av) <= 0) {
+         goto erret;
+      }
+      anp->data.intvalue = av.intvalue;
+   }
+
    anp->choice = choice;
    if (func != NULL)
    {
@@ -403,6 +422,22 @@ Taxon1ReqAsnWrite(Taxon1ReqPtr anp, AsnIoPtr aip, AsnTypePtr orig)
       av.boolvalue = anp->data.boolvalue;
       retval = AsnWrite(aip, TAXON1_REQ_maxtaxid, &av);
       break;
+   case Taxon1Req_getproptypes:
+      av.boolvalue = anp->data.boolvalue;
+      retval = AsnWrite(aip, TAXON1_REQ_getproptypes, &av);
+      break;
+   case Taxon1Req_getorgprop:
+      writetype = TAXON1_REQ_getorgprop;
+      func = (AsnWriteFunc) Taxon1InfoAsnWrite;
+      break;
+   case Taxon1Req_searchname:
+      writetype = TAXON1_REQ_searchname;
+      func = (AsnWriteFunc) Taxon1InfoAsnWrite;
+      break;
+   case Taxon1Req_dumpnames4class:
+      av.intvalue = anp->data.intvalue;
+      retval = AsnWrite(aip, TAXON1_REQ_dumpnames4class, &av);
+      break;
    }
    if (writetype != NULL) {
       retval = (* func)(pnt, aip, writetype);   /* write it out */
@@ -614,46 +649,30 @@ Taxon1RespFree(ValNodePtr anp)
    case Taxon1Resp_error:
       Taxon1ErrorFree(anp -> data.ptrvalue);
       break;
-   case Taxon1Resp_findname:
-      AsnGenericUserSeqOfFree((Pointer) pnt, (AsnOptFreeFunc) Taxon1NameFree);
-      break;
-   case Taxon1Resp_getorgnames:
-      AsnGenericUserSeqOfFree((Pointer) pnt, (AsnOptFreeFunc) Taxon1NameFree);
-      break;
    case Taxon1Resp_getcde:
-      AsnGenericUserSeqOfFree((Pointer) pnt, (AsnOptFreeFunc) Taxon1InfoFree);
-      break;
    case Taxon1Resp_getranks:
-      AsnGenericUserSeqOfFree((Pointer) pnt, (AsnOptFreeFunc) Taxon1InfoFree);
-      break;
    case Taxon1Resp_getdivs:
-      AsnGenericUserSeqOfFree((Pointer) pnt, (AsnOptFreeFunc) Taxon1InfoFree);
-      break;
    case Taxon1Resp_getgcs:
-      AsnGenericUserSeqOfFree((Pointer) pnt, (AsnOptFreeFunc) Taxon1InfoFree);
-      break;
    case Taxon1Resp_getlineage:
-      AsnGenericUserSeqOfFree((Pointer) pnt, (AsnOptFreeFunc) Taxon1InfoFree);
-      break;
    case Taxon1Resp_getchildren:
+   case Taxon1Resp_getorgmod:
+   case Taxon1Resp_getproptypes:
+   case Taxon1Resp_getorgprop:
       AsnGenericUserSeqOfFree((Pointer) pnt, (AsnOptFreeFunc) Taxon1InfoFree);
       break;
    case Taxon1Resp_getbyid:
-      Taxon1DataFree(anp -> data.ptrvalue);
-      break;
    case Taxon1Resp_lookup:
       Taxon1DataFree(anp -> data.ptrvalue);
       break;
-   case Taxon1Resp_getorgmod:
-      AsnGenericUserSeqOfFree((Pointer) pnt, (AsnOptFreeFunc) Taxon1InfoFree);
-      break;
    case Taxon1Resp_taxabyid:
       Taxon2DataFree(anp -> data.ptrvalue);
       break;
+   case Taxon1Resp_findname:
+   case Taxon1Resp_getorgnames:
    case Taxon1Resp_taxachildren:
-      AsnGenericUserSeqOfFree((Pointer) pnt, (AsnOptFreeFunc) Taxon1NameFree);
-      break;
    case Taxon1Resp_taxalineage:
+   case Taxon1Resp_searchname:
+   case Taxon1Resp_dumpnames4class:
       AsnGenericUserSeqOfFree((Pointer) pnt, (AsnOptFreeFunc) Taxon1NameFree);
       break;
    }
@@ -865,6 +884,39 @@ Taxon1RespAsnRead(AsnIoPtr aip, AsnTypePtr orig)
       }
       anp->data.intvalue = av.intvalue;
    }
+   else if (atp == TAXON1_RESP_getproptypes) {
+      choice = Taxon1Resp_getproptypes;
+      anp -> data.ptrvalue =
+      AsnGenericUserSeqOfAsnRead(aip, amp, atp, &isError, (AsnReadFunc) Taxon1InfoAsnRead,             (AsnOptFreeFunc) Taxon1InfoFree);
+      if (isError && anp -> data.ptrvalue == NULL) {
+         goto erret;
+      }
+   }
+   else if (atp == TAXON1_RESP_getorgprop) {
+      choice = Taxon1Resp_getorgprop;
+      anp -> data.ptrvalue =
+      AsnGenericUserSeqOfAsnRead(aip, amp, atp, &isError, (AsnReadFunc) Taxon1InfoAsnRead,             (AsnOptFreeFunc) Taxon1InfoFree);
+      if (isError && anp -> data.ptrvalue == NULL) {
+         goto erret;
+      }
+   }
+   else if (atp == TAXON1_RESP_searchname) {
+      choice = Taxon1Resp_searchname;
+      anp -> data.ptrvalue =
+      AsnGenericUserSeqOfAsnRead(aip, amp, atp, &isError, (AsnReadFunc) Taxon1NameAsnRead,             (AsnOptFreeFunc) Taxon1NameFree);
+      if (isError && anp -> data.ptrvalue == NULL) {
+         goto erret;
+      }
+   }
+   else if (atp == TAXON1_RESP_dumpnames4class) {
+      choice = Taxon1Resp_dumpnames4class;
+      anp -> data.ptrvalue =
+      AsnGenericUserSeqOfAsnRead(aip, amp, atp, &isError, (AsnReadFunc) Taxon1NameAsnRead,             (AsnOptFreeFunc) Taxon1NameFree);
+      if (isError && anp -> data.ptrvalue == NULL) {
+         goto erret;
+      }
+   }
+
    anp->choice = choice;
    if (func != NULL)
    {
@@ -1003,6 +1055,18 @@ Taxon1RespAsnWrite(Taxon1RespPtr anp, AsnIoPtr aip, AsnTypePtr orig)
       av.intvalue = anp->data.intvalue;
       retval = AsnWrite(aip, TAXON1_RESP_maxtaxid, &av);
       break;
+   case Taxon1Resp_getproptypes:
+      retval = AsnGenericUserSeqOfAsnWrite((Pointer) pnt, (AsnWriteFunc) Taxon1InfoAsnWrite, aip, TAXON1_RESP_getproptypes, TAXON1_RESP_getproptypes_E);
+      break;
+   case Taxon1Resp_getorgprop:
+      retval = AsnGenericUserSeqOfAsnWrite((Pointer) pnt, (AsnWriteFunc) Taxon1InfoAsnWrite, aip, TAXON1_RESP_getorgprop, TAXON1_RESP_getorgprop_E);
+      break;
+   case Taxon1Resp_searchname:
+      retval = AsnGenericUserSeqOfAsnWrite((Pointer) pnt, (AsnWriteFunc) Taxon1NameAsnWrite, aip, TAXON1_RESP_searchname, TAXON1_RESP_searchname_E);
+      break;
+   case Taxon1Resp_dumpnames4class:
+      retval = AsnGenericUserSeqOfAsnWrite((Pointer) pnt, (AsnWriteFunc) Taxon1NameAsnWrite, aip, TAXON1_RESP_dumpnames4class, TAXON1_RESP_dumpnames4class_E);
+      break;
    }
    if (writetype != NULL) {
       retval = (* func)(pnt, aip, writetype);   /* write it out */
diff --git a/network/taxon1/common/objtax1.h b/network/taxon1/common/objtax1.h
index 3c818a12..6581f636 100644
--- a/network/taxon1/common/objtax1.h
+++ b/network/taxon1/common/objtax1.h
@@ -45,6 +45,10 @@ typedef ValNode Taxon1Req;
 #define Taxon1Req_taxachildren 18
 #define Taxon1Req_taxalineage 19
 #define Taxon1Req_maxtaxid 20
+#define Taxon1Req_getproptypes 21
+#define Taxon1Req_getorgprop 22
+#define Taxon1Req_searchname 23
+#define Taxon1Req_dumpnames4class 24
 
 
 NLM_EXTERN Taxon1ReqPtr LIBCALL Taxon1ReqFree PROTO ((Taxon1ReqPtr ));
@@ -95,6 +99,10 @@ typedef ValNode Taxon1Resp;
 #define Taxon1Resp_taxachildren 20
 #define Taxon1Resp_taxalineage 21
 #define Taxon1Resp_maxtaxid 22
+#define Taxon1Resp_getproptypes 23
+#define Taxon1Resp_getorgprop 24
+#define Taxon1Resp_searchname 25
+#define Taxon1Resp_dumpnames4class 26
 
 
 NLM_EXTERN Taxon1RespPtr LIBCALL Taxon1RespFree PROTO ((Taxon1RespPtr ));
diff --git a/network/taxon1/taxon2/txclient.h b/network/taxon1/taxon2/txclient.h
index 9fd89493..256fbe68 100644
--- a/network/taxon1/taxon2/txclient.h
+++ b/network/taxon1/taxon2/txclient.h
@@ -31,6 +31,9 @@
 *
 *
 * $Log: txclient.h,v $
+* Revision 1.9  2013/10/24 19:31:26  vakatov
+* Set pre-processor macro TAXSERVICE by default (per V.Soussov, at S.Bazhin's request)
+*
 * Revision 1.8  2005/08/08 18:03:27  soussov
 * adds extern C
 *
@@ -70,8 +73,13 @@
 #include <ncbi.h>
 #include <txcommon.h>
 #include <treemgr.h>
+
+#if !defined(NO_TAXSERVICE)
+/* TAXSERVICE is default nowadays */
+#  define TAXSERVICE 1
+#endif
 #ifdef TAXSERVICE
-#include <objfeat.h>
+#  include <objfeat.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/network/vibnet/netcnfg.c b/network/vibnet/netcnfg.c
index ff3bd4c1..beeffe16 100644
--- a/network/vibnet/netcnfg.c
+++ b/network/vibnet/netcnfg.c
@@ -23,7 +23,7 @@
  *
  * ===========================================================================
  *
- * RCS $Id: netcnfg.c,v 6.16 2007/07/13 18:29:18 kans Exp $
+ * RCS $Id: netcnfg.c,v 6.18 2013/09/16 21:11:38 kans Exp $
  *
  * Author:  Kans, Epstein
  *
@@ -153,9 +153,11 @@ static void AcceptNetConfigForm (ButtoN b)
     if (! StringHasNoText (str)) {
       SetAppParam ("NCBI", "CONN", "HTTP_PROXY_HOST", str);
       GetTitle (ncp->proxyPort, str, sizeof (str));
+      /*
       if (StringICmp (str, "80") == 0) {
         str [0] = '\0';
       }
+      */
       if (! StringHasNoText (str)) {
         SetAppParam ("NCBI", "CONN", "HTTP_PROXY_PORT", str);
       } else {
@@ -311,7 +313,8 @@ extern void ShowNetConfigForm (WndActnProc activate, FormMessageFunc messages,
   GrouP         g;
   GrouP         h;
   GrouP         j;
-  Int2          len;
+  GrouP         k;
+  Int2          len = 0;
   NetConfigPtr  ncp;
   PrompT        ppt0, ppt1;
   ButtoN        rb;
@@ -359,46 +362,32 @@ extern void ShowNetConfigForm (WndActnProc activate, FormMessageFunc messages,
     SetGroupSpacing (ncp->netGroup, 5, 10);
   
     SelectFont (programFont);
-    len = StringWidth ("HTTP Proxy Server ") + 2;
+    len = StringWidth ("HTTP Proxy Server Name ") + 2;
     SelectFont (systemFont);
 
     z = HiddenGroup (ncp->netGroup, -2, 0, NULL);
-    StaticPrompt (z, "HTTP Proxy Server", len, dialogTextHeight, programFont, 'l');
+    StaticPrompt (z, "HTTP Proxy Server Name", len, dialogTextHeight, programFont, 'l');
     ncp->proxyHost = DialogText (z, "", 12, ChangeProxy);
     SetObjectExtra (ncp->proxyHost, ncp, NULL);
-    /*
-    StaticPrompt (z, "", 0, 0, programFont, 'l');
-    StaticPrompt (z, "", 0, 0, programFont, 'l');
-    */
-    ppt0 = StaticPrompt (z, "HTTP Proxy Port ", len, dialogTextHeight, programFont, 'l');
+    ppt0 = StaticPrompt (z, "HTTP Proxy Server Port", len, dialogTextHeight, programFont, 'l');
     ncp->proxyPort = DialogText (z, "", 3, NULL);
-    x = MultiLinePrompt (z, "Non-transparent Proxy Server", len, programFont);
+    x = MultiLinePrompt (z, "Non-transparent Proxy Server Name", len, programFont);
     ncp->firewallProxy = DialogText (z, "", 12, NULL);
     AlignObjects (ALIGN_MIDDLE, (HANDLE) x, (HANDLE) ncp->firewallProxy, NULL);
-    /*
-    AlignObjects (ALIGN_MIDDLE, (HANDLE) ppt0, (HANDLE) ncp->proxyPort,
-                  (HANDLE) ncp->firewallProxy, NULL);
-    */
     AlignObjects (ALIGN_RIGHT, (HANDLE) ncp->proxyHost, (HANDLE) ncp->firewallProxy, NULL);
     AlignObjects (ALIGN_LEFT, (HANDLE) ncp->proxyHost, (HANDLE) ncp->firewallProxy, NULL);
 
     g = HiddenGroup (ncp->netGroup, 5, 0, NULL);
-    /*
-    ppt0 = StaticPrompt (g, "Domain name server", 0, 0, programFont, 'l');
-    ncp->dnsAvailable = CheckBox (g, "Available", NULL);
-    */
-    ncp->dnsAvailable = CheckBox (g, "Domain Name Server", NULL);
+    ncp->dnsAvailable = CheckBox (g, "Use Domain Name Service", NULL);
     SetStatus (ncp->dnsAvailable, TRUE);
-    /* StaticPrompt (g, " ", 0, 0, programFont, 'l'); */
-    ppt1 = StaticPrompt (g, "Timeout", 0, popupMenuHeight, programFont, 'l');
-    ncp->timeOut = PopupList (g, TRUE, NULL);
+    k = HiddenGroup (ncp->netGroup, 5, 0, NULL);
+    ppt1 = StaticPrompt (k, "Timeout", 0, popupMenuHeight, programFont, 'l');
+    ncp->timeOut = PopupList (k, TRUE, NULL);
     PopupItem (ncp->timeOut, "10 seconds");
     PopupItem (ncp->timeOut, "30 seconds");
     PopupItem (ncp->timeOut, "60 seconds");
     PopupItem (ncp->timeOut, " 5 minutes");
     SetValue (ncp->timeOut, 2);
-    AlignObjects (ALIGN_MIDDLE, /* (HANDLE) ppt0, */ (HANDLE) ncp->dnsAvailable,
-                  (HANDLE) ppt1, (HANDLE) ncp->timeOut, NULL);
 
     c = HiddenGroup (w, 4, 0, NULL);
     SetGroupSpacing (c, 10, 2);
@@ -407,10 +396,7 @@ extern void ShowNetConfigForm (WndActnProc activate, FormMessageFunc messages,
     b = PushButton (c, "Cancel", StdSendCancelButtonMessageProc);
     SetObjectExtra (b, ncp, NULL);
 
-    /*
-    AlignObjects (ALIGN_CENTER, (HANDLE) h, (HANDLE) c, NULL);
-    */
-    AlignObjects (ALIGN_CENTER, (HANDLE) j, (HANDLE) z, (HANDLE) g, (HANDLE) c, NULL);
+    AlignObjects (ALIGN_CENTER, (HANDLE) j, (HANDLE) z, (HANDLE) g, (HANDLE) k, (HANDLE) c, NULL);
 
     RealizeWindow (w);
author	Andreas Tille <tille@debian.org>	2016-12-01 16:38:47 +0100
committer	Andreas Tille <tille@debian.org>	2016-12-01 16:38:47 +0100
commit	9c3449b3f79213138ad1d315580af98e89d8e1b6 (patch)
tree	157d2da8682da6cfb9ee28db762c9c94dcdaa98c /network
parent	be323245ea77f0e457e3d42c83b58a82f67ca0f2 (diff)