X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=analysetxt.py;h=d3f8591e7922aea1310e4bdc44337cebdec5a358;hp=afaf3553c85e466aeea70422ca0412e2695241d6;hb=be2de22859c8f59abe9e1082981e4c3a62e9b7ca;hpb=655d1e1ab00740c37712f476dc89dff7965c2161

diff --git a/analysetxt.py b/analysetxt.py
index afaf355..d3f8591 100644
--- a/analysetxt.py
+++ b/analysetxt.py
@@ -10,7 +10,7 @@ import os
 #ALCESTE
 from PrintRScript import RchdTxt, AlcesteTxtProf
 from OptionAlceste import OptionAlc 
-from layout import PrintRapport
+#from layout import PrintRapport
 from openanalyse import OpenAnalyse
 from time import time
 ######################################
@@ -52,7 +52,11 @@ class AnalyseText :
         self.dlg = dlg
         self.dialok = True
         self.parametres = parametres
-        self.pathout = PathOut(corpus.parametres['originalpath'], analyse_type = parametres['type'], dirout = corpus.parametres['pathout'])
+        self.val = False
+        if not 'pathout' in self.parametres :
+            self.pathout = PathOut(corpus.parametres['originalpath'], analyse_type = parametres['type'], dirout = corpus.parametres['pathout'])
+        else :
+            self.pathout = PathOut(filename = corpus.parametres['originalpath'], dirout = self.parametres['pathout'], analyse_type = self.parametres['name'])
         self.parametres = self.make_config(parametres)
         log.info(self.pathout.dirout)
         if self.parametres is not None :
@@ -125,7 +129,7 @@ class AnalyseText :
                 sleep(0.2)
             else :
                 sleep(0.2)
-        check_Rresult(self.ira, pid)
+        return check_Rresult(self.ira, pid)