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

FIX: XML schema integration tests. #906

Merged
merged 3 commits into from
Mar 4, 2024
Merged

FIX: XML schema integration tests. #906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
39302e9
XML: Fix whitespace allowances in schemaLocations
david-russo Oct 24, 2023
597da0d
Merge branch 'integration' into schemalocation-whitespace-fix
carlwilson Mar 4, 2024
fcfba6e
FIX: XML schema integration tests.
carlwilson Mar 4, 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
5 changes: 5 additions & 0 deletions jhove-bbt/scripts/create-1.29-target.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,8 @@ cp -R "${baselineRoot}" "${targetRoot}"

# Update release details for ePub module
find "${targetRoot}" -type f -name "audit.jhove.xml" -exec sed -i 's/^ <module release="1.2">EPUB-ptc<\/module>$/ <module release="1.3">EPUB-ptc<\/module>/' {} \;

# Copy the XML file output changed by https://github.com/openpreserve/jhove/pull/889
if [[ -f "${candidateRoot}/examples/modules/XML-hul/jhoveconf.xml.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/XML-hul/jhoveconf.xml.jhove.xml" "${targetRoot}/examples/modules/XML-hul/jhoveconf.xml.jhove.xml"
fi
6 changes: 3 additions & 3 deletions ...-modules/xml-hul/src/main/java/edu/harvard/hul/ois/jhove/module/xml/XmlModuleHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,12 +189,12 @@ public void startElement(String namespaceURI, String localName,
// and location URIs separated by white space. Any
// number of such pairs may be declared in a single
// schemaLocation attribute.
String[] uris = val.split("\\s");
String[] uris = val.trim().split("\\s+");
for (int j = 0; j < uris.length; j += 2) {
SchemaInfo schema = new SchemaInfo();
schema.namespaceURI = uris[j].trim();
schema.namespaceURI = uris[j];
if (uris.length > j + 1) {
schema.location = uris[j + 1].trim();
schema.location = uris[j + 1];
} else {
schema.location = "";
}
Expand Down
Loading