Skip to content
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

Jump to bottom

WAVE: Fix parse error in Associated Data List #309

Merged
merged 5 commits into from Mar 28, 2018
Merged

WAVE: Fix parse error in Associated Data List #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b1c9c57
FIX: Parse error in WAVE Associated Data List.
marhop Feb 7, 2018
11c9a0e
FIX: Trim strings in WAVE Note and Label chunks.
marhop Feb 8, 2018
b7a9601
Merge branch 'integration' into fix-wave-associated-data-list
carlwilson Mar 13, 2018
efa9203
Merge branch 'integration' into fix-wave-associated-data-list
carlwilson Mar 16, 2018
9327e3b
Merge branch 'integration' into fix-wave-associated-data-list
carlwilson Mar 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions jhove-modules/src/main/java/edu/harvard/hul/ois/jhove/module/wave/AssocDataListChunk.java
View file
Open in desktop
Expand Up @@ -53,6 +53,7 @@ public boolean readChunk(RepInfo info) throws IOException {
// this was intended to allow other list structures (don't ask
// why), but any others will be considered non-conforming.
String typeID = module.read4Chars(_dstream);
bytesLeft -= 4;
if (!"adtl".equals (typeID)) {
info.setMessage (new ErrorMessage (MessageConstants.ERR_LIST_TYPE_UNK,
MessageConstants.SUB_MESS_TYPE + typeID,
Expand Down
2 changes: 1 addition & 1 deletion jhove-modules/src/main/java/edu/harvard/hul/ois/jhove/module/wave/SimpleTextChunk.java
View file
Open in desktop
Expand Up @@ -45,7 +45,7 @@ protected Property readTextProp (WaveModule module, String propName)
bytesLeft -= 4;
byte[] buf = new byte[(int) bytesLeft];
ModuleBase.readByteBuf (_dstream, buf, module);
String txt = new String (buf);
String txt = new String (buf).trim ();
Property[] propArr = new Property[2];
propArr[0] = new Property ("CuePointID",
PropertyType.LONG,
Expand Down