Fix to handle multiple # in vocab URIs.

NatLibFi · Nov 10, 2021 · ab4bc73 · ab4bc73
1 parent 3ea6c18
commit ab4bc73
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/model/VocabularyConfig.php b/model/VocabularyConfig.php
@@ -536,10 +536,10 @@ public function getDefaultSidebarView()
     public function getId()
     {
         $uriparts = explode("#", $this->resource->getURI());
-        if (count($uriparts) != 1)
+        if (count($uriparts) > 1)
         // hash namespace
         {
-            return $uriparts[1];
+            return $uriparts[count($uriparts) - 1];
         }
 
         // slash namespace

diff --git a/tests/VocabularyTest.php b/tests/VocabularyTest.php
@@ -25,6 +25,15 @@ public function testGetId() {
     $this->assertEquals('test', $id);
   }
 
+  /**
+   * @covers Vocabulary::getId
+   */
+  public function testGetMultiHashId() {
+    $vocab = $this->model->getVocabulary('multiHashVocabId');
+    $id = $vocab->getId();
+    $this->assertEquals('multiHashVocabId', $id);
+  }
+
   /**
    * @covers Vocabulary::getTitle
    */

diff --git a/tests/testconfig.ttl b/tests/testconfig.ttl
@@ -429,6 +429,8 @@
 	skosmos:language "en";
 	skosmos:sparqlGraph <http://www.skosmos.skos/testOrder/> .
 
+<http://testMultiHashesInUri#vocab#multiHashVocabId> a skosmos:Vocabulary, void:Dataset ;
+
 <http://skosmos.skos/dump/test/groups> dc:format "application/rdf+xml" .
 
 :cat_science a skos:Concept ;