Added the possibility to define parameter plugins outside of the orde…

…red plugin list
NatLibFi · Mar 2, 2022 · ad6aa49 · ad6aa49
1 parent da1716c
commit ad6aa49
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/model/VocabularyConfig.php b/model/VocabularyConfig.php
@@ -33,7 +33,6 @@ public function __construct($resource, $globalPlugins=array())
     {
         $this->resource = $resource;
         $this->globalPlugins = $globalPlugins;
-        $this->setParameterizedPlugins();
         $this->setPropertyLabelOverrides();
         $pluginArray = $this->getPluginArray();
         $this->pluginRegister = new PluginRegister($pluginArray);
@@ -45,6 +44,7 @@ public function __construct($resource, $globalPlugins=array())
      */
     public function getPluginArray() : array
     {
+        $this->setParameterizedPlugins();
         $pluginArray = array();
         $vocabularyPlugins = $this->resource->getResource('skosmos:vocabularyPlugins');
         if (!$vocabularyPlugins instanceof EasyRdf\Collection) {
@@ -62,6 +62,12 @@ public function getPluginArray() : array
         }
         $pluginArray = array_merge($pluginArray, $this->globalPlugins);
 
+        $paramPlugins = $this->resource->allResources('skosmos:useParamPlugin');
+        if ($paramPlugins) {
+            foreach ($paramPlugins as $plugin) {
+                $pluginArray[] = $plugin->getLiteral('skosmos:usePlugin')->getValue();
+            }
+        }
         $plugins = $this->resource->allLiterals('skosmos:usePlugin');
         if ($plugins) {
             foreach ($plugins as $pluginlit) {

diff --git a/tests/testconfig.ttl b/tests/testconfig.ttl
@@ -383,7 +383,7 @@
     skosmos:feedbackRecipient "developer@vocabulary.org";
 	skosmos:groupClass skos:Collection;
 	skosmos:language "en";
-	skosmos:vocabularyPlugins ("plugin2" "Bravo" :parameterizedPlugin "plugin1");
+	skosmos:vocabularyPlugins ("plugin2" "Bravo" "plugin1");
 	skosmos:usePlugin "plugin1" ;
 	skosmos:usePlugin "plugin3" ;
 	skosmos:useParamPlugin :parameterizedPlugin ;