X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=iracmd.py;h=8c000cb164d0c63b7407a4d6b1545adec33e3d7b;hp=e0fd3dab5907ddd429c9acbb45ca58d1fdcf5f89;hb=e47f8c20e356631980624eb52d8476b3b86917c5;hpb=a503f041dc4947ee21c1d353ddd05ddb13a5e322

diff --git a/iracmd.py b/iracmd.py
index e0fd3da..8c000cb 100644
--- a/iracmd.py
+++ b/iracmd.py
@@ -12,14 +12,17 @@ import locale
 import codecs
 sys.setdefaultencoding(locale.getpreferredencoding())
 from chemins import ConstructConfigPath, ConstructDicoPath, ConstructRscriptsPath
-from functions import ReadLexique, DoConf, History
+from functions import ReadLexique, DoConf, History, ReadDicoAsDico
 from ConfigParser import *
 #######################################
 #from textchdalc import AnalyseAlceste
 #from textdist import PamTxt
 #from textafcuci import AfcUci
+from analysetxt import Alceste,  gramact, gramsup
+from corpus import Corpus, copycorpus
 from textaslexico import Lexico
 from textstat import Stat
+from tools import SubCorpus
 import tempfile
 ######################################
 import logging
@@ -31,9 +34,7 @@ log.addHandler(ch)
 log.setLevel(logging.DEBUG)
 #######################################
 
-log.debug('----------TEST corpusNG-----------------')
-from analysetxt import Alceste,  gramact, gramsup
-from corpusNG import *
+
 
 #cmd = iracmd.CmdLine(args=['-f','/home/pierre/workspace/iramuteq/corpus/lru2.txt','-t','alceste'])
 
@@ -56,7 +57,7 @@ class CmdLine :
         self.RPath = self.PathPath.get('PATHS', 'rpath')
         self.pref = RawConfigParser()
         self.pref.read(self.ConfigPath['preferences'])
-        self.history = History(self.ConfigPath['history'])
+        self.history = History(os.path.join(UserConfigPath, 'history.db'))
 
         parser = OptionParser()
     
@@ -80,7 +81,6 @@ class CmdLine :
             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 and options.type_analyse :
             config = DoConf(self.ConfigPath[options.type_analyse]).getoptions()
         elif options.read :
@@ -91,13 +91,11 @@ class CmdLine :
             print 'rien a faire'
             return
 
-        #self.history.write()
-        if options.filename or options.read :#or options.build:
+        if options.filename or options.read :
             self.corpus_encodage = options.encodage
             self.corpus_lang = options.language
                 
 
-            #print 'PAS DE CODECS POUR CABLE'
             ReadLexique(self, lang = options.language)
             self.expressions = ReadDicoAsDico(self.DictPath.get(options.language + '_exp', 'french_exp'))
             if options.filename :
@@ -120,18 +118,19 @@ class CmdLine :
                 else :
                     self.history.add(corpus.parametres)
                     corpus = copycorpus(corpus)
-
-                #with codecs.open(self.filename, 'r', self.corpus_encodage) as f:
             elif options.read :
                 corpus = Corpus(self, parametres = DoConf(options.read).getoptions('corpus'), read = options.read)
-                corpus.parametres['path'] = os.path.abspath(options.read)
+                corpus.parametres['pathout'] = os.path.dirname(os.path.abspath(options.read))
                 pathout = os.path.dirname(os.path.dirname(os.path.abspath(options.read)))
                 self.corpus = corpus
 
             if corpus is not None :
                 corpus.conn_all()
+                #corpus = SubCorpus(self, corpus, [0,1,2,3,4,5,6,7])
+                #corpus.conn_all()
                 corpus.make_lems()
                 corpus.parse_active(gramact, gramsup)
+                #print corpus.getlemconcorde('de').fetchall()
 #            log.warning('ATTENTION gethapaxuces')
 #            MakeUciStat(corpus)
 #            qfqsdf
@@ -159,7 +158,7 @@ class CmdLine :
                 elif options.type_analyse == 'afcuci' :
                     self.Text = AfcUci(self, cmd = True)
                 elif options.type_analyse == 'stat' :
-                    self.Text = Stat(self, corpus, parametres = config)
+                    self.Text = Stat(self, corpus, parametres = {'type':'stat'})
                 elif options.type_analyse == 'spec' :
                     self.Text = Lexico(self, corpus, config = {'type' : 'spec'})
             #print self.Text.corpus.hours, 'h', self.Text.corpus.minutes,'min', self.Text.corpus.seconds, 's'