From 622366b7432b67b67c9db81466d2c2735a96c12b Mon Sep 17 00:00:00 2001
From: Erickson Silva <erickson.silva@lavid.ufpb.br>
Date: Tue, 24 Mar 2015 14:34:39 -0300
Subject: [PATCH] Codifica dados dos dicionários para UTF-8

---
 src/new/LerDicionarios.py | 15 +++++++++++----
 src/new/PortGlosa.py      |  6 +++---
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/new/LerDicionarios.py b/src/new/LerDicionarios.py
index 964e671..be522a3 100644
--- a/src/new/LerDicionarios.py
+++ b/src/new/LerDicionarios.py
@@ -7,6 +7,7 @@
 #LAViD - Laboratório de Aplicações de Vídeo Digital
 
 from os.path import expanduser
+from os import environ
 import csv
 import platform
 
@@ -28,7 +29,7 @@ class LerDicionarios(object):
 
    def get_path(self):
       if platform.system() == 'Windows':
-         return expanduser("~") + "\\vlibras-translate\data\\"
+         return os.environ.get("HOMEDRIVE") + "\\vlibras-libs\\vlibras-translate\data\\"
       return expanduser("~") + "/vlibras-translate/data/"
 
    def carregar_dicionarios(self):
@@ -98,7 +99,10 @@ class LerDicionarios(object):
    
       for row in self.file:
          if row[1] != "":
-            self.dic_sin[row[0].decode("utf-8")] = row[1].decode("utf-8")
+            try:
+               self.dic_sin[row[0].decode("utf-8")] = row[1].decode("utf-8")
+            except UnicodeDecodeError:
+               self.dic_sin[row[0].decode('iso8859-1').encode('utf-8').decode('utf-8')] = row[1].decode('iso8859-1').encode('utf-8').decode('utf-8')
 
    def carregar_subs_2_generos(self):
       try:
@@ -109,7 +113,7 @@ class LerDicionarios(object):
 
       rows = []
       for row in self.file:
-         rows.append(row[0].decode("utf-8"))
+         rows.append(row[0].decode('iso8859-1').encode('utf-8').decode('utf-8'))
       self.set_sb_2_gen = set(rows)    
 
    def carregar_verbos_infinitivo(self):
@@ -121,7 +125,10 @@ class LerDicionarios(object):
 
       for row in self.file:
          if row[1] != "": 
-            self.dic_vb_infinitivo[row[0].decode("utf-8")] = row[1].decode("utf-8")  
+            try:
+               self.dic_vb_infinitivo[row[0].decode("utf-8")] = row[1].decode("utf-8") 
+            except UnicodeDecodeError:
+               self.dic_vb_infinitivo[row[0].decode('iso8859-1').encode('utf-8').decode('utf-8')] = row[1].decode('iso8859-1').encode('utf-8').decode('utf-8')
 
    def carregar_verbos_ligacao(self):
       try:
diff --git a/src/new/PortGlosa.py b/src/new/PortGlosa.py
index 881e0a4..a8f70ba 100644
--- a/src/new/PortGlosa.py
+++ b/src/new/PortGlosa.py
@@ -8,14 +8,14 @@
 
 from TraduzSentencas import *
 
-def traduz(texto):
+def traduzir(texto):
 	glosa = iniciar_traducao(texto)
 	if glosa:
 		return glosa
 	return "selecione_texto"
 	
 def iniciar_traducao(texto):
-	texto_quebrado = quebrar_texto(texto.lower())
+	texto_quebrado = quebrar_texto(texto)
 	num_threads = len(texto_quebrado)
 	texto_traduzido = []
 	threads = []
@@ -45,6 +45,6 @@ def quebrar_texto(texto):
 		sentencas.append(texto)
 	return sentencas
 
-def help():
+def ajuda():
 	#TODO: Adicionar um pequeno tuto aqui
 	print "Help"
\ No newline at end of file
--
libgit2 0.21.2