- contact message box löschen
- Unbenennungen von TETHYS RDR zu Tethys RDR - using correct exception models ind Oai RequestController - composer updates
This commit is contained in:
Arno Kaimbacher
parent
728687304c
commit
fd98c6c09d
|
|
@ -9,6 +9,7 @@ use App\Exceptions\OaiModelException;
|
||||||
use Illuminate\Database\Eloquent\ModelNotFoundException;
|
use Illuminate\Database\Eloquent\ModelNotFoundException;
|
||||||
use App\Models\Oai\OaiModelError;
|
use App\Models\Oai\OaiModelError;
|
||||||
use App\Models\Oai\ResumptionToken;
|
use App\Models\Oai\ResumptionToken;
|
||||||
|
use \Exception;
|
||||||
|
|
||||||
class RequestController extends Controller
|
class RequestController extends Controller
|
||||||
{
|
{
|
||||||
|
|
@ -145,7 +146,7 @@ class RequestController extends Controller
|
||||||
private function handleIdentify()
|
private function handleIdentify()
|
||||||
{
|
{
|
||||||
$email = "repository@geologie.ac.at";
|
$email = "repository@geologie.ac.at";
|
||||||
$repositoryName = "TETHYS RDR";
|
$repositoryName = "Tethys RDR";
|
||||||
$repIdentifier = "tethys.geologie.ac.at";
|
$repIdentifier = "tethys.geologie.ac.at";
|
||||||
$sampleIdentifier = "oai:" . $repIdentifier . ":27";//$this->_configuration->getSampleIdentifier();
|
$sampleIdentifier = "oai:" . $repIdentifier . ":27";//$this->_configuration->getSampleIdentifier();
|
||||||
$earliestDateFromDb = optional(Dataset::earliestPublicationDate())->server_date_published;
|
$earliestDateFromDb = optional(Dataset::earliestPublicationDate())->server_date_published;
|
||||||
|
|
@ -226,9 +227,9 @@ class RequestController extends Controller
|
||||||
}
|
}
|
||||||
|
|
||||||
if (empty($dataId) or !preg_match('/^\d+$/', $dataId)) {
|
if (empty($dataId) or !preg_match('/^\d+$/', $dataId)) {
|
||||||
throw new Oai_Model_Exception(
|
throw new OaiModelException(
|
||||||
'The value of the identifier argument is unknown or illegal in this repository.',
|
'The value of the identifier argument is unknown or illegal in this repository.',
|
||||||
Oai_Model_Error::IDDOESNOTEXIST
|
OaiModelError::IDDOESNOTEXIST
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
53
composer.lock
generated
53
composer.lock
generated
|
|
@ -8,27 +8,27 @@
|
||||||
"packages": [
|
"packages": [
|
||||||
{
|
{
|
||||||
"name": "astrotomic/laravel-translatable",
|
"name": "astrotomic/laravel-translatable",
|
||||||
"version": "11.7.1",
|
"version": "v11.8.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/Astrotomic/laravel-translatable.git",
|
"url": "https://github.com/Astrotomic/laravel-translatable.git",
|
||||||
"reference": "d454ca5d73515a0878ed8b1f8df7e0510d351d2c"
|
"reference": "8bd84a30381dfd9e2e1f24252b54279899959a7b"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/Astrotomic/laravel-translatable/zipball/d454ca5d73515a0878ed8b1f8df7e0510d351d2c",
|
"url": "https://api.github.com/repos/Astrotomic/laravel-translatable/zipball/8bd84a30381dfd9e2e1f24252b54279899959a7b",
|
||||||
"reference": "d454ca5d73515a0878ed8b1f8df7e0510d351d2c",
|
"reference": "8bd84a30381dfd9e2e1f24252b54279899959a7b",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"illuminate/contracts": "5.8.* || ^6.0",
|
"illuminate/contracts": "5.8.* || ^6.0 || ^7.0",
|
||||||
"illuminate/database": "5.8.* || ^6.0",
|
"illuminate/database": "5.8.* || ^6.0 || ^7.0",
|
||||||
"illuminate/support": "5.8.* || ^6.0",
|
"illuminate/support": "5.8.* || ^6.0 || ^7.0",
|
||||||
"php": ">=7.2"
|
"php": ">=7.2"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"orchestra/testbench": "3.8.* || ^4.0",
|
"orchestra/testbench": "3.8.* || ^4.0 || ^5.0",
|
||||||
"phpunit/phpunit": "^8.0"
|
"phpunit/phpunit": "^8.0 || ^9.0"
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
|
|
@ -50,7 +50,7 @@
|
||||||
"authors": [
|
"authors": [
|
||||||
{
|
{
|
||||||
"name": "Tom Witkowski",
|
"name": "Tom Witkowski",
|
||||||
"email": "dev.gummibeer@gmail.com",
|
"email": "gummibeer@astrotomic.info",
|
||||||
"homepage": "https://gummibeer.de",
|
"homepage": "https://gummibeer.de",
|
||||||
"role": "Developer"
|
"role": "Developer"
|
||||||
},
|
},
|
||||||
|
|
@ -62,13 +62,14 @@
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"description": "A Laravel package for multilingual models",
|
"description": "A Laravel package for multilingual models",
|
||||||
|
"homepage": "https://astrotomic.info",
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"database",
|
"database",
|
||||||
"language",
|
"language",
|
||||||
"laravel",
|
"laravel",
|
||||||
"translation"
|
"translation"
|
||||||
],
|
],
|
||||||
"time": "2020-02-27T11:09:11+00:00"
|
"time": "2020-03-03T10:43:26+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "davejamesmiller/laravel-breadcrumbs",
|
"name": "davejamesmiller/laravel-breadcrumbs",
|
||||||
|
|
@ -1193,16 +1194,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "nesbot/carbon",
|
"name": "nesbot/carbon",
|
||||||
"version": "2.30.0",
|
"version": "2.31.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/briannesbitt/Carbon.git",
|
"url": "https://github.com/briannesbitt/Carbon.git",
|
||||||
"reference": "912dff66d2690ca66abddb9b291a1df5f371d3b4"
|
"reference": "bbc0ab53f41a4c6f223c18efcdbd9bc725eb5d2d"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/912dff66d2690ca66abddb9b291a1df5f371d3b4",
|
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/bbc0ab53f41a4c6f223c18efcdbd9bc725eb5d2d",
|
||||||
"reference": "912dff66d2690ca66abddb9b291a1df5f371d3b4",
|
"reference": "bbc0ab53f41a4c6f223c18efcdbd9bc725eb5d2d",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -1259,7 +1260,7 @@
|
||||||
"datetime",
|
"datetime",
|
||||||
"time"
|
"time"
|
||||||
],
|
],
|
||||||
"time": "2020-02-07T15:25:46+00:00"
|
"time": "2020-03-01T11:11:58+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "nikic/php-parser",
|
"name": "nikic/php-parser",
|
||||||
|
|
@ -3375,24 +3376,24 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "yajra/laravel-datatables-oracle",
|
"name": "yajra/laravel-datatables-oracle",
|
||||||
"version": "v9.8.0",
|
"version": "v9.9.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/yajra/laravel-datatables.git",
|
"url": "https://github.com/yajra/laravel-datatables.git",
|
||||||
"reference": "9797a5f1b962b9ebf6bb087c88314dd724b3d5c0"
|
"reference": "976e70a2f0b831725da335cd434a11ff73d3c854"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/yajra/laravel-datatables/zipball/9797a5f1b962b9ebf6bb087c88314dd724b3d5c0",
|
"url": "https://api.github.com/repos/yajra/laravel-datatables/zipball/976e70a2f0b831725da335cd434a11ff73d3c854",
|
||||||
"reference": "9797a5f1b962b9ebf6bb087c88314dd724b3d5c0",
|
"reference": "976e70a2f0b831725da335cd434a11ff73d3c854",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"illuminate/database": "5.8.*|^6.0",
|
"illuminate/database": "5.8.*|^6|^7",
|
||||||
"illuminate/filesystem": "5.8.*|^6.0",
|
"illuminate/filesystem": "5.8.*|^6|^7",
|
||||||
"illuminate/http": "5.8.*|^6.0",
|
"illuminate/http": "5.8.*|^6|^7",
|
||||||
"illuminate/support": "5.8.*|^6.0",
|
"illuminate/support": "5.8.*|^6|^7",
|
||||||
"illuminate/view": "5.8.*|^6.0",
|
"illuminate/view": "5.8.*|^6|^7",
|
||||||
"php": "^7.1.3"
|
"php": "^7.1.3"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
|
|
@ -3442,7 +3443,7 @@
|
||||||
"jquery",
|
"jquery",
|
||||||
"laravel"
|
"laravel"
|
||||||
],
|
],
|
||||||
"time": "2019-12-17T03:30:56+00:00"
|
"time": "2020-03-03T16:29:31+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "zizaco/entrust",
|
"name": "zizaco/entrust",
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -8,7 +8,7 @@ function initialState() {
|
||||||
rights: null,
|
rights: null,
|
||||||
project_id: "",
|
project_id: "",
|
||||||
|
|
||||||
creating_corporation: "TETHYS RDR",
|
creating_corporation: "Tethys RDR",
|
||||||
language: "",
|
language: "",
|
||||||
embargo_date: "",
|
embargo_date: "",
|
||||||
belongs_to_bibliography: 0,
|
belongs_to_bibliography: 0,
|
||||||
|
|
@ -70,7 +70,7 @@ export default class Dataset extends Vue {
|
||||||
rights = null;
|
rights = null;
|
||||||
project_id = "";
|
project_id = "";
|
||||||
|
|
||||||
creating_corporation = "TETHYS RDR";
|
creating_corporation = "Tethys RDR";
|
||||||
language = "";
|
language = "";
|
||||||
embargo_date = "";
|
embargo_date = "";
|
||||||
belongs_to_bibliography = 0;
|
belongs_to_bibliography = 0;
|
||||||
|
|
|
||||||
|
|
@ -226,7 +226,7 @@
|
||||||
|
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
<div class="eight columns contact-us-form">
|
{{-- <div class="eight columns contact-us-form">
|
||||||
<form>
|
<form>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="six columns">
|
<div class="six columns">
|
||||||
|
|
@ -240,7 +240,7 @@
|
||||||
<input class="button u-pull-right" type="submit" value="Send">
|
<input class="button u-pull-right" type="submit" value="Send">
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
</div>
|
</div> --}}
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user