Improve target vocabulary resolution by making use of skos:inScheme.

Author: Mark Hale

model/Concept.php

@@ -449,7 +449,18 @@ public function getMappingProperties(array $whitelist = null)
                                 continue;
                             }
                         }
-                        $ret[$prop]->addValue(new ConceptMappingPropertyValue($this->model, $this->vocab, $val, $this->resource, $prop, $this->clang));
+
+                        // check if target vocabularly can be found by scheme
+                        $targetVocab = $this->vocab;
+                        foreach ($val->allResources("skos:inScheme") as $targetScheme) {
+                            $schemeVocab = $this->model->getVocabularyByScheme($targetScheme->getUri());
+                            if ($schemeVocab) {
+                                $targetVocab = $schemeVocab;
+                                break;
+                            }
+                        }
+
+                        $ret[$prop]->addValue(new ConceptMappingPropertyValue($this->model, $targetVocab, $val, $this->resource, $prop, $this->clang));
                     }
                 }
             }

model/Model.php

@@ -13,6 +13,8 @@ class Model
     private $vocabsByGraph = null;
     /** cache for Vocabulary objects */
     private $vocabsByUriSpace = null;
+    /** cache for Vocabulary objects */
+    private $vocabsByScheme = null;
     /** how long to store retrieved URI information in APC cache */
     const URI_FETCH_TTL = 86400; // 1 day
     private $globalConfig;
@@ -449,6 +451,29 @@ public function getVocabularyByGraph($graph, $endpoint = null)
 
     }
 
+    /**
+     * Return the vocabulary that has the given scheme.
+     *
+     * @param $graph string graph URI
+     * @return Vocabulary vocabulary for this scheme, or null if not found
+     */
+    public function getVocabularyByScheme($scheme)
+    {
+        if ($this->vocabsByScheme === null) { // initialize cache
+            $this->vocabsByScheme = array();
+            foreach ($this->getVocabularies() as $voc) {
+                $key = $voc->getDefaultConceptScheme();
+                $this->vocabsByScheme[$key] = $voc;
+            }
+        }
+
+        if (array_key_exists($scheme, $this->vocabsByScheme)) {
+            return $this->vocabsByScheme[$scheme];
+        } else {
+            return null;
+        }
+    }
+
     /**
      * When multiple vocabularies share same URI namespace, return the
      * vocabulary in which the URI is actually defined (has a label).