Skip to content

Better oai #509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MarcusBarnes merged 4 commits into from
Jun 17, 2020
Merged

Better oai #509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2afd851
Merge branch 'master' of https://github.com/MarcusBarnes/mik
Jul 4, 2019
50b13ac
Merge branch 'master' of https://github.com/MarcusBarnes/mik
Jan 24, 2020
601d598
replace OAI identifier path colons with underscores
Mar 11, 2020
a0891a9
Fix special characters and null fetchermanipulators
Apr 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/fetchers/Oaipmh.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public function __construct($settings)
if (isset($settings['MANIPULATORS']['fetchermanipulators'])) {
$this->fetchermanipulators = $settings['MANIPULATORS']['fetchermanipulators'];
} else {
$this->fetchermanipulators = null;
$this->fetchermanipulators = array();
}

if (!$this->createTempDirectory()) {
Expand All @@ -77,7 +77,10 @@ public function getRecords($limit = null)
$endpoint = new Endpoint($client);
$records = $endpoint->listRecords($this->metadataPrefix, $this->from, $this->until, $this->setSpec);
foreach ($records as $rec) {
$identifier = urlencode($rec->header->identifier);
$identifier = ($rec->header->identifier);
$identifier = json_decode(json_encode($identifier), 1)[0];
$identifier = urlencode(str_replace(':', '_', $identifier));

file_put_contents($this->tempDirectory . DIRECTORY_SEPARATOR . $identifier .
'.metadata', $rec->asXML());
// MIK expects each record to be an object with a ->key property.
Expand Down
6 changes: 3 additions & 3 deletions src/writers/Oaipmh.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ public function writePackages($metadata, $pages, $record_id)
$output_path = $this->outputDirectory . DIRECTORY_SEPARATOR;

$normalized_record_id = $this->normalizeFilename($record_id);
$metadata_file_path = $output_path . $normalized_record_id . '.xml';

$metadata_file_path = $output_path . urlencode($normalized_record_id) . '.xml';
/*
$subdirectory = explode("/", $normalized_record_id);
$subdirectory_path = $output_path;

Expand All @@ -82,7 +82,7 @@ public function writePackages($metadata, $pages, $record_id)
mkdir($subdirectory_path);
}
}

*/
$this->writeMetadataFile($metadata, $metadata_file_path, true);

if ($this->metadata_only) {
Expand Down