allow for multiple version attributes

Author: aperrin66

pythesint/cf_vocabulary.py

@@ -9,7 +9,7 @@
 
 class CFVocabulary(JSONVocabulary):
 
-    version_attribute = 'omvm:origVocVersionId'
+    version_attributes = ('omvm:origVocVersionId',)
 
     def _fetch_online_data(self, version=None):
         if version:

pythesint/gcmd_vocabulary.py

@@ -10,7 +10,7 @@
 
 class GCMDVocabulary(JSONVocabulary):
 
-    version_attribute = 'Keyword Version'
+    version_attributes = ('Keyword Version', 'Revision')
 
     def _check_categories(self, categories):
         '''Print a warning if the categories are not the expected ones

pythesint/json_vocabulary.py

@@ -8,7 +8,7 @@
 
 class JSONVocabulary(Vocabulary):
 
-    version_attribute = None
+    version_attributes = None
 
     def _fetch_online_data(self, version=None):
         raise NotImplementedError
@@ -47,8 +47,8 @@ def get_filepath(self):
         return os.path.join(DATA_HOME, self.get_relative_path())
 
     def get_version(self):
-        if self.version_attribute:
+        if self.version_attributes:
             for kw in self._get_raw_list():
-                if self.version_attribute in kw:
-                    return kw[self.version_attribute]
+                if set(self.version_attributes).issubset(set(kw)):
+                    return '-'.join(kw[v] for v in self.version_attributes)
         return None

pythesint/mmd_vocabulary.py

@@ -17,7 +17,7 @@
 class MMDVocabulary(JSONVocabulary):
     base_url = 'https://raw.githubusercontent.com/metno/mmd/master/thesauri/mmd-vocabulary.xml'
     base_file = os.path.join(DATA_HOME, 'pythesint', 'mmd-vocabulary.xml')
-    version_attribute = 'version'
+    version_attributes = ('version',)
 
     @staticmethod
     def get_subnode_data(node, subnode_name):