X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=functions.py;h=f609e65129141fda0357e97d095694b6171fa470;hp=2909a4449b9f8f2aeb48aa7eb8e2a00e24d26cbf;hb=e4e874212adccd8ac034d0a99d3304aca06b3f04;hpb=0bb1e9556fdbb07e171b663ffcea149692a8a49f diff --git a/functions.py b/functions.py index 2909a44..f609e65 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,18 +74,23 @@ class History : log.info('write history') def add(self, analyse) : - if 'corpus' in analyse : - if analyse['corpus'] in self.corpora : - if 'analyses' in self.history[analyse['corpus']] : - self.history[analyse['corpus']]['analyses'].append(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(tosave) else : - self.history[analyse['corpus']]['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) : @@ -107,6 +111,9 @@ class History : def rmtab(self, analyse) : del self.opened[analyse['uuid']] + + def __str__(self) : + return str(self.history) class DoConf : def __init__(self, configfile=None, diff = None, parametres = None) : @@ -144,26 +151,35 @@ class DoConf : return parametres def makeoptions(self, sections, parametres, outfile = None) : + txt = '' for i, section in enumerate(sections) : + txt += '[%s]\n' % section if not self.conf.has_section(section) : self.conf.add_section(section) for option in parametres[i] : if isinstance(parametres[i][option], int) : self.conf.set(section, option, `parametres[i][option]`) + txt += '%s = %i\n' % (option, parametres[i][option]) elif isinstance(parametres[i][option], basestring) : self.conf.set(section, option, parametres[i][option].encode('utf8')) + txt += '%s = %s\n' % (option, parametres[i][option].encode('utf8')) elif isinstance(parametres[i][option], wx.Colour) : self.conf.set(section, option, str(parametres[i][option])) + txt += '%s = %s' % (option, str(parametres[i][option])) + elif option == 'analyses' : + pass else : self.conf.set(section, option, `parametres[i][option]`) + txt += '%s = %s' % (option, `parametres[i][option]`) if outfile is None : outfile = self.configfile - print outfile with codecs.open(outfile, 'w', 'utf8') as f : - self.conf.write(f) + f.write(txt) + #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]`])) @@ -308,8 +324,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 = "" excTb = traceback.format_tb(trbk, maxTBlevel) return (excName, excArgs, excTb) @@ -322,7 +338,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 @@ -372,28 +388,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 "" == 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') : @@ -417,7 +443,10 @@ def ReadDicoAsDico(dicopath): return dico def ReadLexique(parent, lang = 'french'): - parent.lexique = ReadDicoAsDico(parent.DictPath.get(lang, 'french')) + if lang != 'other' : + parent.lexique = ReadDicoAsDico(parent.DictPath.get(lang, 'french')) + else : + parent.lexique = {} def ReadList(filein, encoding = sys.getdefaultencoding()): #file = open(filein) @@ -506,7 +535,7 @@ def check_Rresult(parent, pid) : except : BugReport(parent) else : - if pid !=0 : + if pid != 0 : try : raise Exception(u'Erreur R') except :