From 85b93605c378f52bae72bff4cbd9f9b74f1beedb Mon Sep 17 00:00:00 2001
From: ftyers <ftyers@72bbbca6-d526-0410-a7d9-f06f51895060>
Date: Tue, 20 Nov 2007 12:37:28 +0000
Subject: [PATCH] Minor changes

git-svn-id: https://apertium.svn.sourceforge.net/svnroot/apertium@2517 72bbbca6-d526-0410-a7d9-f06f51895060
---
 apertium-forms-server/interface.py |  5 +++--
 apertium-forms-server/pair.py      | 30 ++++++++++++++++++++----------
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/apertium-forms-server/interface.py b/apertium-forms-server/interface.py
index 4d1929f6..451a31fa 100644
--- a/apertium-forms-server/interface.py
+++ b/apertium-forms-server/interface.py
@@ -145,8 +145,8 @@ class Interface: #{
                 print '    <input type="submit" name="commit_box" value="Commit">';
                 print '';
 
-		print '<pre>';
 		bidix_entrada = self.show_entrada(post_data, 'bidix');
+		print '<pre>';
 		print bidix_entrada.replace('<', '&lt;').replace('>', '&gt;');
 		print '</pre>';
                 print '  </div>';
@@ -252,11 +252,12 @@ class Interface: #{
 	
 				if type(paradigm) != type(None): #{
 					_lemma = post_data[_side + '_lemma'];
+					_restriction = post_data['restriction'];
 					_paradigm = paradigm.name;
 					_comment = '';
 					_author = 'webform';
 		
-					entrada = dictionary.generate_monodix_entrada(_lemma, _paradigm, _comment, _author);
+					entrada = dictionary.generate_monodix_entrada(_lemma, _paradigm, _restriction, _comment, _author);
 	
 					return entrada;
 				#}
diff --git a/apertium-forms-server/pair.py b/apertium-forms-server/pair.py
index a458cd4c..19cbd497 100644
--- a/apertium-forms-server/pair.py
+++ b/apertium-forms-server/pair.py
@@ -89,14 +89,20 @@ class Dictionary: #{
 
 	def get_paradigm(self, _name, _tag): #{
 		paradigm = None;
-		for _paradigm in self.paradigms[_tag].values(): #{
-			if _paradigm.name == _name: #{	
-				paradigm = _paradigm;	
-			#}
-		#}
+
+		paradigm = self.paradigms[_tag].get(_name);
 		
 		if paradigm == None: #{
-			return None;
+			print >> sys.stderr, 'We didn`t find the paradigm in the hash';
+			for _paradigm in self.paradigms[_tag].values(): #{
+				if _paradigm.name == _name: #{	
+					paradigm = _paradigm;	
+				#}
+			#}
+
+			if paradigm == None: #{
+				return None;
+			#}
 		#}
 
 		# paradigm already loaded
@@ -183,14 +189,18 @@ class Dictionary: #{
 		self.glosses[_paradigm] = _gloss;
 	#}
 
-        def generate_monodix_entrada(self, _lemma, _paradigm, _comment, _author): #{
+        def generate_monodix_entrada(self, _lemma, _paradigm, _restriction, _comment, _author): #{
                 incondicional = self.incondicional(_lemma, _paradigm);
 		print >> sys.stderr, 'lemma: ' + _lemma + ', paradigm: ' + _paradigm + ', comment: ' + _comment + ', author: ' + _author;
 
+		if _restriction == "none" or _restriction == '': #{
+			entrada = '<e lm="' + _lemma + '" a="' + _author + '">' + "\n" + '  <i>' + incondicional + '</i>' + "\n" + '  <par n="' + _paradigm + '"/>' + "\n" + '</e>';
+		else: #{
+			entrada = '<e r="' + _restriction + '" lm="' + _lemma + '" a="' + _author + '">' + "\n" + '  <i>' + incondicional + '</i>' + "\n" + '  <par n="' + _paradigm + '"/>' + "\n" + '</e>';
+		#}
+
                 if _comment != '': #{
-                        entrada = '<e lm="' + _lemma + '" a="' + _author + '">' + "\n" + '  <i>' + incondicional + '</i>' + "\n" + '  <par n="' + _paradigm + '"/>' + "\n" + '</e>' +  '<!-- ' + _comment + ' -.' + "\n";
-                else: #{
-                        entrada = '<e lm="' + _lemma + '" a="' + _author + '">' + "\n" + '  <i>' + incondicional + '</i>' + "\n" + '  <par n="' + _paradigm + '"/>' + "\n" + '</e>';
+			entrada = entrada +  '<!-- ' + _comment + ' -.' + "\n";
                 #}
 
 		print >> sys.stderr, entrada;
-- 
2.11.4.GIT