Cleaning, remove logs, rename variables and files in english

tfrancart · Oct 19, 2017 · 26947ea · 26947ea
1 parent c24a834
commit 26947ea
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 123 deletions.
diff --git a/model/sparql/GenericSparql.php b/model/sparql/GenericSparql.php
@@ -595,13 +595,13 @@ public function queryConceptScheme($conceptscheme) {
     private function generateQueryConceptSchemesQuery($lang) {
         $fcl = $this->generateFromClause();
         $query = <<<EOQ
-SELECT ?cs ?label ?preflabel ?title ?domaine ?domaineLabel $fcl
+SELECT ?cs ?label ?preflabel ?title ?domain ?domainLabel $fcl
 WHERE {
  ?cs a skos:ConceptScheme .
  OPTIONAL{
-    ?cs dcterms:subject ?domaine.
-    ?domaine skos:prefLabel ?domaineLabel.
-    FILTER(langMatches(lang(?domaineLabel), '$lang'))
+    ?cs dcterms:subject ?domain.
+    ?domain skos:prefLabel ?domainLabel.
+    FILTER(langMatches(lang(?domainLabel), '$lang'))
 }
  OPTIONAL {
    ?cs rdfs:label ?label .
@@ -647,8 +647,8 @@ private function transformQueryConceptSchemesResults($result) {
             }
             //ajout des dcterms:subject et leurs libellés dans le retour json
             if(isset($row->domaine)&&isset($row->domaineLabel)){
-                $conceptscheme['subject']['uri']=$row->domaine->getURI();
-                $conceptscheme['subject']['prefLabel']=$row->domaineLabel->getValue();
+                $conceptscheme['subject']['uri']=$row->domain->getURI();
+                $conceptscheme['subject']['prefLabel']=$row->domainLabel->getValue();
             }
 
             $ret[$row->cs->getURI()] = $conceptscheme;

diff --git a/resource/js/hierarchy.js b/resource/js/hierarchy.js
@@ -128,13 +128,11 @@ function createConceptObject(conceptUri, conceptData) {
  * @param {Object} parentData 
  */
 function attachTopConceptsToSchemes(schemes, currentNode, parentData) {
-  console.log('I am in');
   var foundFirstLevel = false;
   for (var i = 0; i < schemes.length; i++) {
 
       //search if top concept uri is equal to scheme uri on (first level)
       for (var h = 0; h < parentData[currentNode.uri].top.length; h++) {
-         console.log('scheme uri: '+schemes[i].uri +' currentNodeUri: '+parentData[currentNode.uri].top[h]);
         if(schemes[i].uri===parentData[currentNode.uri].top[h]){
           foundFirstLevel = true;
           if(Object.prototype.toString.call(schemes[i].children) !== '[object Array]' ) {
@@ -152,7 +150,6 @@ function attachTopConceptsToSchemes(schemes, currentNode, parentData) {
       // search if top concept uri is equal to scheme children uri, if there are children(second Level)
       for (var h = 0; h <schemes[i].children.length; h++) {
         for (var k = 0; k < parentData[currentNode.uri].top.length; k++) {
-          console.log('scheme children: '+schemes[i].children[h].uri+' currentNodeUri: '+parentData[currentNode.uri].uri);
           if(schemes[i].children[h]){
           if(schemes[i].children[h].uri===parentData[currentNode.uri].top[k]){
               if(Object.prototype.toString.call(schemes[i].children[h].children) !== '[object Array]' ) {
@@ -357,8 +354,6 @@ function schemeRoot(schemes) {
         }
     }
   }
-
-  // console.log(domains);
 
   // Step 2 : create tree nodes for each domain
 

diff --git a/test-concept-schemes_plusieurs_top_sans_domaine.ttl b/test-concept-schemes_plusieurs_top_sans_domaine.ttl
diff --git a/test-concept-schemes_plusieurs_tops_avec_domaine.ttl b/test-concept-schemes_plusieurs_tops_avec_domaine.ttl
diff --git a/test-concept-schemes.ttl → ...pt-schemes_multiple_tops_with_domains.ttl b/test-concept-schemes.ttl → ...pt-schemes_multiple_tops_with_domains.ttl