merge fixes

3 files changed, 6 insertions, 12 deletions

diff --git a/BINoculars/dispatcher.py b/BINoculars/dispatcher.py
index ec721e1..5cdbc84 100755
--- a/BINoculars/dispatcher.py
+++ b/BINoculars/dispatcher.py
@@ -20,8 +20,7 @@ class Destination(object):
         if opts is not False:
             self.opts = opts
 
-    def set_config(self, conf, meta):
-        self.meta = meta
+    def set_config(self, conf):
         self.config = conf
 
     def set_tmp_filename(self, filename):
@@ -40,7 +39,6 @@ class Destination(object):
         elif self.type == 'final':
             fn = self.final_filename()
             space.config = self.config
-            space.metadata += self.meta
             space.tofile(fn)
 
     def retrieve(self):
diff --git a/BINoculars/main.py b/BINoculars/main.py
index 77d4d5c..d5b0aab 100755
--- a/BINoculars/main.py
+++ b/BINoculars/main.py
@@ -35,10 +35,7 @@ class Main(object):
 
         # distribute the configfile to space and to the metadata instance
         spaceconf = self.config.copy()
-        metadataconfig = self.config.copy()
-        metadataconfig.add_section('command', {'command' : command})
         metadata = util.MetaData()
-        metadata.add_dataset(metadataconfig)
 
         #input from either the configfile or the configsectiongroup is valid
         self.dispatcher = backend.get_dispatcher(config.dispatcher, self, default='local')
@@ -47,7 +44,7 @@ class Main(object):
 
         self.dispatcher.config.destination.set_final_options(self.input.get_destination_options(command))
         if command:
-            self.dispatcher.config.destination.set_config(spaceconf, metadata)
+            self.dispatcher.config.destination.set_config(spaceconf)
         self.run(command)
 
     @classmethod
diff --git a/BINoculars/util.py b/BINoculars/util.py
index 7787310..e4dd767 100755
--- a/BINoculars/util.py
+++ b/BINoculars/util.py
@@ -16,6 +16,7 @@ import glob
 import errors
 import StringIO
 import struct
+import json
 import socket
 import StringIO
 import binascii
@@ -417,8 +418,6 @@ class MetaData(object):
                     for key in s.keys():
                         sectiongroup.create_dataset(key, data = s[key])
 
-
-
     def __repr__(self):
         str = '{0.__class__.__name__}{{\n'.format(self)
         for meta in self.metas:
@@ -440,12 +439,12 @@ class MetaData(object):
         return obj
 
 #Contains the unparsed config dicts
-class ConfigFile(Metabase):
+class ConfigFile(MetaBase):
     def __init__(self, origin='n/a', command = []):
         self.origin = origin
         self.command = command
         super(ConfigFile, self).__init__()
-        self.sections = 'dispatcher', 'projection', 'input'
+        self.sections = ['dispatcher', 'projection', 'input']
         for section in self.sections:
             setattr(self, section, dict())
 
@@ -508,7 +507,7 @@ class ConfigFile(Metabase):
 
     def __repr__(self):
         str = super(ConfigFile, self).__repr__()
-        str += 'origin = {0}'.format(self.origin)
+        str += 'origin = {0}\n'.format(self.origin)
         str += 'command = {0}'.format(','.join(self.command))
         return str