team4alfanous team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 544
committer: Assem Chelli <assem.ch@xxxxxxxxx>
timestamp: Tue 2013-01-22 05:59:41 +0100
message:
  retrieve derivations, lemma & root
modified:
  src/alfanous/Outputs.py


--
lp:alfanous
https://code.launchpad.net/~team4alfanous/alfanous/alfanous-git

Your team Alfanous team is subscribed to branch lp:alfanous.
To unsubscribe from this branch go to https://code.launchpad.net/~team4alfanous/alfanous/alfanous-git/+edit-subscription

=== modified file 'src/alfanous/Outputs.py'
--- src/alfanous/Outputs.py	2013-01-20 14:45:50 +0000
+++ src/alfanous/Outputs.py	2013-01-22 04:59:41 +0000
@@ -44,6 +44,7 @@
 from alfanous.TextProcessing import QArabicSymbolsFilter
 from alfanous.Data import *
 from alfanous.Misc import buck2uni
+from alfanous.Misc import LOCATE, FIND, FILTER_DOUBLES
 
 
 STANDARD2UTHMANI = lambda x: std2uth_words[x] if std2uth_words.has_key( x ) else x
@@ -583,19 +584,26 @@
 					nb_vocalizations_globale += len( vocalizations )
 					synonyms = syndict[term[1]] if syndict.has_key( term[1] ) \
 										   else []
-					derivations = derivedict[term[1]] if derivedict.has_key( term[1] ) \
-										   else []
+
+					lemma = LOCATE( derivedict["word_"], derivedict["lemma"], term[1] )
+					root = LOCATE( derivedict["word_"], derivedict["root"], term[1] )
+					if lemma:  # if different of none
+						derivations = FILTER_DOUBLES( FIND( derivedict["lemma"], derivedict["word_"], lemma ) )
+					else:
+						derivations = []
 					words_output[ "individual" ][ cpt ] = {
 															 "word":term[1],
 															 "romanization": buck2uni( term[1], ignore = "" , reverse = True ) if romanization == "buckwalter" else None,
 															 "nb_matches":term[2],
 															 "nb_ayas":term[3],
-															 "nb_vocalizations": len( vocalizations ),
+															 "nb_vocalizations": len( vocalizations ),#unneeded
 															 "vocalizations": vocalizations,
-															 "nb_synonyms": len( synonyms ),
-															 "synonyms": synonyms,
-															 "nb_derivations": len( derivations ),
-															 "derivations": derivations
+															 "nb_synonyms": len( synonyms ),#unneeded
+															 "synonyms": synonyms, #unneeded for normal mode
+															 "lemma": lemma,
+															 "root": root,
+															 "nb_derivations": len( derivations ), #unneeded
+															 "derivations": derivations #unneeded for normal mode
 														 }
 					cpt += 1
 			annotation_word_query += u" ) "