Load ncbi (6.1.20040204) into ncbi-tools6/branches/upstream/current.

3 files changed, 11 insertions, 5 deletions

diff --git a/network/id1arch/id1.h b/network/id1arch/id1.h
index 2623ca9b..97b82c00 100644
--- a/network/id1arch/id1.h
+++ b/network/id1arch/id1.h
@@ -9,7 +9,7 @@
 #include <asn.h>
 #endif
 
-static char * asnfilename = "id1.h10";
+static char * asnfilename = "id1.h11";
 static AsnValxNode avnx[5] = {
     {20,"entry" ,0,0.0,&avnx[1] } ,
     {20,"bioseq" ,1,0.0,&avnx[2] } ,
@@ -80,7 +80,7 @@ static AsnType atx[60] = {
   {0, NULL,1,-1,0,0,0,0,0,0,NULL,&atx[27],NULL,0,NULL} };
 
 static AsnModule ampx[1] = {
-  { "NCBI-ID1Access" , "id1.h10",&atx[0],NULL,NULL,0,0} };
+  { "NCBI-ID1Access" , "id1.h11",&atx[0],NULL,NULL,0,0} };
 
 static AsnValxNodePtr avn = avnx;
 static AsnTypePtr at = atx;
diff --git a/network/id1arch/id1arch.c b/network/id1arch/id1arch.c
index 39c58afd..e942481b 100644
--- a/network/id1arch/id1arch.c
+++ b/network/id1arch/id1arch.c
@@ -81,6 +81,7 @@ Boolean ID1ArchInit (void)
     }
 
     asnin = svcp->raip;
+    AsnIoSetBufsize(asnin,4390);
     asnout = svcp->waip;
     return TRUE;
 }
@@ -170,11 +171,12 @@ ID1ArchSeqEntryGet (Int4 gi,CharPtr db, Int4 ent, Int4Ptr status, Int2 maxplex)
 	Int4 i;
 	SeqEntryPtr sep=NULL;
 	Int4 retval = 0;
- 
+#if 0 
 	if (maxplex < 0 || maxplex > 4){
 		ErrPost(CTX_UNKNOWN, 2, "ID1ArchSeqEntryGet: maxplex(%d) out of range (0-4)", maxplex);
 		return NULL;
 	}
+#endif
 	for (i = 0; i < ID_SERV_RETRIES; i++){
 		if (i > 0){
 			if (! ReestablishNetID1Arch())
@@ -405,6 +407,7 @@ static Boolean GenericReestablishNet(CharPtr svcName, Boolean showErrs)
     }
 
     MemFree(buf);
+    AsnIoSetBufsize(asnin,4390);
     return retval;
 }
 
diff --git a/network/id1arch/idfetch.c b/network/id1arch/idfetch.c
index 5d9afa05..9ba87b96 100644
--- a/network/id1arch/idfetch.c
+++ b/network/id1arch/idfetch.c
@@ -25,6 +25,9 @@
  * Author Karl Sirotkin
  *
  $Log: idfetch.c,v $
+ Revision 1.30  2004/02/03 21:25:16  yaschenk
+ relaxing ranges for -g and -e
+
  Revision 1.29  2003/12/17 20:35:38  kans
  initialize status, send NORMAL_STYLE to SeqEntrytoGnbk instead of 0 (also fixed in asn2gnbk), pass lookup flags
 
@@ -189,14 +192,14 @@ Args myargs[] = {
 6=quality scores (Seq-entry only)\n\t\t\t\
 7=Entrez DocSums\n","1", "1", "7", FALSE, 't', ARG_INT, 0.0, 0, NULL } ,
 {"Database to use (special meaning for -q flag: n - nucleotide, p - protein)",NULL,NULL,NULL,TRUE,'d',ARG_STRING,0.0,0,NULL},
-	{"Entity number (retrieval number) to dump" ,"0","0","99999999",TRUE,'e',ARG_INT,0.0,0,NULL},
+	{"Entity number (retrieval number) to dump" ,"0",NULL,NULL,TRUE,'e',ARG_INT,0.0,0,NULL},
         {"Type of lookup:\t\
 0 - get Seq-entry\n\t\t\t\
 1 - get gi state (output to stderr)\n\t\t\t\
 2 - get SeqIds\n\t\t\t\
 3 - get gi historyn (sequence change only)\n\t\t\t\
 4 - get gi revision history (any change to asn.1)\n", "0","0","4",TRUE,'i',ARG_INT,0.0,0,NULL},
-	{"GI id for single Entity to dump" ,"0","0","999999999",TRUE,'g',ARG_INT,0.0,0,NULL},
+	{"GI id for single Entity to dump" ,"0",NULL,NULL,TRUE,'g',ARG_INT,0.0,0,NULL},
 	{"File with list of gi's, accessions, accession.version's, fasta seqid's to dump",NULL,NULL,NULL,TRUE,'G',ARG_FILE_IN,0.0,0,NULL},
 	{"Max complexity:\t\
 0 - get the whole blob\n\t\t\t\