Browse Source

added the ability to change endpoint URLs for the fdg graph currently support solr or source

master
ppound 6 years ago
parent
commit
1facbc3680
  1. 6
      islandora_herbarium_object.routing.yml
  2. 6
      src/Controller/GraphController.php
  3. 12
      src/Graph/GraphParser.php

6
islandora_herbarium_object.routing.yml

@ -1,18 +1,20 @@
islandora_herbarium_object.graph: islandora_herbarium_object.graph:
path: '/islandora_herbarium_object/fdg/{scientificName}/{municipality}' path: '/islandora_herbarium_object/fdg/{scientificName}/{municipality}/{uri_endpoint}'
defaults: defaults:
_controller: '\Drupal\islandora_herbarium_object\Controller\GraphController::printFdgGraph' _controller: '\Drupal\islandora_herbarium_object\Controller\GraphController::printFdgGraph'
_title: 'Graph' _title: 'Graph'
scientificName: '[a-zA-Z\s]+' scientificName: '[a-zA-Z\s]+'
municipality: '[a-zA-Z\s]+' municipality: '[a-zA-Z\s]+'
uri_endpoint: '[a-zA-Z\s]+'
requirements: requirements:
_permission: 'access content' _permission: 'access content'
islandora_herbarium_object.graph-json: islandora_herbarium_object.graph-json:
path: '/islandora_herbarium_object/fdg_json/{scientificName}/{municipality}' path: '/islandora_herbarium_object/fdg_json/{scientificName}/{municipality}/{uri_endpoint}'
defaults: defaults:
_controller: '\Drupal\islandora_herbarium_object\Controller\GraphController::printFdgData' _controller: '\Drupal\islandora_herbarium_object\Controller\GraphController::printFdgData'
_title: 'Graph Json' _title: 'Graph Json'
scientificName: '[a-zA-Z\s]+' scientificName: '[a-zA-Z\s]+'
municipality: '[a-zA-Z\s]+' municipality: '[a-zA-Z\s]+'
uri_endpoint: '[a-zA-Z\s]+'
requirements: requirements:
_permission: 'access content' _permission: 'access content'

6
src/Controller/GraphController.php

@ -15,7 +15,7 @@ class GraphController extends ControllerBase {
* @return array * @return array
* A renderable array. * A renderable array.
*/ */
public function printFdgGraph($scientificName = NULL, $municipality = NULL) { public function printFdgGraph($scientificName = NULL, $municipality = NULL, $uri_endpoint = 'source') {
$arr = ($scientificName == 'NULL' && $municipality == 'NULL') ? ['height' => $arr = ($scientificName == 'NULL' && $municipality == 'NULL') ? ['height' =>
2400, 'width' => 1400] : ['height' => 400, 'width' => 800]; 2400, 'width' => 1400] : ['height' => 400, 'width' => 800];
return [ return [
@ -37,10 +37,10 @@ class GraphController extends ControllerBase {
* *
* TODO: expose as a proper rest endpoint * TODO: expose as a proper rest endpoint
*/ */
public function printFdgData($scientificName = NULL, $municipality = NULL) { public function printFdgData($scientificName = NULL, $municipality = NULL, $uri_endpoint = 'source') {
$fdgGraph = \Drupal::service('islandora_herbarium_object.fdggraph'); $fdgGraph = \Drupal::service('islandora_herbarium_object.fdggraph');
$fdgGraph->getData($scientificName, $municipality); $fdgGraph->getData($scientificName, $municipality);
$graphJson = $fdgGraph->parseData(); $graphJson = $fdgGraph->parseData($uri_endpoint);
print $graphJson; print $graphJson;
exit(); exit();
} }

12
src/Graph/GraphParser.php

@ -7,7 +7,7 @@
*/ */
namespace Drupal\islandora_herbarium_object\Graph; namespace Drupal\islandora_herbarium_object\Graph;
use Drupal\Core\Url;
class GraphParser implements GraphInterface { class GraphParser implements GraphInterface {
@ -17,7 +17,7 @@ class GraphParser implements GraphInterface {
* @return string * @return string
* A json encode string. * A json encode string.
*/ */
public function parseData() { public function parseData($uri_endpoint = 'source') {
$jsonArr = json_decode($this->data, TRUE); $jsonArr = json_decode($this->data, TRUE);
$outputArr = []; $outputArr = [];
// $nodes = $links = new \Ds\Set(); // $nodes = $links = new \Ds\Set();
@ -26,19 +26,23 @@ class GraphParser implements GraphInterface {
$idArr = []; $idArr = [];
foreach ($jsonArr['results']['bindings'] as $result) { foreach ($jsonArr['results']['bindings'] as $result) {
if (!array_key_exists($result['municipality']['value'], $idArr)) { if (!array_key_exists($result['municipality']['value'], $idArr)) {
$municipality_uri = ($uri_endpoint == 'solr') ? Url::fromUri('internal:/herbarium-search?search_api_fulltext=&herbarium-search%5B0%5D=municipality:' .
$result['municipality']['value'])->toString() : $result['municipalityIRI']['value'];
$outputArr['nodes'][] = [ $outputArr['nodes'][] = [
'id' => $result['municipality']['value'], 'id' => $result['municipality']['value'],
'name' => $result['municipality']['value'], 'name' => $result['municipality']['value'],
'uri' => $result['municipalityIRI']['value'], 'uri' => $municipality_uri,
'group' => 1, 'group' => 1,
]; ];
$idArr[$result['municipality']['value']] = ''; $idArr[$result['municipality']['value']] = '';
} }
if (!array_key_exists($result['name']['value'], $idArr)) { if (!array_key_exists($result['name']['value'], $idArr)) {
$scientific_name_uri = ($uri_endpoint == 'solr') ? Url::fromUri('internal:/herbarium-search?search_api_fulltext=&herbarium-search%5B0%5D=scientific_name:' .
$result['name']['value'])->toString() : $result['scientificNameIRI']['value'];
$outputArr['nodes'][] = [ $outputArr['nodes'][] = [
'id' => $result['name']['value'], 'id' => $result['name']['value'],
'name' => $result['name']['value'], 'name' => $result['name']['value'],
'uri' => $result['scientificNameIRI']['value'], 'uri' => $scientific_name_uri,
'group' => 2, 'group' => 2,
]; ];
$idArr[$result['name']['value']] = ''; $idArr[$result['name']['value']] = '';

Loading…
Cancel
Save