geolba/tethys
6
0
Fork 0
Code Issues 2 Pull requests Projects 1 Releases Packages Wiki Activity

- bug release: oai-dc: doi identifier into dec:relations; oai-datacite: support translated abstract

Browse source 
- composer updates
This commit is contained in:
Arno Kaimbacher 2022-02-03 16:14:03 +01:00
parent 995967b734
commit 526b48b06e
4 changed files with 118 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/Http/Controllers/Oai/RequestController.php
View file

@ -129,6 +129,7 @@ class RequestController extends Controller
$this->proc->setParameter('', 'repURL', url('/'));
$this->proc->setParameter('', 'downloadLink', url('/') . '/file/download/');
$this->proc->setParameter('', 'doiLink', 'https://doi.org/');
$this->proc->setParameter('', 'doiPrefix', 'info:eu-repo/semantics/altIdentifier/doi/');
// $resumptionPath = $this->configuration->getResumptionTokenPath();
@ -436,7 +437,7 @@ class RequestController extends Controller
$q->where('label', $setarray[1]);
});
}
} elseif (!empty($setarray[0]) && $setarray[0] == 'open_access') {
} elseif (!empty($setarray[0]) && $setarray[0] == 'open_access') {
$openAccessLicences = ["CC-BY-4.0", "CC-BY-SA-4.0"];
$finder->whereHas('licenses', function ($q) use ($openAccessLicences) {
$q->whereIn('name', $openAccessLicences);

5
app/Library/Xml/DatasetExtension.php
View file

@ -39,7 +39,7 @@ trait DatasetExtension
),
'TitleAbstractAdditional' => array(
'model' => Description::class,
'options' => array('type' => ['Methods', 'Technical_info', 'Series_information', 'Other']),
'options' => array('type' => ['Translated', 'Methods', 'Technical_info', 'Series_information', 'Other']),
'fetch' => 'eager'
),
'Licence' => array(
@ -298,7 +298,8 @@ trait DatasetExtension
//$through = $this->externalFields[$fieldname]['through'];
$rows = $this->{$relation}()->wherePivot('role', $pivotValue)->get();
//$rows = $this->{$relation}()->get();
//$rows = $this->belongsToMany($modelclass, $through, 'document_id')->wherePivot('role', $pivotValue)->get();
//$rows = $this->belongsToMany($modelclass, $through, 'document_id')
//->wherePivot('role', $pivotValue)->get();
}
} else {
$rows = $select->whereHas('dataset', function ($q) use ($datasetId) {