Fix setting select clause instead of prologue part and forward Erfurt

AKSW · Feb 24, 2016 · a8eb80e · a8eb80e
1 parent d4212f3
commit a8eb80e
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 33 deletions.
diff --git a/application/classes/OntoWiki/Model/Hierarchy.php b/application/classes/OntoWiki/Model/Hierarchy.php
@@ -184,8 +184,7 @@ protected function _getEntry($resultUri, $hasChildren = false)
     protected function _buildQuery()
     {
         $query    = new Erfurt_Sparql_SimpleQuery();
-        $prologue = 'SELECT DISTINCT ?classUri ?sub ?subsub ?subsubsub';
-        $query->setProloguePart($prologue);
+        $query->setSelectClause('SELECT DISTINCT ?classUri ?sub ?subsub ?subsubsub');
 
         $whereSpecs = array();
         $whereSpec  = '';
@@ -210,7 +209,7 @@ protected function _buildQuery()
         if (!$this->_options['entry']) {
             $whereSpec .= ' FILTER (regex(str(?super), "^' . EF_OWL_NS . '") || !bound(?super))';
         }
-        $whereSpec .= ' OPTIONAL {?sub <' . $this->_options['sub_relation'] . '> ?classUri. 
+        $whereSpec .= ' OPTIONAL {?sub <' . $this->_options['sub_relation'] . '> ?classUri.
                             OPTIONAL {?subsub <' . $this->_options['sub_relation'] . '> ?sub.
                                   OPTIONAL {?subsubsub <' . $this->_options['sub_relation'] . '> ?subsub}
                             }
@@ -232,4 +231,3 @@ protected function _buildQuery()
         return $query;
     }
 }
-
diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php
@@ -371,7 +371,7 @@ public function deleteAction()
 
                 // query for all triples to delete them
                 $sparqlQuery = new Erfurt_Sparql_SimpleQuery();
-                $sparqlQuery->setProloguePart('SELECT ?p, ?o');
+                $sparqlQuery->setSelectClause('SELECT ?p, ?o');
                 $sparqlQuery->addFrom($modelIri);
                 $sparqlQuery->setWherePart('{ <' . $resource . '> ?p ?o . }');
 

diff --git a/extensions/community/CommunityController.php b/extensions/community/CommunityController.php
@@ -162,9 +162,9 @@ public function rateAction()
                 '
                 prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
                 prefix ns0: <http://rdfs.org/sioc/ns#>
-                prefix ns1: <http://rdfs.org/sioc/types#>
-                SELECT *'
-            )->setWherePart(
+                prefix ns1: <http://rdfs.org/sioc/types#>')
+            ->setSelectClause('SELECT *')
+            ->setWherePart(
                 'where {
                     ?rating rdf:type ns1:Poll.
                     ?rating ns0:about <' . $this->_owApp->selectedResource . '>.

diff --git a/extensions/community/RatingModule.php b/extensions/community/RatingModule.php
@@ -40,9 +40,9 @@ public function getContents()
             'prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
              prefix ns0: <http://rdfs.org/sioc/ns#>
              prefix ns1: <http://rdfs.org/sioc/types#>
-             prefix terms: <http://purl.org/dc/terms/>
-             SELECT *'
-        )->setWherePart(
+             prefix terms: <http://purl.org/dc/terms/>')
+        ->setSelectClause('SELECT *')
+        ->setWherePart(
             'where {
                 ?rating rdf:type ns1:Poll.
                 ?rating ns0:about <' . $this->_owApp->selectedResource . '>.
@@ -124,7 +124,7 @@ private function typeAllowed()
 
             $query = new Erfurt_Sparql_SimpleQuery();
 
-            $query->setProloguePart('SELECT *')->setWherePart(
+            $query->setSelectClause('SELECT *')->setWherePart(
                 'WHERE {
                     <' . $resource . '> <' . EF_RDF_TYPE . '> ?type
                 }'

diff --git a/extensions/datagathering/DatagatheringController.php b/extensions/datagathering/DatagatheringController.php
@@ -578,7 +578,7 @@ private function _searchLocalPropertiesOnly(array $termsArray, $modelUri, $limit
     {
         require_once 'Erfurt/Sparql/SimpleQuery.php';
         $query = new Erfurt_Sparql_SimpleQuery();
-        $query->setProloguePart('SELECT DISTINCT ?uri ?o');
+        $query->setSelectClause('SELECT DISTINCT ?uri ?o');
 
         if (null !== $modelUri) {
             $query->addFrom($modelUri);

diff --git a/extensions/datagathering/DatagatheringPlugin.php b/extensions/datagathering/DatagatheringPlugin.php
@@ -301,7 +301,7 @@ public function onDeleteResources($event)
 
             require_once 'Erfurt/Sparql/SimpleQuery.php';
             $query = new Erfurt_Sparql_SimpleQuery();
-            $query->setProloguePart('SELECT ?s ?o');
+            $query->setSelectClause('SELECT ?s ?o');
             $query->addFrom($this->_syncModelUri);
             $query->setWherePart(
                 'WHERE {
@@ -345,7 +345,7 @@ public function onPreDeleteModel($event)
 
             require_once 'Erfurt/Sparql/SimpleQuery.php';
             $query = new Erfurt_Sparql_SimpleQuery();
-            $query->setProloguePart('SELECT ?s');
+            $query->setSelectClause('SELECT ?s');
             $query->addFrom($this->_syncModelUri);
             $query->setWherePart(
                 'WHERE {
@@ -404,7 +404,7 @@ private function _getSyncConfig($uri, $wrapperName, $modelUri)
 
             require_once 'Erfurt/Sparql/SimpleQuery.php';
             $query = new Erfurt_Sparql_SimpleQuery();
-            $query->setProloguePart('SELECT ?s ?p ?o');
+            $query->setSelectClause('SELECT ?s ?p ?o');
             $query->addFrom($this->_syncModelUri);
             $where
                 = 'WHERE {
@@ -474,7 +474,7 @@ private function _listSyncConfigs()
 
             require_once 'Erfurt/Sparql/SimpleQuery.php';
             $query = new Erfurt_Sparql_SimpleQuery();
-            $query->setProloguePart('SELECT ?s ?p ?o');
+            $query->setSelectClause('SELECT ?s ?p ?o');
             $query->addFrom($this->_syncModelUri);
             $where
                 = 'WHERE {

diff --git a/extensions/hideproperties/HidepropertiesPlugin.php b/extensions/hideproperties/HidepropertiesPlugin.php
@@ -26,7 +26,7 @@ public function onPropertiesActionData($event)
 
             foreach ($data as $graphUri => $predicates) {
                 $query = new Erfurt_Sparql_SimpleQuery();
-                $query->setProloguePart('SELECT DISTINCT *')
+                $query->setSelectClause('SELECT DISTINCT *')
                     ->addFrom((string)$graphUri)
                     ->setWherePart('WHERE { ?p <' . $this->_privateConfig->hide->property . '> ?o . }');
 

diff --git a/extensions/listmodules/ShowpropertiesModule.php b/extensions/listmodules/ShowpropertiesModule.php
@@ -101,7 +101,7 @@ private function filterProperties($properties)
             $store = $this->_owApp->erfurt->getStore();
             //query for hidden properties
             $query = new Erfurt_Sparql_SimpleQuery();
-            $query->setProloguePart(
+            $query->setSelectClause(
                 'PREFIX sysont: <http://ns.ontowiki.net/SysOnt/>
                                      SELECT ?uri'
             )

diff --git a/extensions/resourcemodules/LinkinghereModule.php b/extensions/resourcemodules/LinkinghereModule.php
@@ -28,7 +28,7 @@ public function init()
     {
         $query = new Erfurt_Sparql_SimpleQuery();
 
-        $query->setProloguePart('SELECT DISTINCT ?subject ?uri')
+        $query->setSelectClause('SELECT DISTINCT ?subject ?uri')
             ->setWherePart(
                 'WHERE {
                     ?subject ?uri <' . (string)$this->_owApp->selectedResource . '> .
@@ -91,7 +91,7 @@ public function getContents()
             $properties[$predicateUri]['title'] = $titleHelper->getTitle($predicateUri, $this->_lang);
 
             $query->resetInstance()
-                ->setProloguePart('SELECT DISTINCT ?uri')
+                ->setSelectClause('SELECT DISTINCT ?uri')
                 ->setWherePart(
                     'WHERE {
                         ?uri <' . $predicateUri . '> <' . (string)$this->_owApp->selectedResource . '> .
@@ -154,5 +154,3 @@ public function getStateId()
         return $id;
     }
 }
-
-
diff --git a/extensions/resourcemodules/SimilarinstancesModule.php b/extensions/resourcemodules/SimilarinstancesModule.php
@@ -54,7 +54,7 @@ public function getContents()
             }
 
             $query->resetInstance()
-                ->setProloguePart('SELECT DISTINCT ?uri')
+                ->setSelectClause('SELECT DISTINCT ?uri')
                 ->setWherePart(
                     'WHERE {
                         ?uri a <' . $typeUri . '> .
@@ -137,7 +137,7 @@ private function _getTypes()
 
         $query = new Erfurt_Sparql_SimpleQuery();
 
-        $query->setProloguePart('SELECT DISTINCT ?uri')
+        $query->setSelectClause('SELECT DISTINCT ?uri')
             ->setWherePart(
                 'WHERE {
                     <' . (string)$this->_owApp->selectedResource . '> a ?uri.
@@ -163,5 +163,3 @@ private function _getTypes()
         return array_keys($typesInferred);
     }
 }
-
-
diff --git a/extensions/resourcemodules/UsageModule.php b/extensions/resourcemodules/UsageModule.php
@@ -44,7 +44,7 @@ private function _initQuery()
     {
         // instances (subjects)
         $this->_subjectQuery = new Erfurt_Sparql_SimpleQuery();
-        $this->_subjectQuery->setProloguePart('SELECT DISTINCT ?resourceUri')
+        $this->_subjectQuery->setSelectClause('SELECT DISTINCT ?resourceUri')
             ->setWherePart(
                 'WHERE { ?resourceUri <' . (string)$this->_owApp->selectedResource . '> ?object . ' .
                 'FILTER (isURI(?resourceUri)) }'
@@ -54,7 +54,7 @@ private function _initQuery()
 
         // objects
         $this->_objectQuery = new Erfurt_Sparql_SimpleQuery();
-        $this->_objectQuery->setProloguePart('SELECT DISTINCT ?resourceUri')
+        $this->_objectQuery->setSelectClause('SELECT DISTINCT ?resourceUri')
             ->setWherePart(
                 'WHERE { ?subject <' . (string)$this->_owApp->selectedResource . '> ?resourceUri . ' .
                 'FILTER (isURI(?resourceUri)) }'
@@ -169,5 +169,3 @@ public function getStateId()
         return $id;
     }
 }
-
-
diff --git a/extensions/sortproperties/SortpropertiesPlugin.php b/extensions/sortproperties/SortpropertiesPlugin.php
@@ -25,7 +25,7 @@ public function onPropertiesActionData($event)
 
             foreach ($data as $graphUri => $predicates) {
                 $query = new Erfurt_Sparql_SimpleQuery();
-                $query->setProloguePart('SELECT DISTINCT *')
+                $query->setSelectClause('SELECT DISTINCT *')
                     ->addFrom((string)$graphUri)
                     ->setWherePart('WHERE { ?p <' . $this->_privateConfig->sort->property . '> ?o . }');
 

diff --git a/libraries/Erfurt b/libraries/Erfurt