Included msd language in msd object

conversion_utils/jos_msds_and_properties.py

@@ -4,7 +4,7 @@ import sys
 
 from conversion_utils.utils import xpath_find, get_xml_id
 
-LANGUAGE_INDEX_MAP = {'en':0, 'sl':1}
+LANGUAGES = ['en', 'sl']
 
 LEXEME_FEATURE_MAP = {'noun':{1,2},
                       'verb':{1,2},
@@ -156,7 +156,7 @@ class SpecificationsBuilder:
 class Properties:
 
     def __init__(self, lemma, category, feature_value_list, language_index):
-        self.language = next(l for (l, i) in LANGUAGE_INDEX_MAP.items() if i == language_index)
+        self.language = LANGUAGES[language_index]
         self.category = category.string_pair[language_index]
         self.lexeme_feature_map = {}
         self.form_feature_map = {}
@@ -175,13 +175,23 @@ class Properties:
             format(language=self.language, category=self.category, lexeme_features=str(self.lexeme_feature_map), form_features=str(self.form_feature_map))
 
 
+class Msd:
+
+    def __init__(self, code, language):
+        self.code = code
+        self.language = language
+
+    def __str__(self):
+        return 'code={code}, language={language}'.format(code=self.code, language=self.language)
+
+
 class MsdToProperties:
 
-    def convert(self, specifications, lemma, msd, msd_language, properties_language):
-        msd_language_index = LANGUAGE_INDEX_MAP[msd_language]
-        properties_language_index = LANGUAGE_INDEX_MAP[properties_language]
-        category_char = msd[0].lower()
-        value_chars = msd[1:]
+    def convert(self, specifications, msd, lemma, properties_language):
+        msd_language_index = LANGUAGES.index(msd.language)
+        properties_language_index = LANGUAGES.index(properties_language)
+        category_char = msd.code[0].lower()
+        value_chars = msd.code[1:]
         category = specifications.find_category(category_char, msd_language_index)
         feature_value_list = []
         for (index, value_char) in enumerate(value_chars, start=1):