Skip to content

Fix misleading 'XML could not be parsed.' message for non-label targets (directories) #1533

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

Open
jordanpadams wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix misleading 'XML could not be parsed.' message for non-label targets (directories) #1533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions src/main/java/gov/nasa/pds/validate/report/FullReport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,12 @@ protected void append(Status status, String lidvid, String target) {
this.getWriter().print(status.getName());
this.getWriter().print(": ");
this.getWriter().print(target);
this.getWriter().print(" (");
this.getWriter().print(lidvid);
this.getWriter().println(")");
if (!lidvid.isEmpty()) {
this.getWriter().print(" (");
this.getWriter().print(lidvid);
this.getWriter().print(")");
}
this.getWriter().println();
}

@Override
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/gov/nasa/pds/validate/report/Report.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,13 +300,15 @@ final public void stopBody() {
this.end (Block.BODY);
}
private String lidvid (URI target) {
String result = "XML could not be parsed.";
String result = "";
try {
if (target != null && TargetExaminer.isTargetALabel(target.toURL())) {
List<String> parts = TargetExaminer.getTargetContent(target.toURL(),
"//Identification_Area", "logical_identifier", "version_id");
if (parts.size() == 2) {
result = parts.get(0) + "::" + parts.get(1);
} else {
result = "LIDVID could not be extracted.";
}
}
} catch (IllegalArgumentException e) {
Expand Down