Query optimisation

AKSW · Jan 26, 2015 · 775f7f2 · 775f7f2
1 parent e337940
commit 775f7f2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/index.html b/index.html
@@ -222,7 +222,7 @@
                             <div id="visualProperty" class="property">property</div>
                             <div id="visualSubject" class="oval">subject</div>
                             <div id="arrow" class="arrow">
-                                <span class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span>
+                                <span class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span><span  class="glyphicon glyphicon-minus"></span>
                                 <span style="margin-right:-3px;" class="glyphicon glyphicon-play"></span>
                             </div>
                             <div id="visualObject" class="oval">object</div>

diff --git a/js/scientificAnnotation.js b/js/scientificAnnotation.js
@@ -638,7 +638,7 @@ var scientificAnnotation  = {
             myDBpediaRecommendations,
             mySkosRecommendations
         ).then(function(){
-            alert("all done");
+            //alert("all done");
             scientificAnnotation.DIV_RECOMMENDATIONS.empty();
             var checkContexts = scientificAnnotation.checkAnnotationPairForContext();
             if (checkContexts.length >  0) scientificAnnotation.recommendationContextCheck(checkContexts); //add a looping ajax call here

diff --git a/js/sparql.js b/js/sparql.js
@@ -185,7 +185,7 @@ var sparql  = {
                     '?prop ' + q.label + ' ?PROPERTY. ' +'\n\t\t'+
                     '?obj ' + q.label + ' ?OBJECT.' +'\n\t'+
                 '}' +'\n'+
-            '}';
+            '} LIMIT 1000';
         if (scientificAnnotation.DEBUG) console.log(selectQuery);
         return selectQuery;
     },
@@ -339,16 +339,12 @@ var sparql  = {
             'SELECT distinct ?class ?classLabel ?classComment' + '\n'+
             'FROM <' +ontologyURL+ '>' + '\n'+
             'WHERE {' + '\n\t'+
-                '{' + '\n\t\t'+
-                    '?class a ?type.' + '\n\t\t'+
-                    'FILTER (?type IN (<http://www.w3.org/2002/07/owl#Class>, <http://www.w3.org/2000/01/rdf-schema#Class> ))' + '\n\t'+
-                '}' + '\n\t'+
+                '{ ?class a <http://www.w3.org/2002/07/owl#Class>. }' + '\n\t'+
+                'UNION { ?class a <http://www.w3.org/2000/01/rdf-schema#Class>. }' + '\n\t'+
                 '{' + '\n\t\t'+
                     'OPTIONAL { ' + '\n\t\t\t'+
                         '?class rdfs:label ?classLabel .' + '\n\t\t\t'+
-                        'FILTER (langMatches(lang(?classLabel),"en") || lang(?classLabel) = "" )' + '\n\t\t'+
-                    '}' + '\n\t\t'+
-                    'OPTIONAL { ' + '\n\t\t\t'+
+                        'FILTER (langMatches(lang(?classLabel),"en") || lang(?classLabel) = "" )' + '\n\t\t\t'+
                         '?class rdfs:comment ?classComment .' + '\n\t\t\t'+
                         'FILTER (langMatches(lang(?classComment),"en") || lang(?classComment) = "" )' + '\n\t\t'+
                     '}' + '\n\t'+
@@ -582,7 +578,7 @@ var sparql  = {
     selectCommonContextQuery :function(annotationPair){
         var q = sparql.resource();
         var selectQuery =
-            'DEFINE input:inference "' +sparql.GRAPH_RULES+ '"' +'\n'+
+            //'DEFINE input:inference "' +sparql.GRAPH_RULES+ '"' +'\n'+
             'SELECT DISTINCT ?parent ?parentType ?thisParent ?label ?annotation ?thisAnnotation' +'\n'+
             'FROM <' +sparql.GRAPH_NAME+ '>' +'\n'+
             'FROM <' +sparql.GRAPH_META_NAME+ '>' +'\n'+