X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=functions.py;h=8a10f674e926bceaea110dd272334b322335437c;hp=8abda95b512de55c0d846674621b30f4f37390cd;hb=22f93a602f3584ddc6ba68114556212c90307a50;hpb=d33694ef233bd4a28e69d88e9eef3c5c129442fe

diff --git a/functions.py b/functions.py
index 8abda95..8a10f67 100644
--- a/functions.py
+++ b/functions.py
@@ -64,7 +64,7 @@ class History :
             tosave['corpus'] = analyse['corpus']
             tosave['name'] = analyse['name']
             acorpus_uuid =  analyse['corpus']
-            if acorpus_uuid in self.ordercorpus :
+            if acorpus_uuid in self.corpus :
                 if 'analyses' in self.history[self.ordercorpus[acorpus_uuid]] :
                     self.history[self.ordercorpus[acorpus_uuid]]['analyses'].append(tosave)
                 else :
@@ -77,9 +77,25 @@ class History :
         self.write()
         self.read()
 
+    def addmultiple(self, analyses) :
+        for analyse in analyses :
+            tosave = {'uuid' : analyse['uuid'], 'ira': analyse['ira'], 'type' : analyse['type']}
+            corpus = analyse['uuid']
+            tosave['corpus'] = corpus
+            tosave['name'] = analyse['name']
+            if corpus in self.corpus :
+                if 'analyses' in self.history[self.ordercorpus[corpus]] :
+                    self.history[self.ordercorpus[corpus]]['analyses'].append(tosave)
+                else :
+                    self.history[self.ordercorpus[corpus]]['analyses'] = [tosave]
+        self.write()
+        self.read()
+
     def delete(self, analyse, corpus = False) :
         if corpus :
             self.history.pop(self.ordercorpus[analyse['uuid']])
+            if analyse['uuid'] in self.openedcorpus :
+                del self.openedcorpus[analyse['uuid']]
         else :
             todel = [i for i, ana in enumerate(self.corpus[analyse['corpus']]['analyses']) if ana['uuid'] == analyse['uuid']][0]
             self.history[self.ordercorpus[analyse['corpus']]]['analyses'].pop(todel)
@@ -511,6 +527,7 @@ def check_Rresult(parent, pid) :
     if isinstance(pid, Popen) :
         if pid.returncode != 0 :
             error = pid.communicate()
+            print error
             error = [str(error[0]), error[1]]
             if error[1] is None :
                 error[1] = 'None'
@@ -520,6 +537,8 @@ def check_Rresult(parent, pid) :
             return False
             #except :
             #    BugReport(parent)
+        else :
+            return True
     else :
         if pid != 0 :
             #try :
@@ -527,6 +546,8 @@ def check_Rresult(parent, pid) :
             return False
             #except :
             #    BugReport(parent)
+        else :
+            return True
 
 def print_liste(filename,liste):
     with open(filename,'w') as f :