Skip to content

Commit b460c42

Browse files
committed
Merge branch 'DevFixMultilineInstanceTtl' into dev
2 parents 3f15c56 + 54d7e12 commit b460c42

2 files changed

Lines changed: 11 additions & 4 deletions

File tree

src/controller/Controller.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,12 @@ private <C extends DataSharingController<T>, T> ArrayList<T> showWindow(String f
250250
properties.clear();
251251

252252
try (BufferedReader reader = new BufferedReader(new FileReader(loadFile))){
253-
String graph = reader.readLine(); // TODO: 24/02/2019 may need to read more than one line in case of multiline rdfs:comment?
254-
if (graph == null || graph.length() == 0){
253+
StringBuilder graphLines = new StringBuilder();
254+
String line;
255+
while ((line = reader.readLine()) != null) graphLines.append(line).append("\n");
256+
257+
String graph = graphLines.toString();
258+
if (graph.length() == 0){
255259
setWarnStatus("Graph Read failed: nothing in graph file.");
256260
LOGGER.warning("Nothing in graph file.");
257261
return;

src/model/dataintegration/DataIntegrator.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,11 @@ private String getMetaTriples(String name, Vertex klass) throws PrefixMissingExc
126126
if (klass.getRdfsLabel() != null && klass.getRdfsLabel().length() != 0)
127127
meta += name + " <http://www.w3.org/2000/01/rdf-schema#label> \"" + klass.getRdfsLabel() + "\" .\n";
128128

129-
if (klass.getRdfsComment() != null && klass.getRdfsComment().length() != 0)
130-
meta += name + " <http://www.w3.org/2000/01/rdf-schema#comment> \"" + klass.getRdfsComment() + "\" .\n";
129+
if (klass.getRdfsComment() != null && klass.getRdfsComment().length() != 0){
130+
String quoteLevel = klass.getRdfsComment().contains("\n") ? "\"\"\"" : "\"";
131+
meta += name + " <http://www.w3.org/2000/01/rdf-schema#comment> " + quoteLevel + klass.getRdfsComment() +
132+
quoteLevel + " .\n";
133+
}
131134

132135
return meta;
133136
}

0 commit comments

Comments
 (0)