X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=openanalyse.py;h=29a0d6375fc11607b8eccc400a51245bdf26be2f;hp=8957f2a0598eb8e8383de22c2afbbeb43339f50c;hb=d1d24d86422c9e9805516190ea17a379201f9300;hpb=b1bfe11bdde3e2499b2246f1841499a64480cabb

diff --git a/openanalyse.py b/openanalyse.py
index 8957f2a..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
@@ -64,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'])
@@ -73,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']) :