From 1426b005f23c055dce02a5dfc01b791cec5fd072 Mon Sep 17 00:00:00 2001 From: Graham Triggs Date: Tue, 17 Jan 2017 11:40:48 +0000 Subject: [PATCH] Minor TPF endpoint fixes --- .../VitroLinkedDataFragmentServlet.java | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/api/src/main/java/org/vivoweb/linkeddatafragments/servlet/VitroLinkedDataFragmentServlet.java b/api/src/main/java/org/vivoweb/linkeddatafragments/servlet/VitroLinkedDataFragmentServlet.java index b43f80aab..3e326e772 100644 --- a/api/src/main/java/org/vivoweb/linkeddatafragments/servlet/VitroLinkedDataFragmentServlet.java +++ b/api/src/main/java/org/vivoweb/linkeddatafragments/servlet/VitroLinkedDataFragmentServlet.java @@ -149,10 +149,10 @@ public class VitroLinkedDataFragmentServlet extends VitroHttpServlet { @Override public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException { - int fileNamePos = request.getRequestURI().toLowerCase().lastIndexOf("/tpf/assets/"); + int fileNamePos = request.getRequestURI().toLowerCase().lastIndexOf("tpf/assets/"); if (fileNamePos > 0) { try { - String fileName = request.getRequestURI().substring(fileNamePos + 12); + String fileName = request.getRequestURI().substring(fileNamePos + 11); InputStream in = VitroLinkedDataFragmentServlet.class.getResourceAsStream(fileName); if (in != null) { IOUtils.copy(in, response.getOutputStream()); @@ -243,21 +243,23 @@ public class VitroLinkedDataFragmentServlet extends VitroHttpServlet { List onts = dao.getAllOntologies(); if (onts != null) { for (Ontology ont : onts) { - switch (ont.getPrefix()) { - case "rdf": - case "rdfs": - case "hydra": - case "void": - break; + if (ont != null && ont.getPrefix() != null) { + switch (ont.getPrefix()) { + case "rdf": + case "rdfs": + case "hydra": + case "void": + break; - default: - configJson.append(",\n"); - configJson.append(" \""); - configJson.append(ont.getPrefix()); - configJson.append("\": \""); - configJson.append(ont.getURI()); - configJson.append("\""); - break; + default: + configJson.append(",\n"); + configJson.append(" \""); + configJson.append(ont.getPrefix()); + configJson.append("\": \""); + configJson.append(ont.getURI()); + configJson.append("\""); + break; + } } } }