-
Notifications
You must be signed in to change notification settings - Fork 493
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.
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
fix: issues in exporters and citations for PermaLink/non-DOI PIDs #10790
base: develop
Are you sure you want to change the base?
Conversation
@@ -163,7 +163,7 @@ private static void createStdyDscr(XMLStreamWriter xmlw, DatasetDTO datasetDto) | |||
String persistentAuthority = datasetDto.getAuthority(); | |||
String persistentId = datasetDto.getIdentifier(); | |||
|
|||
String pid = persistentProtocol + ":" + persistentAuthority + "/" + persistentId; | |||
String pid = persistentProtocol + ":" + persistentAuthority + ("perma".equals(persistentAgency) ? "" : "/") + persistentId; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
permalinks can have a separator - seems like we need to add that to the DTO?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes! I just tested with a PermaLink PID that uses a separator and it is indeed missing in the DDI exports.
I thought maybe it would be merged into the authority, like I think a configured DOI authority and shoulder are merged in persistentAuthority
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
shoulder just becomes part of the identifier
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah I see
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've just pushed a commit adding the separator to the DTO. It's marked as WIP because for some reason it doesn't work yet (separator is always null
). I will have time to troubleshoot tomorrow
If I am on the wrong track with that commit, please let me know!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we really need to change the domain object? Can't we delegate the PID string generation to GlobalId#toString()
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've just pushed a commit adding the separator to the DTO. It's marked as WIP because for some reason it doesn't work yet (separator is always
null
). I will have time to troubleshoot tomorrow
This issue is now fixed. Tested with DOI, PermaLink without separator and PermaLink with separator
For PermaLinks with separators, the database needs to be manually updated (alter table dvobject set separator = 'whatever' where protocol = 'perma' and authority = 'myauthority';
). This is a little bit cumbersome but I don't know of a better way to do it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can't we delegate the PID string generation to GlobalId#toString()?
@qqmyers would you prefer a solution using the GlobalId method instead of adding the separator to the database? I could take a look at implementing it that way instead (later today or on Monday)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
At first I was thinking that you didn't need the new column on dvobject (you can use PidUtil.parseAsGlobalID(String protocol, String authority, String identifier) to get a GlobalId), but it actually solves a limitation of permalinks right now - you can't have two providers that differ only by the separator because we don't store the separator and have to infer it. With that in mind, I think the new column is a good way to go. (I'd still use the GlobalId convenience methods whenever they're available, to avoid replicating the formatting code - looked like you mostly do that now except in DDIExportUtil where there's weirdness from tests sending null identifiers and for the one format with { in it.)
@@ -619,8 +621,7 @@ private void createEndNoteXML(XMLStreamWriter xmlw) throws XMLStreamException { | |||
} | |||
if (persistentId != null) { | |||
xmlw.writeStartElement("electronic-resource-num"); | |||
String electResourceNum = persistentId.getProtocol() + "/" + persistentId.getAuthority() + "/" | |||
+ persistentId.getIdentifier(); | |||
String electResourceNum = persistentId.asString(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Has it been verified that an initial : after protocol is OK for EndNote import? It seems like the original code used / because ICPSR did. Can someone look at what EndNote exports and make sure we match it here? @adam3smith says he can check this next week if no one else has access.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see, I wondered about that slash there. I tried to find some info on the EndNote XML format but found only this schema, which didn't specify anything about the format of electronic-resource-num
, so I thought it might have been a mistake to use the slash. It would be great if someone could check.
"<electronic-resource-num>doi/10.5072/FK2/LK0D1H</electronic-resource-num>" + | ||
"<electronic-resource-num>doi:10.5072/FK2/LK0D1H</electronic-resource-num>" + |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's weird that this old test expected doi/10...
instead of doi:10...
. It feels like this PR is cleaning things up! ❤️
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@qqmyers commented above that this slash might be required by EndNote, although it does look weird to me 🤔
String pidUri = pid; | ||
//Some tests don't send real PIDs - don't try to get their URL form | ||
if(!pidUri.equals("null:null/null")) { | ||
if(!pidUri.equals("null:nullnullnull")) { | ||
pidUri= PidUtil.parseAsGlobalID(persistentProtocol, persistentAuthority, persistentId).asURL(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you avoid line 167 by checking for parseAsGlobalId returning null here and setting pid/pidUri using GlobalId if it exists and to the constant "null:nullnullnull" if it doesn't? (Mostly a minor style thing but it avoids writing out unexpected invalid identifier entries as well.)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done!
|
||
xmlw.writeStartElement("docDscr"); | ||
xmlw.writeStartElement("citation"); | ||
xmlw.writeStartElement("titlStmt"); | ||
writeFullElement(xmlw, "titl", dto2Primitive(version, DatasetFieldConstant.title), datasetDto.getMetadataLanguage()); | ||
xmlw.writeStartElement("IDNo"); | ||
writeAttribute(xmlw, "agency", persistentAgency); | ||
xmlw.writeCharacters(persistentProtocol + ":" + persistentAuthority + "/" + persistentId); | ||
xmlw.writeCharacters(persistentProtocol + ":" + persistentAuthority + persistentSeparator + persistentId); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
same - can you parse the authority/separator/identifier and use GlobalId.asString() ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done!
Hm. I tested this with DOIs, PermaLinks without separators and PermaLinks with separators and the export looks fine. However, I just saw that when I create a new dataset with a PermaLink with a separator, it doesn't actually get stored in the db ( I think a I also briefly tried adding unit tests for the export of PermaLink datasets to |
You probably need to set the separator to / in the Abstract class and to the real one in the Perma provider. There are some unit tests for the providers - see the PidUtilTest class and I think you can set up whatever provider you want that way. |
Thanks, fixed the bug and added two tests. Now I think the only open issue is the question about the format of the EndNote citation |
@vera we're trying to move this forward through review/QA. Can you update from develop and fix the merge issues? I'm checking on the question about EndNote again. |
# Conflicts: # src/main/java/edu/harvard/iq/dataverse/export/ddi/DdiExportUtil.java # src/main/resources/db/migration/V6.3.0.2.sql
@qqmyers that's great, thank you. I've resolved the merge issues. |
Thanks @vera - now it looks like there are DdiExportUtilTest failures. The results are missing OK - looks like you saw it already :-) |
Yep should be fixed :) |
Jim asked me to look at the Endnote XML export change: this doesn't cause new issues, but Best option: Completely separate the handling of DOI and handle on export: Second best option: Parse the perma prefix separately: Third best option: Put all identifiers into I think the behavior in this PR is fourth best if the goal of metadata export is to get metadata into reference managers and citations so they produce correct&accurate references |
Thanks for checking! Should I go ahead and implement one of those options? (the best option?) |
Given that the EndNote format now changes, I'd suggest adding a short release note pointing out this improvement/backward incompatibility. |
@adam3smith Currently, all PID URLs (https://doi.org/..., https://hdl.handle.net/... or the permalink) are already inserted under dataverse/src/main/java/edu/harvard/iq/dataverse/DataCitation.java Lines 599 to 605 in 07e327c
Would you recommend changing that to |
I've now implemented the best option as suggested:
If DOIs should also be inserted as (FYI, I am out of office next week. :)) |
Thanks @vera - can you add a quick release note? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good. I added a release note. Thanks for the extra work with the EndNote format!
Thanks for adding the release note! @qqmyers |
# Conflicts: # src/main/resources/db/migration/V6.4.0.1.sql
What this PR does / why we need it:
This PR fixes three issues with PermaLink PIDs in metadata exporters and citations.
DDI & DDI HTML exporters: Previously, the export included
<IDNo agency="perma">perma:N4H-/M015D56B</IDNo>
(DDI XML) and "Identification Number: perma:N4H-/M015D56B" (DDI HTML). This change removes the extra slash in the middle of the identifier.EndNote XML citation: Previously, the citation included
<electronic-resource-num>perma/N4H-/M015D56B</electronic-resource-num>
. With this change,perma/
is replaced withperma:
and the extra slash in the middle of the identifier is also removed. (Note, this is the only change that also affects DOIs: for DOIs,doi/
is replaced withdoi:
.)BibTeX citation: Previously,
doi = {...}
was always included in the citation. With this change, it is only included when the PID is actually a DOI. Aurl = {...}
is always included (this was already the case).Which issue(s) this PR closes:
In combination with #10775 and #10759 (or #10615), this addresses #10769 and #10768
Special notes for your reviewer:
-
Suggestions on how to test this:
(from @qqmyers)
Configure permalink PID providers w/ "" and "/" separators, create datasets using them and verify that the DDI/DDI Html exports do not/do contain the / separator (respectively). Confirm that a Fake DOI provider (or test DataCite provider) still work as before w.r.t. how they appear in the DDI/DDI Html exports.
Verify that the EndNote citation for datasets using DOIs and PermaLinks include the PIDs as specified in the best option as discussed in this comment and below. Handles could also be tested but I'm not sure if there's a test setup for that.
Verify that the BibTeX citation format uses
doi=
for DOIs and onlyurl=
for PermaLinks/Handles (if we can test them). (pre-PR PermaLinks would have an extradoi=
line.Does this PR introduce a user interface change? If mockups are available, please link/include them here:
-
Is there a release notes update needed for this change?:
Provided
Additional documentation:
-