[basedb-cvs] basedb/src/assayImporter assayImporter.cc,1.2,1.3

[<tr...@us...>]

Update of /cvsroot/basedb/basedb/src/assayImporter
In directory sc8-pr-cvs1:/tmp/cvs-serv9397/assayImporter

Modified Files:
	assayImporter.cc 
Log Message:
Added import and display of extra bioassayset float columns

Index: assayImporter.cc
===================================================================
RCS file: /cvsroot/basedb/basedb/src/assayImporter/assayImporter.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** assayImporter.cc	11 Feb 2003 10:45:52 -0000	1.2
--- assayImporter.cc	11 Feb 2003 14:47:16 -0000	1.3
***************
*** 28,31 ****
--- 28,33 ----
  #include "basefile.h"
  
+ istream &getline(istream &i, vector<char> &v, char delim = '\n');
+ 
  using namespace std;		// Ugly, I know, so sue me.
  
***************
*** 36,42 ****
  	map<int,int> efFields, ostream &extraout)
[...108 lines suppressed...]
  		return 1;
  	}
! 	return assayImport(datain, cin, channels, extraout) ? 0 : 1;
  }
--- 232,246 ----
  		return 1;
  	}
! 
! #if !defined __GNUC__ || __GNUC__ >= 3
! 	char buf[4096], buf2[4096];
! 	cout.rdbuf()->pubsetbuf(buf, sizeof(buf));
! 	cin.rdbuf()->pubsetbuf(buf2, sizeof(buf2));
! #endif
! 	int rc = assayImport(datain, cin, channels, extraout) ? 0 : 1;
! #if !defined __GNUC__ || __GNUC__ >= 3
! 	cout.rdbuf()->pubsetbuf(NULL, 0);
! 	cin.rdbuf()->pubsetbuf(NULL, 0);
! #endif
! 	return rc;
  }