Fix chunk errors on Windows #2706 #2728
Merged
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
Signed-off-by: Robert D Anderson <robander@us.ibm.com>
robander
added
bug
preprocess/chunking
platform/windows
Don't use URI path part as File constructor argument, as this will not work on Windows.
jelovirt
requested changes
Jun 16, 2017
| @@ -128,7 +128,7 @@ private void processChunk(final Element topicref, final URI outputFile) { | |||
| outputFileName = currentFile.resolve(hrefValue.getFragment() + FILE_EXTENSION_DITA); | |||
| } else { | |||
| // Find the first topic id in target file if any. | |||
| final String firstTopic = getFirstTopicId(currentFile.resolve(hrefValue).getPath()); | |||
| final String firstTopic = getFirstTopicId(new File(currentFile.resolve(hrefValue).getPath())); | |||
There was a problem hiding this comment.
This will not work, because getPath() with return the path of the file in URI format.
jelovirt
added
the
platform-dependent
|
Fixed the issues I found. |
jelovirt
approved these changes
Jun 16, 2017
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.
Signed-off-by: Robert D Anderson robander@us.ibm.com
Addresses the issue reported in #2706.
Tracked down to an issue with Windows only: our
isAbsolutePathmethod fails with some path styles, on Windows only. I haven't (yet) fixed that issue. Instead, the chunking method that usedisAbsolutePathwas updated so that it deals with files, and relies on the nativeFile.isAbsolute()method. (Previously, URIs were converted to Strings, which were converted back to files.)As an added benefit, this resolves long-standing issues with the
gradlew testcommand that I hadn't taken time to figure out -- 14 of the existing chunk test cases failed with every Windows test, but worked on Mac / Linux. With this update, thegradlew testrun is now clean on Windows.Type of Changes
Checklist
./gradlew test integrationTest).