Make it possible to define order of plugins in configuration

controller/WebController.php

@@ -178,7 +178,7 @@ public function invokeVocabularyConcept(Request $request)
         if ($this->notModified($results[0])) {
             return;
         }
-        $pluginParameters = $vocab->getConfig()->getPluginParameters();
+        $pluginParameters = json_encode($vocab->getConfig()->getPluginParameters());
         $template = (in_array('skos:Concept', $results[0]->getType()) || in_array('skos:ConceptScheme', $results[0]->getType())) ? $this->twig->loadTemplate('concept-info.twig') : $this->twig->loadTemplate('group-contents.twig');
 
         $crumbs = $vocab->getBreadCrumbs($request->getContentLang(), $uri);
@@ -532,7 +532,7 @@ public function invokeVocabularyHome($request)
             $this->invokeGroupIndex($request, true);
             return;
         }
-        $pluginParameters = $vocab->getConfig()->getPluginParameters();
+        $pluginParameters = json_encode($vocab->getConfig()->getPluginParameters());
 
         $template = $this->twig->loadTemplate('vocab.twig');
 

index.php

@@ -49,7 +49,7 @@
         $vocab = $parts[1];
         try {
             $request->setVocab($parts[1]);
-        } catch (Exception $e) {
+        } catch (Exception | ValueError $e) {
             $request->setLang($controller->guessLanguage());
             $controller->invokeGenericErrorPage($request);
             return;

model/Concept.php

@@ -16,6 +16,7 @@ class Concept extends VocabularyDataObject implements Modifiable
     /** the EasyRdf\Graph object of the concept */
     private $graph;
     private $clang;
+    private $deleted;
 
     /** concept properties that should not be shown to users */
     private $DELETED_PROPERTIES = array(
@@ -78,8 +79,13 @@ class Concept extends VocabularyDataObject implements Modifiable
     public function __construct($model, $vocab, $resource, $graph, $clang)
     {
         parent::__construct($model, $vocab, $resource);
+        $this->deleted = $this->DELETED_PROPERTIES;
         if ($vocab !== null) {
             $this->order = $vocab->getConfig()->getPropertyOrder();
+            // delete notations unless configured to show them
+            if (!$vocab->getConfig()->getShowNotationAsProperty()) {
+                $this->deleted[] = 'skos:notation';
+            }
         } else {
             $this->order = VocabularyConfig::DEFAULT_PROPERTY_ORDER;
         }
@@ -278,7 +284,7 @@ public function processExternalResource($res)
         $propList =  array_unique(array_merge(
             $this->DEFAULT_EXT_PROPERTIES,
             $this->getVocab()->getConfig()->getExtProperties(),
-            $this->getVocab()->getConfig()->getPlugins()->getExtProperties()
+            $this->getVocab()->getConfig()->getPluginRegister()->getExtProperties()
         ));
 
         $seen = array();
@@ -508,7 +514,7 @@ public function getProperties()
                 $sprop = "<$prop>";
             }
 
-            if (!in_array($prop, $this->DELETED_PROPERTIES) || ($this->isGroup() === false && $prop === 'skos:member')) {
+            if (!in_array($prop, $this->deleted) || ($this->isGroup() === false && $prop === 'skos:member')) {
                 // retrieve property label and super properties from the current vocabulary first
                 $propres = new EasyRdf\Resource($prop, $this->graph);
                 $proplabel = $propres->label($this->getEnvLang()) ? $propres->label($this->getEnvLang()) : $propres->label();
@@ -558,7 +564,7 @@ public function getProperties()
                 if ($superprop) {
                     $superprop = EasyRdf\RdfNamespace::shorten($superprop) ? EasyRdf\RdfNamespace::shorten($superprop) : $superprop;
                 }
-                $sort_by_notation = $this->vocab->getConfig()->sortByNotation();
+                $sort_by_notation = $this->vocab->getConfig()->getSortByNotation();
                 $propobj = new ConceptProperty($prop, $proplabel, $prophelp, $superprop, $sort_by_notation);
 
                 if ($propobj->getLabel() !== null) {
@@ -581,7 +587,6 @@ public function getProperties()
                     if (isset($ret[$prop]) && ($literal->getLang() === $this->clang || $literal->getLang() === null) || $this->vocab->getConfig()->hasMultiLingualProperty($prop)) {
                         $ret[$prop]->addValue($literal);
                     }
-
                 }
 
                 // Iterating through every resource and adding these to the data object.

model/ConceptProperty.php

@@ -130,8 +130,12 @@ private function sortValues()
                         return -1;
                     }
                     else {
-                        // assume that notations are unique
-                        return strnatcasecmp($anot, $bnot);
+                        // assume that notations are unique, choose strategy
+                        if ($this->sort_by_notation == "lexical") {
+                            return strcoll($anot, $bnot);
+                        } else { // natural
+                            return strnatcasecmp($anot, $bnot);
+                        }
                     }
                 });
             }

model/ConceptPropertyValue.php

@@ -33,12 +33,7 @@ public function __construct($model, $vocab, $resource, $prop, $clang = '')
 
     public function __toString()
     {
-        $label = is_string($this->getLabel()) ? $this->getLabel() : $this->getLabel()->getValue();
-        if ($this->vocab->getConfig()->sortByNotation()) {
-            $label = ltrim($this->getNotation() . ' ') . $label;
-        }
-
-        return $label;
+        return is_string($this->getLabel()) ? $this->getLabel() : $this->getLabel()->getValue();
     }
 
     public function getLang()

model/ConceptPropertyValueLiteral.php

@@ -9,12 +9,15 @@ class ConceptPropertyValueLiteral extends VocabularyDataObject
     private $literal;
     /** property type */
     private $type;
+    /** content language */
+    private $clang;
 
-    public function __construct($model, $vocab, $resource, $literal, $prop)
+    public function __construct($model, $vocab, $resource, $literal, $prop, $clang = '')
     {
         parent::__construct($model, $vocab, $resource);
         $this->literal = $literal;
         $this->type = $prop;
+        $this->clang = $clang;
     }
 
     public function __toString()
@@ -31,6 +34,23 @@ public function getLang()
         return $this->literal->getLang();
     }
 
+    /**
+     * A method for fetching a datatype.
+     */
+    public function getDatatype(): ?string
+    {
+        $datatype = $this->literal->getDatatype();
+        if ($datatype === null) {
+            return null;
+        }
+        $graph = $this->resource->getGraph();
+        if ($graph->resource($datatype)->label($this->clang)) {
+            $dtLabel = $graph->resource($datatype)->label($this->clang);
+            return $dtLabel->getValue();
+        }
+        return null;
+    }
+
     public function getType()
     {
         return $this->type;

model/DataObject.php

@@ -50,7 +50,7 @@ protected function getExternalLabel($exvoc, $exuri, $lang)
                 $exsparql = $exvoc->getSparql();
                 $results = $exsparql->queryLabel($exuri, $lang);
                 return isset($results[$lang]) ? $results[$lang] : null;
-            } catch (EasyRdf\Http\Exception | EasyRdf\Exception | Throwable $e) {
+            } catch (EasyRdf\Http\Exception | EasyRdf\Exception | Throwable $e) {
                 if ($this->model->getConfig()->getLogCaughtExceptions()) {
                     error_log('Caught exception: ' . $e->getMessage());
                 }
@@ -72,7 +72,7 @@ protected function getExternalNotation($exvoc, $exuri)
                 $exsparql = $exvoc->getSparql();
                 $results = $exsparql->queryNotation($exuri);
                 return isset($results) ? $results : null;
-            } catch (EasyRdf\Http\Exception | EasyRdf\Exception | Throwable $e) {
+            } catch (EasyRdf\Http\Exception | EasyRdf\Exception | Throwable $e) {
                 if ($this->model->getConfig()->getLogCaughtExceptions()) {
                     error_log('Caught exception: ' . $e->getMessage());
                 }

model/Model.php

@@ -478,7 +478,7 @@ private function disambiguateVocabulary($vocabs, $uri, $preferredVocabId = null)
                             // not found in preferred vocabulary, fall back to next method
                             break;
                         }
-                    } catch (EasyRdf\Http\Exception | EasyRdf\Exception | Throwable $e) {
+                    } catch (EasyRdf\Http\Exception | EasyRdf\Exception | Throwable $e) {
                         if ($this->getConfig()->getLogCaughtExceptions()) {
                             error_log('Caught exception: ' . $e->getMessage());
                         }
@@ -494,7 +494,7 @@ private function disambiguateVocabulary($vocabs, $uri, $preferredVocabId = null)
                 if ($vocab->getConceptLabel($uri, null) !== null) {
                     return $vocab;
                 }
-            } catch (EasyRdf\Http\Exception | EasyRdf\Exception | Throwable $e) {
+            } catch (EasyRdf\Http\Exception | EasyRdf\Exception | Throwable $e) {
                 if ($this->getConfig()->getLogCaughtExceptions()) {
                     error_log('Caught exception: ' . $e->getMessage());
                 }

model/Request.php

@@ -262,7 +262,7 @@ public function getVocabList() {
 
     public function getPlugins() {
         if ($this->vocab) {
-            return $this->vocab->getConfig()->getPlugins();
+            return $this->vocab->getConfig()->getPluginRegister();
         }
         return new PluginRegister($this->model->getConfig()->getGlobalPlugins());
     }

model/Vocabulary.php

@@ -162,7 +162,7 @@ public function getInfo($lang = null)
             // query everything the endpoint knows about the ConceptScheme
             $sparql = $this->getSparql();
             $result = $sparql->queryConceptScheme($defaultcs);
-        } catch (EasyRdf\Http\Exception | EasyRdf\Exception | Throwable $e) {
+        } catch (EasyRdf\Http\Exception | EasyRdf\Exception | Throwable $e) {
              if ($this->model->getConfig()->getLogCaughtExceptions()) {
                  error_log('Caught exception: ' . $e->getMessage());
              }
@@ -252,7 +252,7 @@ public function getConceptSchemes($lang = '')
         $conceptSchemes = null;
         try {
             $conceptSchemes = $this->getSparql()->queryConceptSchemes($lang);
-        } catch (EasyRdf\Http\Exception | EasyRdf\Exception | Throwable $e) {
+        } catch (EasyRdf\Http\Exception | EasyRdf\Exception | Throwable $e) {
              if ($this->model->getConfig()->getLogCaughtExceptions()) {
                  error_log('Caught exception: ' . $e->getMessage());
              }
@@ -452,7 +452,7 @@ public function getConceptInfo($uri, $clang)
         $conceptInfo = null;
         try {
             $conceptInfo = $sparql->queryConceptInfo($uri, $this->config->getArrayClassURI(), array($this), $clang);
-        } catch (EasyRdf\Http\Exception | EasyRdf\Exception | Throwable $e) {
+        } catch (EasyRdf\Http\Exception | EasyRdf\Exception | Throwable $e) {
              if ($this->model->getConfig()->getLogCaughtExceptions()) {
                  error_log('Caught exception: ' . $e->getMessage());
              }