Removed unneeded Vocabs. Renamed source_type-Vocab to rdf_type

BB-Open · Apr 4, 2018 · 755ee00 · 755ee00
1 parent 7eed3ea
commit 755ee00
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 87 deletions.
diff --git a/src/pkan/dcatapde/browser/harvester_entity/preview.py b/src/pkan/dcatapde/browser/harvester_entity/preview.py
@@ -4,7 +4,7 @@
 from pkan.dcatapde.constants import HARVESTER_FOLDER_ID
 from pkan.dcatapde.constants import HARVESTER_FOLDER_TITLE
 from pkan.dcatapde.content.harvester import Harvester
-from pkan.dcatapde.vocabularies.source_type_vocab import SourceTypeVocabFactory
+from pkan.dcatapde.vocabularies.rdf_type_vocab import RdfTypeVocabFactory
 from plone import api
 from Products.Five import BrowserView
 
@@ -40,7 +40,7 @@ def get_preview(self):
                 query = form['query_data']
             if 'form.widgets.source_type' in form:
                 source_type_token = form['form.widgets.source_type'][0]
-                vocab = SourceTypeVocabFactory(self.context)
+                vocab = RdfTypeVocabFactory(self.context)
                 terms = vocab.by_token
                 term = terms[source_type_token]
                 source_type = term.value

diff --git a/src/pkan/dcatapde/content/harvester.py b/src/pkan/dcatapde/content/harvester.py
@@ -48,7 +48,7 @@ class IHarvester(model.Schema):
             u'variant like (JSON-LD, XML, Turtle), or a generic '
             u'source like "JSON generic"',
         ),
-        vocabulary='pkan.dcatapde.SourceTypeVocabulary',
+        vocabulary='pkan.dcatapde.RdfTypeVocabulary',
     )
 
     top_node = schema.Choice(

diff --git a/src/pkan/dcatapde/vocabularies/configure.zcml b/src/pkan/dcatapde/vocabularies/configure.zcml
@@ -87,14 +87,11 @@
 
   <!-- Harvesting Vocabularies. -->
   <!-- ======================== -->
-  <utility
-      component=".harvesting_vocabulary.HarvestingVocabularyFactory"
-      name="pkan.dcatapde.HarvestingVocabulary"
-      />
+
 
   <utility
-      component=".source_type_vocab.SourceTypeVocabFactory"
-      name="pkan.dcatapde.SourceTypeVocabulary"
+      component=".rdf_type_vocab.RdfTypeVocabFactory"
+      name="pkan.dcatapde.RdfTypeVocabulary"
       />
 
   <!-- Language Vocabularies. -->

diff --git a/src/pkan/dcatapde/vocabularies/harvesting_vocabulary.py b/src/pkan/dcatapde/vocabularies/harvesting_vocabulary.py
diff --git a/...catapde/vocabularies/source_type_vocab.py → ...n/dcatapde/vocabularies/rdf_type_vocab.py b/...catapde/vocabularies/source_type_vocab.py → ...n/dcatapde/vocabularies/rdf_type_vocab.py
@@ -7,7 +7,7 @@
 
 
 @implementer(IVocabularyFactory)
-class SourceTypeVocabulary(object):
+class RdfTypeVocabulary(object):
     """
     """
 
@@ -48,4 +48,4 @@ def __call__(self, context):
         return SimpleVocabulary(terms)
 
 
-SourceTypeVocabFactory = SourceTypeVocabulary()
+RdfTypeVocabFactory = RdfTypeVocabulary()
diff --git a/src/pkan/dcatapde/vocabularies/source_field.py b/src/pkan/dcatapde/vocabularies/source_field.py