Skip to content

Fix selection of Epub unique identifier #85

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
merged 2 commits into from
Feb 16, 2022
Merged

Fix selection of Epub unique identifier #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66ec1ac
Fix selection of Epub unique identifier
qnga Feb 15, 2022
13e5651
Merge branch 'develop' into fix/epub-identifier
mickael-menu Feb 16, 2022
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: 4 additions & 3 deletions readium/streamer/src/main/java/org/readium/r2/streamer/parser/epub/Metadata.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,10 +196,11 @@ internal class PubMetadataAdapter(
val identifier: String?

init {
val identifiers = items[Vocabularies.DCTERMS + "identifier"]
?.associate { Pair(it.property, it.value) }.orEmpty()
val identifiers = items[Vocabularies.DCTERMS + "identifier"].orEmpty()

identifier = uniqueIdentifierId?.let { identifiers[it] } ?: identifiers.values.firstOrNull()
identifier = uniqueIdentifierId
?.let { uniqueId -> identifiers.firstOrNull { it.id == uniqueId }?.value }
?: identifiers.firstOrNull()?.value
}

val published = firstValue(Vocabularies.DCTERMS + "date")?.iso8601ToDate()
Expand Down
3 changes: 2 additions & 1 deletion ...amer/src/test/resources/org/readium/r2/streamer/parser/epub/package/identifier-unique.opf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
<metadata xmlns:dc="http://purl.org/dc/elements/1.1/">
<dc:title>Alice's Adventures in Wonderland</dc:title>
<dc:identifier> </dc:identifier>
<dc:identifier id="isbn">978-3-16-148410-0</dc:identifier>
<dc:identifier>BEQ</dc:identifier>
<dc:identifier id="pub-id">urn:uuid:2</dc:identifier>
<dc:identifier id="isbn">978-3-16-148410-0</dc:identifier>
</metadata>
<manifest>
<item id="titlepage" href="titlepage.xhtml" media-type="application/xhtml+xml" />
Expand Down