From e68381255a44abcace26a028171060e3df065049 Mon Sep 17 00:00:00 2001
From: ftyers <ftyers@72bbbca6-d526-0410-a7d9-f06f51895060>
Date: Thu, 22 Nov 2007 15:36:52 +0000
Subject: [PATCH] Minor fixes

git-svn-id: https://apertium.svn.sourceforge.net/svnroot/apertium@2568 72bbbca6-d526-0410-a7d9-f06f51895060
---
 apertium-forms-server/interface.py |  2 +-
 apertium-forms-server/pair.py      | 54 ++++++++++++++++++++++++++++++++++++--
 2 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/apertium-forms-server/interface.py b/apertium-forms-server/interface.py
index c9d9653b..615c6346 100644
--- a/apertium-forms-server/interface.py
+++ b/apertium-forms-server/interface.py
@@ -335,7 +335,7 @@ class Interface: #{
 		
 					if _restriction == 'LR' and _side == 'right': #{
 						entrada = dictionary.generate_monodix_entrada(_lemma, _paradigm, 'RL', _comment, _author);
-					elif _restriction == 'RL' and _side == 'left': #{
+					elif _restriction == 'RL' and _side == 'right': #{
 						entrada = dictionary.generate_monodix_entrada(_lemma, _paradigm, 'LR', _comment, _author);
 					else: #{
 						entrada = dictionary.generate_monodix_entrada(_lemma, _paradigm, _restriction, _comment, _author);
diff --git a/apertium-forms-server/pair.py b/apertium-forms-server/pair.py
index 2dbba169..3a031340 100644
--- a/apertium-forms-server/pair.py
+++ b/apertium-forms-server/pair.py
@@ -242,10 +242,21 @@ class Dictionary: #{
 				print >> sys.stderr , 'tags_left:' , tags_left;
 				print >> sys.stderr , 'tags_right:' , tags_right;
 				print >> sys.stderr , 'symdiff:' , tags_left ^ tags_right;
+
+				_symbol_list_left = '<s n="n"/>';
+                                if len(list(tags_left ^ tags_right)) > 0: #{
+                                        _symbol_list_right = '<s n="n"/><s n="' + list(tags_left ^ tags_right)[0] + '"/>';
+                                else:
+                                        _symbol_list_right = '<s n="n"/>';
+                                #}
+
+
+			else: #{
+
+				_symbol_list_left = '<s n="n"/>';
+				_symbol_list_right = '<s n="n"/>';
 			#}
 
-			_symbol_list_left = '<s n="n"/>';
-			_symbol_list_right = '<s n="n"/>';
 		#}
 
 		if _tag == 'vblex': #{
@@ -253,6 +264,11 @@ class Dictionary: #{
 			_symbol_list_right = '<s n="vblex"/>';
 		#}
 
+		if _tag == 'ij': #{
+			_symbol_list_left = '<s n="ij"/>';
+			_symbol_list_right = '<s n="ij"/>';
+		#}
+
 		if _tag == 'adj': #{
 			_symbol_list_left = '<s n="adj"/>';
 			_symbol_list_right = '<s n="adj"/>';
@@ -263,6 +279,40 @@ class Dictionary: #{
 			_symbol_list_right = '<s n="adv"/>';
 		#}
 
+		if _tag == 'np': #{
+
+			stems_left = _paradigm1.get_stems();
+			stems_right = _paradigm2.get_stems();
+	
+			if len(stems_left) == len(stems_right): #{
+				tags_left = set();
+				for stem in stems_left: #{
+					tags_left = tags_left | set(stem[1].split('.'));
+				#}
+	
+				tags_right = set();
+				for stem in stems_right: #{
+					tags_right = tags_right | set(stem[1].split('.'));
+				#}
+	
+				print >> sys.stderr , 'tags_left:' , tags_left;
+				print >> sys.stderr , 'tags_right:' , tags_right;
+				print >> sys.stderr , 'symdiff:' , tags_left ^ tags_right;
+
+				_symbol_list_left = '<s n="np"/>';
+				if len(list(tags_left ^ tags_right)) > 0: #{
+					_symbol_list_right = '<s n="np"/><s n="' + list(tags_left ^ tags_right)[0] + '"/>';
+				else:
+					_symbol_list_right = '<s n="np"/>';
+				#}
+
+			else: #{
+
+				_symbol_list_left = '<s n="np"/>';
+				_symbol_list_right = '<s n="np"/>';
+			#}
+		#}
+
 		entrada = '';
 
                 if _restriction == "none" or _restriction == '': #{
-- 
2.11.4.GIT