X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=functions.py;h=4479eaf0d9906801bdc0d39f9c1f510892110ca6;hp=b3fff134cc4a68585be8c5c6c786891f85c26818;hb=781cbc21fec22eccd64bf7706aac10a0e2757814;hpb=e9568b211b7770aebf8f16db60f0aa4fecbc54db

diff --git a/functions.py b/functions.py
index b3fff13..4479eaf 100644
--- a/functions.py
+++ b/functions.py
@@ -21,7 +21,6 @@ import datetime
 from copy import copy
 from shutil import copyfile
 #from dialog import BugDialog
-print 'TEST LOGGING funcion'
 import logging
 
 log = logging.getLogger('iramuteq')
@@ -75,19 +74,23 @@ class History :
         log.info('write history')
 
     def add(self, analyse) :
-        if 'corpus' in analyse :
+        tosave = {'uuid' : analyse['uuid'], 'ira': analyse['ira'], 'type' : analyse['type']}
+        if analyse.get('corpus', False) :
+            tosave['corpus'] = analyse['corpus']
+            tosave['name'] = analyse['name']
             acorpus_uuid =  analyse['corpus']
             if acorpus_uuid in self.corpora :
                 if 'analyses' in self.history[acorpus_uuid] :
-                    self.history[acorpus_uuid]['analyses'].append(analyse)
+                    self.history[acorpus_uuid]['analyses'].append(tosave)
                 else :
-                    self.history[acorpus_uuid]['analyses'] = [analyse]
-                self.analyses[analyse['uuid']] = analyse
+                    self.history[acorpus_uuid]['analyses'] = [tosave]
+                self.analyses[analyse['uuid']] = tosave
             else :
-                self.analyses[analyse['uuid']] = analyse
+                self.analyses[analyse['uuid']] = tosave
         elif 'corpus_name' in analyse :
-            self.history[analyse['uuid']] = analyse
-            self.corpora[analyse['uuid']] = analyse
+            tosave['corpus_name'] = analyse['corpus_name']
+            self.history[analyse['uuid']] = tosave
+            self.corpora[analyse['uuid']] = tosave
         self.write()
 
     def delete(self, uuid, corpus = False) :
@@ -158,6 +161,8 @@ class DoConf :
                     self.conf.set(section, option, parametres[i][option].encode('utf8'))
                 elif isinstance(parametres[i][option], wx.Colour) :
                     self.conf.set(section, option, str(parametres[i][option]))
+                elif option == 'analyses' :
+                    pass
                 else :
                     self.conf.set(section, option, `parametres[i][option]`)
         if outfile is None :
@@ -166,7 +171,8 @@ class DoConf :
             self.conf.write(f)
 
     def totext(self, parametres) :
-        txt = ['Corpus']
+        #txt = ['Corpus']
+        txt = []
         for val in parametres :
             if isinstance(parametres[val], int) :
                 txt.append(' \t\t: '.join([val, `parametres[val]`]))
@@ -311,8 +317,8 @@ def formatExceptionInfo(maxTBlevel=5):
          cla, exc, trbk = sys.exc_info()
          excName = cla.__name__
          try:
-             excArgs = exc.__dict__["args"]
-         except KeyError:
+             excArgs = exc.args[0]
+         except :
              excArgs = "<no args>"
          excTb = traceback.format_tb(trbk, maxTBlevel)
          return (excName, excArgs, excTb)
@@ -325,7 +331,7 @@ def decoupercharact(chaine, longueur, longueurOptimale, separateurs = None) :
         Si on trouve un '$', c'est fini.
         Sinon, on cherche le meilleur candidat. C'est-à-dire le rapport poids/distance le plus important.
     """
-    separateurs = [[u'.', 60.0], [u'?', 60.0], [u'!', 60.0], [u'£', 60], [u':', 50.0], [u';', 40.0], [u',', 10.0], [u' ', 0.1]]
+    separateurs = [[u'.', 60.0], [u'?', 60.0], [u'!', 60.0], [u'£$£', 60], [u':', 50.0], [u';', 40.0], [u',', 10.0], [u' ', 0.1]]
     trouve = False                 # si on a trouvé un bon séparateur
     iDecoupe = 0                # indice du caractere ou il faut decouper
     
@@ -375,28 +381,38 @@ def decoupercharact(chaine, longueur, longueurOptimale, separateurs = None) :
     # si on a rien trouvé
     return False, chaine.split(), ''
 
-def BugReport(parent):
+def BugReport(parent, error = None):
     for ch in parent.GetChildren():
         if "<class 'wx._windows.ProgressDialog'>" == str(type(ch)):
             ch.Destroy()   
+    excName, exc, excTb = formatExceptionInfo()
+    if excName == 'Exception' :
+        txt = 'Message :\n'
+    else :
+        txt = u'            !== BUG ==!       \n'
+        txt += u'*************************************\n'
+        txt += '\n'.join(excTb).replace('    ', ' ')
+        txt += excName + '\n'
+    txt += exc
+
     dial = BugDialog(parent)
-    txt = u'            !== BUG ==!       \n'
-    txt += u'*************************************\n'
-    for line in formatExceptionInfo():
-        if type(line) == type([]):
-            for don in line:
-                txt += don.replace('    ', ' ')
-        else:
-            txt += line + '\n'
+    #for line in formatExceptionInfo():
+    #    if type(line) == type([]):
+    #        for don in line:
+    #            txt += don.replace('    ', ' ')
+    #    else:
+    #        txt += line + '\n'
     if 'Rerror' in dir(parent) :
         txt += parent.Rerror
         parent.Rerror = ''
+    #if error is not None :
+    #    txt += '\n%s\n' %error
     print formatExceptionInfo()
     log.error(txt)
     dial.text_ctrl_1.write(txt)
     dial.CenterOnParent()
     dial.ShowModal()
-    raise NameError('Bug')
+    #raise Exception('Bug')
     
 def PlaySound(parent):
     if parent.pref.getboolean('iramuteq', 'sound') :
@@ -509,7 +525,7 @@ def check_Rresult(parent, pid) :
             except :
                 BugReport(parent)
     else :
-        if pid !=0 :
+        if pid != 0 :
             try :
                 raise Exception(u'Erreur R')
             except :