X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=iracmd.py;h=ad31bed9473a96556ee1c24b074cb117849a1898;hp=deba7cf4319c8504428c62dcd6647087b2df3d23;hb=81594f689f1e191599d96a2a503fbb5529df69d7;hpb=8fa853a25a9d62b1446e1bc543e5a3a4d0e03dcf

diff --git a/iracmd.py b/iracmd.py
index deba7cf..ad31bed 100644
--- a/iracmd.py
+++ b/iracmd.py
@@ -22,7 +22,6 @@ from textaslexico import Lexico
 from textstat import Stat
 import tempfile
 ######################################
-print '#######LOGGING TEST###########'
 import logging
 log = logging.getLogger('iramuteq')
 formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
@@ -53,9 +52,9 @@ class CmdLine :
         parser = OptionParser()
     
         parser.add_option("-f", "--file", dest="filename", help="chemin du corpus", metavar="FILE", default=False)
-        parser.add_option("-t", "--type", dest="type_analyse", help="type d'analyse", metavar="TYPE D'ANALYSE", default='False')
-
-        parser.add_option("-c", "--conf", dest="configfile", help="chemin du fichier de configuration", metavar="CONF", default=False)
+        parser.add_option("-t", "--type", dest="type_analyse", help="type d'analyse", metavar="TYPE D'ANALYSE", default=False)
+        parser.add_option("-c", "--conf", dest="configfile", help="chemin du fichier de configuration pour l'analyse", metavar="CONF", default=None)
+        parser.add_option("-d", "--confcorp", dest="corpusconfigfile", help="chemin du fichier de configuration pour le corpus", metavar="CONF", default=None)
         parser.add_option("-e", "--enc", dest="encodage", help="encodage du corpus", metavar="ENC", default=locale.getpreferredencoding())
         parser.add_option("-l", "--lang", dest="language", help="langue du corpus", metavar="LANG", default='french')
         parser.add_option("-r", "--read", dest="read", help="lire un corpus", metavar="READ", default = False)
@@ -63,8 +62,17 @@ class CmdLine :
         (options, args) = parser.parse_args()
         print args
         print options
-        if options.configfile :
-            self.ConfigPath[options.type_analyse] = os.path.abspath(options.configfile)
+        options.type_analyse
+        if options.configfile is not None:
+            config = DoConf(os.path.abspath(options.configfile)).getoptions()
+        elif options.filename and options.type_analyse :
+            config = DoConf(self.ConfigPath[options.type_analyse]).getoptions()
+            #self.ConfigPath[options.type_analyse] = os.path.abspath(options.configfile)
+        elif options.read :
+            pass
+        else :
+            print 'rien a faire'
+            return
         self.TEMPDIR = tempfile.mkdtemp('iramuteq') 
         self.RscriptsPath = ConstructRscriptsPath(AppliPath)
         self.PathPath = ConfigParser()
@@ -74,7 +82,7 @@ class CmdLine :
         self.pref.read(self.ConfigPath['preferences'])
         self.history = History(self.ConfigPath['history'])
         #self.history.write()
-        if options.filename or options.read or options.build:
+        if options.filename or options.read :#or options.build:
             self.corpus_encodage = options.encodage
             self.corpus_lang = options.language
                 
@@ -84,13 +92,18 @@ class CmdLine :
             self.expressions = ReadDicoAsDico(self.DictPath.get(options.language + '_exp', 'french_exp'))
             if options.filename :
                 self.filename = os.path.abspath(options.filename)
-                corpus_parametres = DoConf('/home/pierre/.iramuteq/corpus.cfg').getoptions('corpus')
-                corpus_parametres['filename'] = self.filename
+                if options.corpusconfigfile is not None :
+                    corpus_parametres = DoConf(options.corpusconfigfile).getoptions('corpus')
+                else :
+                    corpus_parametres = DoConf(self.ConfigPath['corpus']).getoptions()
+                dire, corpus_parametres['filename'] = os.path.split(self.filename)
+                corpus_parametres['originalpath'] = self.filename
                 corpus_parametres['encoding'] = self.corpus_encodage
-                corpus_parametres['syscoding'] = 'utf8'
-                corpus_parametres['pathout'] = PathOut(options.filename, 'corpus').dirout
+                corpus_parametres['syscoding'] = locale.getpreferredencoding()
+                corpus_parametres['pathout'] = PathOut(self.filename, 'corpus').mkdirout()
                 corpus = BuildFromAlceste(self.filename, corpus_parametres, self.lexique, self.expressions).corpus
                 self.history.add(corpus.parametres)
+                corpus = copycorpus(corpus)
 
                 #with codecs.open(self.filename, 'r', self.corpus_encodage) as f:
             elif options.read :
@@ -100,7 +113,18 @@ class CmdLine :
 
 
             corpus.conn_all()
+            corpus.make_lems()
             corpus.parse_active(gramact, gramsup)
+#            log.warning('ATTENTION gethapaxuces')
+#            MakeUciStat(corpus)
+#            qfqsdf
+            #corpus.gethapaxuces()
+            #ucisize = corpus.getucisize()
+            #ucisize = [`val` for val in ucisize]
+            #uciet = [uci.etoiles[1] for uci in corpus.ucis]
+            #res = zip(uciet, ucisize)
+            #with open('ucisize.csv', 'w') as f :
+            #    f.write('\n'.join(['\t'.join(val) for val in res]))
                 #    self.content = f.read()
                 #self.content = self.content.replace('\r','')
             if options.type_analyse == 'alceste' :
@@ -109,7 +133,8 @@ class CmdLine :
                     #zerzre
                 #corpus.read_corpus()
                 #corpus.parse_active(gramact, gramsup)
-                Alceste(self, corpus)
+                config['type'] = 'alceste'
+                Alceste(self, corpus, parametres = config)
             #    self.Text = AnalyseAlceste(self, cmd = True, big = True)
                 #self.Text = AnalyseAlceste(self, cmd = True)
             elif options.type_analyse == 'pam' :