X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=functions.py;h=bb7e9063280d0a2d17bea947d31c59fe98f5ca5c;hp=2165f334b328c24c01dd686425c824ab7d1c4d0f;hb=eb3837fa8ebc881ef1df81980ec576ca0451eb40;hpb=b0333175cc68917ceb33589b0b354bf931fec245

diff --git a/functions.py b/functions.py
index 2165f33..bb7e906 100644
--- a/functions.py
+++ b/functions.py
@@ -10,6 +10,7 @@ from ConfigParser import ConfigParser
 from subprocess import Popen, call, PIPE
 import thread
 import os
+import ast
 import sys
 import csv
 import platform
@@ -20,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')
@@ -69,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) :
@@ -106,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) :
@@ -130,6 +138,12 @@ class DoConf :
         for option in self.conf.options(section) :
             if self.conf.get(section, option).isdigit() :
                 parametres[option] = int(self.conf.get(section, option))
+            elif self.conf.get(section, option) == 'False' :
+                parametres[option] = False
+            elif self.conf.get(section, option) == 'True' :
+                parametres[option] = True
+            elif self.conf.get(section, option).startswith('(') and self.conf.get(section, option).endswith(')') :
+                parametres[option] = ast.literal_eval(self.conf.get(section, option))
             else :
                 parametres[option] = self.conf.get(section, option)
         if 'type' not in parametres :
@@ -145,9 +159,12 @@ class DoConf :
                     self.conf.set(section, option, `parametres[i][option]`)
                 elif isinstance(parametres[i][option], basestring) :
                     self.conf.set(section, option, parametres[i][option].encode('utf8'))
+                elif isinstance(parametres[i][option], wx.Colour) :
+                    self.conf.set(section, option, str(parametres[i][option]))
+                else :
+                    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)