Skip to content

Handle roleless SBOL2 components during import #462

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
simplyshree wants to merge 1 commit into
base: final
Choose a base branch
from
Open

Handle roleless SBOL2 components during import #462

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: 7 additions & 2 deletions SBOLCanvasBackend/src/main/java/org/sbolcanvas/servlets/Convert.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,15 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
} catch (SBOLValidationException | IOException | SBOLConversionException | ParserConfigurationException
| TransformerException | SAXException | TransformerFactoryConfigurationError | URISyntaxException | SynBioHubException | javax.xml.stream.XMLStreamException e) {
ServletOutputStream outputStream = response.getOutputStream();
String message = e.getMessage() != null ? e.getMessage() : "Export failed";
String message = errorMessage(e);
InputStream inputStream = new ByteArrayInputStream(message.getBytes());
IOUtils.copy(inputStream, outputStream);

response.setStatus(HttpStatus.SC_INTERNAL_SERVER_ERROR);
e.printStackTrace();
} catch (RuntimeException e) {
// Catch unchecked exceptions from SBML export
String message = e.getMessage() != null ? e.getMessage() : "Export failed";
String message = errorMessage(e);
ServletOutputStream outputStream = response.getOutputStream();
InputStream inputStream = new ByteArrayInputStream(message.getBytes());
IOUtils.copy(inputStream, outputStream);
Expand All @@ -102,4 +102,9 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
}
}

private static String errorMessage(Throwable e) {
String message = e.getMessage();
return message != null ? e.getClass().getSimpleName() + ": " + message : e.getClass().getSimpleName();
}

}
2 changes: 1 addition & 1 deletion SBOLCanvasBackend/src/main/java/org/sbolcanvas/utils/SBOLToMx.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ private mxCell renderCircuitContainer(mxGraph graph, mxCell viewCell, ComponentD
// Check if a circular backbone is present, if so add a duplicate for the right end in SBOLCanvas
for (Component glyph : newList) {
ComponentDefinition cd = glyph.getDefinition();
if (cd != null && cd.getRoles().iterator().next().equals(SBOLData.roles.getValue("Cir (Circular Backbone)"))) {
if (cd != null && cd.getRoles().contains(SBOLData.roles.getValue("Cir (Circular Backbone)"))) {
duplicateToAdd = glyph;
}
}
Expand Down
Loading