...

[iramuteq] / analysetxt.py

diff --git a/analysetxt.py b/analysetxt.py
index 666a062..0402cdc 100644 (file)
--- 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['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'])
             self.t1 = time()
             #if self.corpus.lems is None :
             self.corpus.make_lems(lem = self.parametres['lem'])


@@ -96,8 +97,8 @@ class AnalyseText :
 
     def make_config(self, config) :
         if config is not None :
 
     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()
 
             else :
                 return self.preferences()
 


@@ -107,9 +108,6 @@ class AnalyseText :
     def preferences(self) :
         return {}
 
     def preferences(self) :
         return {}
 

-    def doR(self):
-        pass
-

     def printRscript(self) :
         pass
 
     def printRscript(self) :
         pass