Meta data service: without dummy user login.

extensions/metadatasourceservice/MetadatasourceserviceController.php

@@ -67,65 +67,40 @@ public function listAction()
             return;
         }
 
-        // authenticate with credentials stored in the configuration of this extension
-        $credentials = $this->_privateConfig->toArray()['credentials'];
-        $username = $credentials['username'];
-        $password = $credentials['password'];
-        $erfurt = $this->_owApp->erfurt;
-        $authResult = $erfurt->authenticate($username, $password);
-
-        // Errorhandling -> Authentication failed probably due to incorrect username and password pair. Client needs to
-        // inform administrator.
-        if ($authResult->getCode() != 1) {
-            $this->getResponse()->setHttpResponseCode(500);
-            $this->getResponse()->setException(new Exception('Dear client. We are sorry but the service is temporarily not available. The fault is on our side. Please inform the administrator that there is a problem with the configuration of the system regarding extension specific authentication and credentials.'));
-            return;
-        }
-
-        // reload selected model with new privileges
-        if ($this->_owApp->selectedModel instanceof Erfurt_Rdf_Model) {
-            $this->_owApp->selectedModel = $erfurt->getStore()->getModel((string)$this->_owApp->selectedModel);
-        }
-
         // querying the meta data sources with their collections
-        $model = new Erfurt_Owl_Model('http://amsl.technology/discovery/');
-        $query_results = $model->sparqlQuery($query);
-
-        // destroy authentication and delete session
-        Erfurt_Auth::getInstance()->clearIdentity();
-        Zend_Session::destroy(true);
+        $options = $this->_owApp->getConfig()->toArray()['store']['virtuoso'];
+        $options['is_open_source_version'] = '1';
+        $backend = new Erfurt_Store_Adapter_Virtuoso($options);
+        $backend->init();
+        $query_results = $backend->sparqlQuery($query);
 
         // reconstruct the result data structure from list to map
         $result = array();
         foreach ($query_results as $key => $value) {
-            if(!$pretty){
-                $metadata_source = $value['source'];
-                $metadata_collection = $value['collection'];
-            }else{
-                $metadata_source = urldecode($value['source']);
-                $metadata_collection = urldecode($value['collection']);
-            }
+            $metadata_source = $value['source'];
+            $metadata_collection = $value['collection'];
+
             if (isset($result[$metadata_source])) {
                 $result[$metadata_source][] = $metadata_collection;
             } else {
                 $result[$metadata_source] = array($metadata_collection);
             }
         }
 
-        // encode the results in json (pretty printed if necessary)
+        // encode the results in JSON (pretty printed if necessary)
         $json = Zend_Json::encode($result);
         if ($pretty) {
             $json = Zend_Json::prettyPrint($json, array("indent" => " "));
             $json = str_replace('\/','/', $json);
         }
 
-        // prepare json response
+        // prepare JSON response
         $this->getHelper('Layout')->disableLayout();
         $this->getHelper('ViewRenderer')->setNoRender();
         $this->getResponse()->setHeader('Content-Type', 'application/json');
-        // write json to response
-        echo $json;
 
+        // write JSON to response
+        echo $json;
         return;
     }
 }

extensions/metadatasourceservice/MetadatasourceserviceHelper.php

@@ -7,15 +7,16 @@
  */
 
 /**
- * Helper class for the History component.
+ * Helper class for the meta-data component.
  *
  * - register the tab for all navigations except the instances list
  *   (this should be undone if the history can be created from a Query2 too)
  *
- * @category OntoWiki
- * @package Extensions_History
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
- * @license http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ * @category   OntoWiki
+ * @package    Extensions_Metadatasourceservice
+ * @author     Reik Mueller
+ * @copyright  Copyright (c) 2015, {@link http://amsl.technology/}
+ * @license    http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 class MetadatasourceserviceHelper extends OntoWiki_Component_Helper
 {
@@ -24,9 +25,9 @@ public function init()
         OntoWiki::getInstance()->getNavigation()->register(
             'test',
             array(
-                'controller' => 'test',        // test controller
+                'controller' => 'Metadatasourceservice',        // test controller
                 'action'     => 'list',        // list action
-                'name'       => 'Test',
+                'name'       => 'Metadatasourceservice',
                 'priority'   => 30
             )
         );

extensions/metadatasourceservice/doap.n3

@@ -42,14 +42,6 @@
               ?collection amsl:metadataUsedByLibrary ?bib . filter (?bib = <http://lobid.org/organisation/DE-15>)
               }
               ORDER BY ?source";
-  ];
-  owconfig:config [
-
-         a owconfig:Config;
-         owconfig:id "credentials";
-
-         :username "" ;
-         :password "";
   ].
 
 :application :hideForAnonymousOnNoModels "false"^^xsd:boolean ;