Merge pull request #366 from AKSW/feature/add-data-route

Add data shortcut route, update Linked Data plugin

Author: white-gecko

application/config/default.ini

@@ -131,6 +131,9 @@ routes.properties.defaults.action     = "properties"
 routes.instances.route                = "list/*"
 routes.instances.defaults.controller  = "resource"
 routes.instances.defaults.action      = "instances"
+routes.data.route                     = "data/*"
+routes.data.defaults.controller       = "resource"
+routes.data.defaults.action           = "export"
 routes.sparql.route                   = "sparql/*"
 routes.sparql.defaults.controller     = "service"
 routes.sparql.defaults.action         = "sparql"

extensions/linkeddataserver/LinkeddataPlugin.php

@@ -121,20 +121,16 @@ public function onIsDispatchable($event)
 
                     // Special case: If the graph URI is identical to the requested URI, we export
                     // the whole graph instead of only data regarding the resource.
+                    $urlSpec = array();
                     if ($graph === $uri) {
-                        $controllerName = 'model';
-                        $actionName     = 'export';
+                        $urlSpec = array('controller' => 'model', 'action' => 'export');
                     } else {
-                        $controllerName = 'resource';
-                        $actionName     = 'export';
+                        $urlSpec = array('route' => 'data');
                     }
 
                     // Create a URL with the export action on the resource or model controller.
                     // Set the required parameters for this action.
-                    $url = new OntoWiki_Url(
-                        array('controller' => $controllerName, 'action' => $actionName),
-                        array()
-                    );
+                    $url = new OntoWiki_Url($urlSpec, array());
                     $url->setParam('r', $uri, true)
                         ->setParam('f', $type)
                         ->setParam('m', $graph)