X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=openanalyse.py;h=29a0d6375fc11607b8eccc400a51245bdf26be2f;hp=1c5a5541d53f604a9e392453b2678c276f2140c7;hb=22f93a602f3584ddc6ba68114556212c90307a50;hpb=9bde3d55d2131f1a33234a43c0de8b200ddb8f9a

diff --git a/openanalyse.py b/openanalyse.py
index 1c5a554..29a0d63 100644
--- a/openanalyse.py
+++ b/openanalyse.py
@@ -6,12 +6,10 @@
 
 from chemins import ChdTxtPathOut, StatTxtPathOut, construct_simipath
 from layout import OpenCHDS, dolexlayout, StatLayout, WordCloudLayout, OpenCorpus, SimiLayout
-#from corpus import Corpus
-from corpusNG import Corpus, copycorpus
+from corpus import Corpus, copycorpus
 from tableau import Tableau
 import os
 import shelve
-#from ConfigParser import *
 from tabsimi import DoSimi
 from functions import BugReport, DoConf
 import logging
@@ -33,7 +31,6 @@ class OpenAnalyse():
         if self.conf['type'] == 'corpus' :
             corpus = self.opencorpus()
         elif self.conf['corpus'] in self.parent.history.corpus :
-            print 'corpus in history.corpus'
             if self.conf['uuid'] in self.parent.history.analyses :
                 intree  = True
             else :
@@ -43,12 +40,11 @@ class OpenAnalyse():
                corpus.make_lems(True)
             else :
                corpus.make_lems(False)
-            self.doopen(corpus)
             if not intree :
-                self.parent.tree.AddAnalyse(self.conf)
+                self.parent.tree.AddAnalyse(self.conf, bold = True)
             else :
-                print 'passe apr la'
-                print self.parent.tree.GiveFocus(uuid = self.conf['uuid'], bold = True)
+                self.parent.tree.GiveFocus(uuid = self.conf['uuid'], bold = True)
+            self.doopen(corpus)
         else :
             corpus = None
         self.parent.history.addtab(self.conf)
@@ -66,7 +62,7 @@ class OpenAnalyse():
             log.info('add to history')
             self.parent.tree.OnItemAppend(self.conf)
         if self.conf['uuid'] in self.parent.history.openedcorpus :
-            log.info('corpus is already opened')
+            log.info('corpus is already opened 1')
             self.doopen(self.parent.history.openedcorpus[self.conf['uuid']])
         else :
             corpus = Corpus(self, parametres = self.conf, read = self.parent.history.history[self.parent.history.ordercorpus[self.conf['uuid']]]['ira'])
@@ -75,19 +71,24 @@ class OpenAnalyse():
             self.doopen(corpus)
 
     def opencorpus_analyses(self) :
+        log.info('open analysis')
         basepath = self.conf['pathout']
+        analyses = []
         for root, subfolders, files in os.walk(basepath) :
             for folder in subfolders :
                 if os.path.exists(os.path.join(folder, 'Analyse.ira')) :
                     analyse_conf = DoConf(os.path.join(folder, 'Analyse.ira')).getoptions()
                     analyse_conf = self.redopath(analyse_conf, os.path.join(folder, 'Analyse.ira'))
                     if analyse_conf['corpus'] == self.conf['uuid'] :
-                        self.parent.history.add(analyse_conf)
-                        self.parent.tree.AddAnalyse(analyse_conf, bold = False)
+                        analyses.append(analyse_conf)
+        if len(analyses) :
+            self.parent.history.addmultiple(analyses)
+        for analyse in analyses :
+            self.parent.tree.AddAnalyse(analyse, bold = False)
 
     def openanalyse(self) :
         if self.conf['corpus'] in self.parent.history.openedcorpus :
-            log.info('corpus is already opened')
+            log.info('corpus is already opened 2')
             corpus = self.parent.history.openedcorpus[self.conf['corpus']]
         else :
             if os.path.exists(self.parent.history.history[self.parent.history.ordercorpus[self.conf['corpus']]]['ira']) :