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

Empty properties causing extra indents in XmlHandler #893

Merged
merged 3 commits into from
Mar 5, 2024
Merged

Empty properties causing extra indents in XmlHandler #893

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2fb1cb3
Empty properties causing extra indents in XmlHandler
karenhanson Nov 28, 2023
10c651d
Merge branch 'integration' into fix-xml-indent
carlwilson Mar 4, 2024
3e58ba9
Merge branch 'integration' into fix-xml-indent
carlwilson Mar 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions jhove-core/src/main/java/edu/harvard/hul/ois/jhove/handler/XmlHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -744,18 +744,18 @@ protected String valueToString(Object obj) {
}

protected void showProperty(Property property) {
String margin = getIndent(++_level);
String margn2 = margin + " ";
String margn3 = margn2 + " ";
String margn4 = margn3 + " ";

PropertyArity arity = property.getArity();
PropertyType type = property.getType();

// If the property would generate an empty element, don't output it,
// as this could result in a schema violation.
if (Utils.isPropertyEmpty(property, arity))
return;

String margin = getIndent(++_level);
String margn2 = margin + " ";
String margn3 = margn2 + " ";
String margn4 = margn3 + " ";

boolean valueIsProperty = PropertyType.PROPERTY.equals(type);
boolean valueIsNiso = PropertyType.NISOIMAGEMETADATA.equals(type);
Expand Down
Loading