4.5 export harvest #3308
Merged
4.5 export harvest #3308
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…g fixed; working harvesting of DDI metadata (tested with Odum); added harvesting client management page (still needs work).
… generic text. they can further customize it as they see fit.
…e api output errors too).
fixed the bug where the page would not refresh for the first client added.
Sets offered by a remote server should now be queried and displayed correctly. (i hope they - at dspace - accept my pull request and put a patched build on their mvn repo; keeping it in local_lib for now).
…ecific code in the new OaiHandler; removed OCLC from the dependencies list;
Also, added the dataverse alias to the clients table in harvestclients.xhtml.
…sting Client popup on the Manage Harvesting Clients pg. [ref #813]
Exporters Infrastructure
…tadata tab of the dataset pg. [ref #2579]
…opup on the manage pg. [ref #3296]
…tainer for popups and not popup body container. [ref #3306]
…re handled asynchronously, without blocking the page. (still needs to be reviewed).
…service bean. should not affect any functionality.
(was a formatting conflict, nothing of significance) Merge branch 'develop' into 4.5-export-harvest Conflicts: src/main/java/edu/harvard/iq/dataverse/Dataset.java
how to read the log to investigate failures.
pdurbin
added a commit
that referenced
this pull request
Sep 9, 2016
Conflicts: src/main/java/edu/harvard/iq/dataverse/api/Admin.java src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java src/test/java/edu/harvard/iq/dataverse/util/json/JsonParserTest.java As of 1f5fcfe and earlier (not sure how far back) this branch cannot be merged with develop since develop advanced with the release of 4.5 (pull request #3308 especially was merged in). A simple `git merge develop` yielded merge conflics, especially with JsonPrinter.java and I was unable to resolve them using Netbeans. (I had to run `git merge --abort` after three attempts.) I decided to revert JsonPrinter.java to its state in 4.5 with `git checkout dc58ae1 src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java` and then manually copy the changes needed to get the app to compile from the `1380-honor-ip-groups` branch (specifically https://github.com/IQSS/dataverse/blob/2ada66142fd8fca3a61da4db46268cfba650e4a9/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java ). I tried to get all the changes but it's possible I missed some. `public static JsonObjectBuilder json( IpGroup grp )` especially had some changes having to do with `List<List<String>> ranges = grp.getRanges().stream().filter( rng -> !rng.isSingleAddress()` and such. It looks like this change happened in a336475. The commit message starts with "IP group json format now supports single addresses". I opened #3340 to revisit this part of the code or at least to test and document how it's supposed to work. Meanwhile, I tested #3273 which is what I'm actually working on and the "groups within groups" bug seems to be fixed both before and after the merge.
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
RFI Checklist
Before submitting the pull request, fill out sections (1.) Related Issues and (2.) Pull Request Checklist.
1. Related Issues
List and link to the issues in this Pull Request.
2. Pull Request Checklist
3. Review Checklist
After the pull request has been submitted, fill out this section.