projects
/
iramuteq
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
99bd019
)
...
author
Pierre
<ratinaud@univ-tlse2.fr>
Wed, 30 Jan 2013 16:54:00 +0000
(17:54 +0100)
committer
Pierre
<ratinaud@univ-tlse2.fr>
Wed, 30 Jan 2013 16:54:00 +0000
(17:54 +0100)
functions.py
patch
|
blob
|
history
openanalyse.py
patch
|
blob
|
history
diff --git
a/functions.py
b/functions.py
index
28d648e
..
f2b57df
100644
(file)
--- a/
functions.py
+++ b/
functions.py
@@
-88,9
+88,10
@@
class History :
self.read()
def addmultiple(self, analyses) :
self.read()
def addmultiple(self, analyses) :
+ log.info('add multiple')
for analyse in analyses :
tosave = {'uuid' : analyse['uuid'], 'ira': analyse['ira'], 'type' : analyse['type']}
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 :
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) :
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 :
if corpus :
self.history.pop(self.ordercorpus[analyse['uuid']])
if analyse['uuid'] in self.openedcorpus :
diff --git
a/openanalyse.py
b/openanalyse.py
index
22cf584
..
ddb205b
100644
(file)
--- a/
openanalyse.py
+++ b/
openanalyse.py
@@
-73,10
+73,10
@@
class OpenAnalyse():
log.info('open corpus')
if self.conf['uuid'] not in self.parent.history.corpus :
self.parent.history.add(self.conf)
log.info('open corpus')
if self.conf['uuid'] not in self.parent.history.corpus :
self.parent.history.add(self.conf)
- log.info('add to history')
+ log.info('add
corpus
to history')
self.parent.tree.OnItemAppend(self.conf)
if self.conf['uuid'] in self.parent.history.openedcorpus :
self.parent.tree.OnItemAppend(self.conf)
if self.conf['uuid'] in self.parent.history.openedcorpus :
- log.info('corpus is already opened
1
')
+ log.info('corpus is already opened')
self.doopen(self.parent.history.openedcorpus[self.conf['uuid']])
else :
corpus = Corpus(self, parametres = self.conf, read = self.parent.history.history[self.parent.history.ordercorpus[self.conf['uuid']]]['ira'])
self.doopen(self.parent.history.openedcorpus[self.conf['uuid']])
else :
corpus = Corpus(self, parametres = self.conf, read = self.parent.history.history[self.parent.history.ordercorpus[self.conf['uuid']]]['ira'])
@@
-102,7
+102,7
@@
class OpenAnalyse():
def openanalyse(self) :
if self.conf['corpus'] in self.parent.history.openedcorpus :
def openanalyse(self) :
if self.conf['corpus'] in self.parent.history.openedcorpus :
- log.info('corpus is already opened
2
')
+ log.info('corpus is already opened')
corpus = copycorpus(self.parent.history.openedcorpus[self.conf['corpus']])
else :
if os.path.exists(self.parent.history.history[self.parent.history.ordercorpus[self.conf['corpus']]]['ira']) :
corpus = copycorpus(self.parent.history.openedcorpus[self.conf['corpus']])
else :
if os.path.exists(self.parent.history.history[self.parent.history.ordercorpus[self.conf['corpus']]]['ira']) :