Fix export for merged dataset

emi80 · Apr 25, 2014 · 73f5d56 · 73f5d56
1 parent c7f9749
commit 73f5d56
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/indexfile/__init__.py b/indexfile/__init__.py
@@ -20,6 +20,7 @@
         "view"
     ],
     "kw_sep": " ",
+    "rep_sep": ",",
     "sep": "=",
     "trail": ";"
 }

diff --git a/indexfile/index.py b/indexfile/index.py
@@ -167,9 +167,6 @@ def export(self, types=None, tags=None):
                 data = dict([(k, v) for k, v in self._metadata.items()
                             + {'path': path, 'type': ftype}.items()
                             + info.items() if k in tags])
-                for k, val in data.items():
-                    if type(val) == list:
-                        data[k] = ','.join(v)
                 out.append(data)
         return out
 
@@ -477,7 +474,7 @@ def save(self, path=None):
         for line in self.export(map=None):
             index.write("%s%s" % (line, os.linesep))
 
-    def export(self, absolute=False, type='index', tags=None, header=False,
+    def export(self, absolute=False, export_type='index', tags=None, header=False,
                **kwargs):
         """Export the index file information. ``kwargs`` contains the format
         information.
@@ -512,7 +509,7 @@ def export(self, absolute=False, type='index', tags=None, header=False,
 
         out = []
 
-        if type == 'tab':
+        if export_type == 'tab':
             log.debug('Create header for %s export format', type)
             if not self._alltags:
                 self._create_lookup()
@@ -535,17 +532,20 @@ def export(self, absolute=False, type='index', tags=None, header=False,
                     if k:
                         line[k] = val
                 log.debug('Create output for %s format', type)
-                if type == 'index':
+                if export_type == 'index':
                     out.append(colsep.join([line.pop(path, '.'),
                                             to_tags(**dict(line.items() +
                                                            kwargs.items()))]))
-                if type == 'json':
+                if export_type == 'json':
                     out.append(json.dumps(line))
-                if type == 'tab':
+                if export_type == 'tab':
                     vals = line.values()
                     if tags or len(line.values()) != len(headline):
                         vals = [line.get(l, 'NA') if l != 'id'
                                 else line.get(dsid) for l in headline]
+                    for val in vals:
+                        if type(val) == list:
+                            val = self.format.get('rep_sep', ",").join(val)
                     out.append(colsep.join(vals))
 
         if type == 'tab':

diff --git a/test/test_index.py b/test/test_index.py
@@ -134,13 +134,13 @@ def test_export_no_map_tab_tags():
     i.export(map=None, type='tab', tags=['id', 'path'])
 
 
-# def test_export_no_map_tab_all_tags():
-#     """Test export"""
-#     i = Index('test/data/index.txt')
-#     assert i is not None
-#     i.set_format('test/data/format.json')
-#     i.open()
-#     i.export(map=None, type='tab')
+def test_export_no_map_tab_all_tags():
+    """Test export"""
+    i = Index('test/data/index.txt')
+    assert i is not None
+    i.set_format('test/data/format.json')
+    i.open()
+    i.export(map=None, type='tab')
 
 
 def test_replicates():