X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=erange.git;a=blobdiff_plain;f=combinerds.py;fp=combinerds.py;h=4c826b04ed6c668a3d5b2a66ee4b842789a483a0;hp=7eac48affb101be5a1a7e570b3c152c86c58247e;hb=0d3e3112fd04c2e6b44a25cacef1d591658ad181;hpb=5e4ae21098dba3d1edcf11e7279da0d84c3422e4

diff --git a/combinerds.py b/combinerds.py
index 7eac48a..4c826b0 100755
--- a/combinerds.py
+++ b/combinerds.py
@@ -10,9 +10,9 @@ except:
     pass
 
 import sys
-from commoncode import readDataset
+import ReadDataset
 
-print '%s: version 1.1' % sys.argv[0]
+print "combinerds: version 1.2"
 
 
 def main(argv=None):
@@ -43,16 +43,16 @@ def main(argv=None):
     print "destination RDS: %s" % datafile
 
     if '--initrna' in argv:
-        rds = readDataset(datafile, initialize=True, datasetType='RNA')
+        rds = ReadDataset.ReadDataset(datafile, initialize=True, datasetType='RNA')
     elif '--init' in argv:
-        rds = readDataset(datafile, initialize=True)
+        rds = ReadDataset.ReadDataset(datafile, initialize=True)
 
     withFlag = ''
     if '--flag' in argv:
         withFlag = argv[sys.argv.index('-flag') + 1]
         print "restrict to flag = %s" % withFlag
 
-    rds = readDataset(datafile, verbose=True, cache=doCache)
+    rds = ReadDataset.ReadDataset(datafile, verbose=True, cache=doCache)
 
     if cachePages > rds.getDefaultCacheSize():
         rds.setDBcache(cachePages)