Skip to content

Fix VersionConverter encoding issue#296

Merged
achilleas-k merged 7 commits intoG-Node:masterfrom
mpsonntag:fixConverter
Jul 25, 2018
Merged

Fix VersionConverter encoding issue#296
achilleas-k merged 7 commits intoG-Node:masterfrom
mpsonntag:fixConverter

Conversation

@mpsonntag
Copy link
Contributor

@mpsonntag mpsonntag commented Jul 24, 2018 •
edited
Loading

  • This PR closes VersionConverter encoding problem #288, fixing that an XML file with an UTF-8 encoding file header was not being properly parsed by the VersionConverter XML parser.
  • The PR also addresses issue version converter: incomplete string conversion #295 which occurred in the xmlparser: When reading a single string value from csv which contains commata, it now remains a single value and is not split up at each comma.
    Further, any leading or trailing whitespaces are removed from any string values when it is written to
    csv. Along the same lines, multiple values that are saved to file via the version_converter do not contain leading whitespaces any longer.
  • The travis build for macOS with python 3.5 was removed, since the pyyaml dependency was failing for python 3.5.

@coveralls
Copy link

coveralls commented Jul 24, 2018 •
edited
Loading

Coverage Status

Coverage increased (+0.01%) to 81.777% when pulling 46a4fbb on mpsonntag:fixConverter into a75d1db on G-Node:master.

mpsonntag added 6 commits July 25, 2018 14:46
@mpsonntag
[tools/xmlparser] Fix from_csv single str val read
eed09df 
Closes G-Node#295

When reading a single string value from csv
which is containing commata, make sure,
that it still remains a single string value
and is not split up into a multi value at
the comma positions.
@mpsonntag
[tools/xmlparser] Strip ws and quotes on to_csv
9fa62d8 
When writing multiple values to csv make sure
that whitespaces and carriage return linefeeds
as well as quotation marks that have been
added by the csv writer are removed before
returning the csv string.
@mpsonntag
[tools/versionConv] Save multivals w/o whitespace
4e134aa
@mpsonntag
[test/versionConv] Fix changed multival save
40bc156
@mpsonntag
[travis] Unsupport py3.5 on macOS
35161bc
@mpsonntag
[test/versionConv] Add strng value tests
46a4fbb
jgrewe
jgrewe reviewed Jul 25, 2018
View reviewed changes
odml/tools/xmlparser.py
# is part of the value and must not be used to
# split up the string.
return [value_string]

Copy link
Member

@jgrewe jgrewe Jul 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Copy link
Contributor Author

@mpsonntag mpsonntag Jul 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaSprenger caught that one, I'm just taking it one step further. ;)

jgrewe
jgrewe approved these changes Jul 25, 2018
View reviewed changes
Copy link
Member

@jgrewe jgrewe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good catch!

@achilleas-k achilleas-k merged commit 04b408f into G-Node:master Jul 25, 2018
@mpsonntag mpsonntag deleted the fixConverter branch July 25, 2018 14:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jgrewe jgrewe jgrewe approved these changes

@achilleas-k achilleas-k achilleas-k approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

VersionConverter encoding problem

4 participants

@mpsonntag @coveralls @jgrewe @achilleas-k