X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=analysetxt.py;h=0402cdc753564c6715f1162867fbaf47d0f2c38e;hp=f5d927350dfea9d661f575c3a2738138ecec643c;hb=13666be5de5eeffbe63774c3c0aecd407b519ac6;hpb=8fa853a25a9d62b1446e1bc543e5a3a4d0e03dcf

diff --git a/analysetxt.py b/analysetxt.py
index f5d9273..0402cdc 100644
--- a/analysetxt.py
+++ b/analysetxt.py
@@ -69,6 +69,7 @@ class AnalyseText :
             self.parametres['uuid'] = str(uuid4())
             self.parametres['name'] = os.path.split(self.parametres['pathout'])[1]
             self.parametres['type'] = parametres['type']
+            self.parametres['encoding'] = self.ira.syscoding
             self.t1 = time()
             #if self.corpus.lems is None :
             self.corpus.make_lems(lem = self.parametres['lem'])
@@ -78,8 +79,8 @@ class AnalyseText :
             minutes, seconds = divmod(self.time, 60)
             hours, minutes = divmod(minutes, 60)            
             self.parametres['time'] = '%.0fh %.0fm %.0fs' % (hours, minutes, seconds)
-            self.parametres['ira'] = self.pathout['ira']
-            DoConf().makeoptions([self.parametres['type']], [self.parametres], self.pathout['ira'])
+            self.parametres['ira'] = self.pathout['Analyse.ira']
+            DoConf().makeoptions([self.parametres['type']], [self.parametres], self.pathout['Analyse.ira'])
             self.ira.history.add(self.parametres)
             if dlg :
                 dlg.Destroy()
@@ -96,8 +97,8 @@ class AnalyseText :
 
     def make_config(self, config) :
         if config is not None :
-            if isinstance(config, basestring) : 
-                return self.readconfig(config)
+            if not self.dlg : 
+                return config
             else :
                 return self.preferences()
 
@@ -107,9 +108,6 @@ class AnalyseText :
     def preferences(self) :
         return {}
 
-    def doR(self):
-        pass
-
     def printRscript(self) :
         pass