...

[iramuteq] / functions.py

diff --git a/functions.py b/functions.py
index 28d648e..1f4d8bb 100644 (file)
--- a/functions.py
+++ b/functions.py
@@ -88,9 +88,10 @@ class History :
         self.read()
 
     def addmultiple(self, analyses) :
+        log.info('add multiple')
         for analyse in analyses :
             tosave = {'uuid' : analyse['uuid'], 'ira': analyse['ira'], 'type' : analyse['type']}
-            corpus = analyse['uuid']
+            corpus = analyse['corpus']
             tosave['corpus'] = corpus
             tosave['name'] = analyse['name']
             if corpus in self.corpus :
@@ -102,6 +103,7 @@ class History :
         self.read()
 
     def delete(self, analyse, corpus = False) :
+        log.info('delete %s' % analyse.get('name', 'noname'))
         if corpus :
             self.history.pop(self.ordercorpus[analyse['uuid']])
             if analyse['uuid'] in self.openedcorpus :
@@ -119,6 +121,11 @@ class History :
 
     def rmtab(self, analyse) :
         del self.opened[analyse['uuid']]
+
+    def clean(self) :
+        corpustodel = [corpus for corpus in self.history if not os.path.exists(corpus['ira'])]
+        for corpus in corpustodel :
+            self.delete(corpus, corpus = True)
     
     def __str__(self) :
         return str(self.history)
@@ -427,7 +434,7 @@ def BugReport(parent, error = None):
                 txt = exc
         else :
             if exc in exceptions :
-                txt = exceptions[mss]
+                txt = exceptions[exc]
             else :
                 txt = exc
         title = "Information"
@@ -466,7 +473,7 @@ def ReadDicoAsDico(dicopath):
     dico = {}
     for line in content :
         if line[0] != u'':
-            line = line.replace(u'\n', '').replace('"', '').split('\t')
+            line = line.rstrip('\n\r').replace(u'\n', '').replace('"', '').split('\t')
             dico[line[0]] = line[1:]
     return dico
 
@@ -517,7 +524,6 @@ def exec_rcode(rpath, rcode, wait = True, graph = False):
     if sys.platform == 'darwin' :
         try :
             macversion = platform.mac_ver()[0].split('.')
-            print macversion
             if int(macversion[1]) < 5 :
                 needX11 = True
             else :
@@ -526,18 +532,21 @@ def exec_rcode(rpath, rcode, wait = True, graph = False):
             needX11 = False
 
     rpath = rpath.replace('\\','\\\\')
+    env = os.environ.copy()
+    if sys.platform == 'darwin' and 'LC_ALL' not in env:
+        env['LC_ALL'] = 'en_US.UTF-8'
     if not graph :
         if wait :
             if sys.platform == 'win32':
                 error = call(["%s" % rpath, "--vanilla","--slave","-f", "%s" % rcode])
             else :
-                error = call([rpath, '--vanilla','--slave',"-f %s" % rcode])
+                error = call([rpath, '--slave', "--vanilla", "-f %s" % rcode, "--encoding=UTF-8"], env = env)
             return error
         else :
             if sys.platform == 'win32':
                 pid = Popen(["%s" % rpath, '--vanilla','--slave','-f', "%s" % rcode])
             else :
-                pid = Popen([rpath, '--vanilla','--slave',"-f %s" % rcode], stderr = PIPE)
+                pid = Popen([rpath, '--slave', "--vanilla", "-f %s" % rcode, "--encoding=UTF-8"], stderr = PIPE, env = env)
             return pid
     else :
         if wait :
@@ -545,18 +554,18 @@ def exec_rcode(rpath, rcode, wait = True, graph = False):
                 error = call(["%s" % rpath, '--vanilla','--slave','-f', "%s" % rcode])
             elif sys.platform == 'darwin' and needX11:
                 os.environ['DISPLAY'] = ':0.0'
-                error = call([rpath, '--vanilla','--slave',"-f %s" % rcode])
+                error = call([rpath, '--vanilla','--slave',"-f %s" % rcode, "--encoding=UTF-8"], env = env)
             else :
-                error = call([rpath, '--vanilla','--slave',"-f %s" % rcode])
+                error = call([rpath, '--vanilla','--slave',"-f %s" % rcode, "--encoding=UTF-8"], env = env)
             return error
         else :
             if sys.platform == 'win32':
                 pid = Popen(["%s" % rpath, '--vanilla','--slave','-f', "%s" % rcode])
             elif sys.platform == 'darwin' and needX11:
                 os.environ['DISPLAY'] = ':0.0'
-                pid = Popen([rpath, '--vanilla','--slave',"-f %s" % rcode], stderr = PIPE)
+                pid = Popen([rpath, '--vanilla','--slave',"-f %s" % rcode, "--encoding=UTF-8"], stderr = PIPE, env = env)
             else :
-                pid = Popen([rpath, '--vanilla','--slave',"-f %s" % rcode], stderr = PIPE)
+                pid = Popen([rpath, '--vanilla','--slave',"-f %s" % rcode, "--encoding=UTF-8"], stderr = PIPE, env = env)
             return pid
 
 def check_Rresult(parent, pid) :
@@ -671,3 +680,20 @@ def treat_var_mod(variables) :
                 if not mod in var_mod[var] :
                     var_mod[var].append(variable)
     return var_mod
+
+def doconcorde(corpus, uces, mots) :
+    ucestxt1 = [row for row in corpus.getconcorde(uces)]
+    ucestxt1 = dict(ucestxt1)
+    ucestxt = []
+    ucis_txt = []
+    listmot = [corpus.getlems()[lem].formes for lem in mots]
+    listmot = [corpus.getforme(fid).forme for lem in listmot for fid in lem]
+    mothtml = ['<font color=red><b>'+mot+'</b></font>' for mot in listmot]
+    dmots = dict(zip(listmot, mothtml))
+    for uce in uces :
+        ucetxt = ucestxt1[uce].split()
+        ucetxt = ' '.join([dmots.get(mot, mot) for mot in ucetxt])
+        ucis_txt.append('<p><b>' + ' '.join(corpus.ucis[corpus.getucefromid(uce).uci].etoiles) + '</b></p>')
+        ucestxt.append(ucetxt)        
+    return ucis_txt, ucestxt
+