...

[iramuteq] / functions.py

diff --git a/functions.py b/functions.py
index 2909a44..bb7e906 100644 (file)
--- a/functions.py
+++ b/functions.py
@@ -21,7 +21,6 @@ import datetime
 from copy import copy
 from shutil import copyfile
 #from dialog import BugDialog
-print 'TEST LOGGING funcion'
 import logging
 
 log = logging.getLogger('iramuteq')
@@ -70,23 +69,28 @@ class History :
     
     def write(self) :
         sections = self.corpora.keys() + self.analyses.keys()
-        parametres = [self.corpora[key] for key in self.corpora.keys()] + [self.analyses[key] for key in self.analyses.keys()]
+        parametres = [self.corpora[key] for key in self.corpora.keys() if key != 'analyses'] + [self.analyses[key] for key in self.analyses.keys()]
         self.conf.makeoptions(sections, parametres)
         log.info('write history')
 
     def add(self, analyse) :
-        if 'corpus' in analyse :
-            if analyse['corpus'] in self.corpora :
-                if 'analyses' in self.history[analyse['corpus']] :
-                    self.history[analyse['corpus']]['analyses'].append(analyse)
+        tosave = {'uuid' : analyse['uuid'], 'ira': analyse['ira'], 'type' : analyse['type']}
+        if analyse.get('corpus', False) :
+            tosave['corpus'] = analyse['corpus']
+            tosave['name'] = analyse['name']
+            acorpus_uuid =  analyse['corpus']
+            if acorpus_uuid in self.corpora :
+                if 'analyses' in self.history[acorpus_uuid] :
+                    self.history[acorpus_uuid]['analyses'].append(tosave)
                 else :
-                    self.history[analyse['corpus']]['analyses'] = [analyse]
-                self.analyses[analyse['uuid']] = analyse
+                    self.history[acorpus_uuid]['analyses'] = [tosave]
+                self.analyses[analyse['uuid']] = tosave
             else :
-                self.analyses[analyse['uuid']] = analyse
+                self.analyses[analyse['uuid']] = tosave
         elif 'corpus_name' in analyse :
-            self.history[analyse['uuid']] = analyse
-            self.corpora[analyse['uuid']] = analyse
+            tosave['corpus_name'] = analyse['corpus_name']
+            self.history[analyse['uuid']] = tosave
+            self.corpora[analyse['uuid']] = tosave
         self.write()
 
     def delete(self, uuid, corpus = False) :
@@ -107,6 +111,9 @@ class History :
 
     def rmtab(self, analyse) :
         del self.opened[analyse['uuid']]
+    
+    def __str__(self) :
+        return str(self.history)
 
 class DoConf :
     def __init__(self, configfile=None, diff = None, parametres = None) :
@@ -158,7 +165,6 @@ class DoConf :
                     self.conf.set(section, option, `parametres[i][option]`)
         if outfile is None :
             outfile = self.configfile
-        print outfile
         with codecs.open(outfile, 'w', 'utf8') as f :
             self.conf.write(f)