upgrade only once :)

diff --git a/checkinstall.py b/checkinstall.py
index 5fb6ef1..93aa358 100644 (file)
--- a/checkinstall.py
+++ b/checkinstall.py
@@ -45,6 +45,7 @@ def IsNew(self):
                 return True
 
 def UpgradeConf(self) :
                 return True
 
 def UpgradeConf(self) :

+    log.info('upgrade conf')

     dictuser = self.ConfigPath
     dictappli = ConstructConfigPath(self.AppliPath, user = False)
     for item,filein in dictuser.iteritems():
     dictuser = self.ConfigPath
     dictappli = ConstructConfigPath(self.AppliPath, user = False)
     for item,filein in dictuser.iteritems():

diff --git a/corpus.py b/corpus.py
index 2e85ed5..cd6c364 100644 (file)
--- a/corpus.py
+++ b/corpus.py
@@ -77,10 +77,10 @@ class Corpus :
                 gramtype = self.parent.lexique[word][1]
                 lem = self.parent.lexique[word][0]
             elif word.isdigit() :
                 gramtype = self.parent.lexique[word][1]
                 lem = self.parent.lexique[word][0]
             elif word.isdigit() :

-                gramtype = 'num'
+                gramtype = u'num'

                 lem = word
             else :
                 lem = word
             else :

-                gramtype = 'nr'
+                gramtype = u'nr'

                 lem = word
             self.formes[word] =  Word(word, gramtype, len(self.formes), lem)
             self.idformesuces[self.formes[word].ident] = {self.ucis[-1].uces[-1].ident : 1}
                 lem = word
             self.formes[word] =  Word(word, gramtype, len(self.formes), lem)
             self.idformesuces[self.formes[word].ident] = {self.ucis[-1].uces[-1].ident : 1}

diff --git a/iramuteq.py b/iramuteq.py
index 90212a7..cf7088a 100644 (file)
--- a/iramuteq.py
+++ b/iramuteq.py
@@ -441,6 +441,7 @@ class IraFrame(wx.Frame):
             self.pref.read(self.ConfigPath['preferences'])
             if IsNew(self) :
                 UpgradeConf(self)
             self.pref.read(self.ConfigPath['preferences'])
             if IsNew(self) :
                 UpgradeConf(self)

+                self.pref.read(self.ConfigPath['preferences'])

                 New = True
             else :
                 CopyConf(self)
                 New = True
             else :
                 CopyConf(self)