Adiciona VLIBRAS e LIBRAS como excessao do plural e adiciona get HOMEDRIVE pra Windows

Erickson Silva
1 parent 75ecc2bb
Showing 3 changed files with 5 additions and 3 deletions Show diff stats
src/AplicadorRegras.py
src/Simplificador.py
src/WorkCSV.py
@@ -5,6 +5,7 @@
 import xml.etree.ElementTree as ET
 from os.path import expanduser
+from os import environ
 import platform
 class AplicadorRegras(object):
@@ -14,7 +15,7 @@ class AplicadorRegras(object):
         so = platform.system()
         if so == 'Windows':
-            self.__tree = ET.parse(expanduser("~")+'\vlibras-translate\data\regras.xml')
+            self.__tree = ET.parse(environ.get("HOMEDRIVE")+'\vlibras-translate\data\regras.xml')
         else:
             self.__tree = ET.parse(expanduser("~")+'/vlibras-translate/data/regras.xml')
@@ -36,7 +36,7 @@ class Simplificador(object):
 			if self.__dicWords.has_key(t) == False: # verifica se nao eh artigo/preposicao
 				wu = str(w).upper() 						# deixa o token maiusculo
 				#if t[:2] == "VB":
-				if t[-2:] == "-P":
+				if t[-2:] == "-P" and wu != "VLIBRAS" and wu != "LIBRAS":
 					wu = self.pluralAnalysis(w)
 				if t == "VB-P" or t == "VB-D" or t == "VB-R":
 					self.__verb = True
@@ -4,6 +4,7 @@
 #Autor: Erickson Silva <erickson.silva@lavid.ufpb.br> <ericksonsilva@live.com>
 import csv, platform
+from os import environ
 from os.path import expanduser
 class WorkCSV(object):
@@ -13,7 +14,7 @@ class WorkCSV(object):
       so = platform.system()
       if so == 'Windows':
-         self.__path = expanduser("~") + "\vlibras-translate\data\"
+         self.__path = environ.get("HOMEDRIVE") + "\vlibras-translate\data\"
       else:
          self.__path = expanduser("~") + "/vlibras-translate/data/"
	@@ -36,7 +36,7 @@ class Simplificador(object):		@@ -36,7 +36,7 @@ class Simplificador(object):
36	if self.__dicWords.has_key(t) == False: # verifica se nao eh artigo/preposicao	36	if self.__dicWords.has_key(t) == False: # verifica se nao eh artigo/preposicao
37	wu = str(w).upper() # deixa o token maiusculo	37	wu = str(w).upper() # deixa o token maiusculo
38	#if t[:2] == "VB":	38	#if t[:2] == "VB":
39	- if t[-2:] == "-P":	39	+ if t[-2:] == "-P" and wu != "VLIBRAS" and wu != "LIBRAS":
40	wu = self.pluralAnalysis(w)	40	wu = self.pluralAnalysis(w)
41	if t == "VB-P" or t == "VB-D" or t == "VB-R":	41	if t == "VB-P" or t == "VB-D" or t == "VB-R":
42	self.__verb = True	42	self.__verb = True