diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/SparqlQueryServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/SparqlQueryServlet.java index 6c224ee4d..8f70473c4 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/SparqlQueryServlet.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/SparqlQueryServlet.java @@ -261,13 +261,8 @@ public class SparqlQueryServlet extends BaseEditController { } private void toCsv(Writer out, ResultSet results) { - //SimpleWriter csvWriter = new SimpleWriter(out); - //csvWriter.setSeperator(','); // sic - //char[] quoteChars = {'"'}; - //csvWriter.setQuoteCharacters(quoteChars); - // The Skife library wouldn't quote and escape the normal way, so I'm trying it manually - + while (results.hasNext()) { QuerySolution solution = (QuerySolution) results.next(); List valueList = new LinkedList(); @@ -295,13 +290,7 @@ public class SparqlQueryServlet extends BaseEditController { } valueList.add(value); } - /* - try { - csvWriter.append(valueList.toArray()); - } catch (IOException ioe) { - log.error(ioe); - } - */ + Iterator valueIt = valueList.iterator(); StringBuffer rowBuff = new StringBuffer(); while (valueIt.hasNext()) { @@ -328,15 +317,9 @@ public class SparqlQueryServlet extends BaseEditController { } private void doHelp(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException { - - //res.setStatus(HttpServletResponse.SC_BAD_REQUEST); - VitroRequest vreq = new VitroRequest(req); Portal portal = vreq.getPortal(); - /* @author ass92 */ - - OntologyDao daoObj = vreq.getFullWebappDaoFactory().getOntologyDao(); List ontologiesObj = daoObj.getAllOntologies(); ArrayList prefixList = new ArrayList(); @@ -354,8 +337,6 @@ public class SparqlQueryServlet extends BaseEditController { req.setAttribute("prefixList", prefixList); - /* Code change completed */ - req.setAttribute("portalBean",portal); // nac26: 2009-09-25 - this was causing problems in safari on localhost installations because the href did not include the context. The edit.css is not being used here anyway (or anywhere else for that matter) // req.setAttribute("css", ""); @@ -364,62 +345,8 @@ public class SparqlQueryServlet extends BaseEditController { RequestDispatcher rd = req.getRequestDispatcher("/"+Controllers.BASIC_JSP); rd.forward(req,res); -// } catch (Throwable e) { -// log.error(e); -// req.setAttribute("javax.servlet.jsp.jspException",e); -// RequestDispatcher rd = req.getRequestDispatcher("/error.jsp"); -// rd.forward(req, res); -// } -// ServletOutputStream sos = res.getOutputStream(); -// -// sos.println("

Sparql Query Form

"); -// if( query == null || "".equals(query)){ -// sos.println("

The parameter 'query' must be not be null or zero length

"); -// } -// if( resultFormat == null || "".equals(resultFormat)){ -// sos.println("

The parameter 'resultFormat' must not be null or zero length

"); -// } -// if( !formatSymbols.containsKey(resultFormat) ){ -// sos.println("

The parameter 'resultFormat' must be one of the following:

    "); -// for ( String str : formatSymbols.keySet() ){ -// sos.println("
  • " + str + "
    • "); -// } -// sos.println("

"); -// } -// sos.println("
"); -// sos.println("query:
"); -// sos.println("
"); -// for( String str : formatSymbols.keySet() ){ -// sos.println(" "+str+":\n"); -// } -// sos.println("
"); -// sos.println(""); -// sos.println("
"); -// sos.println("

note: CONSTRUCT and DESCRIBE queries always return RDF XML

"); -// sos.println(""); } - /* - "PREFIX rdf: \n"+ - "PREFIX rdfs: \n"+ - "PREFIX vitro: \n"+ - "PREFIX vivo: \n"+ - "PREFIX mann: "+ - "#\n"+ - "# This query gets all range entities labels and types of Steven Tanksley\n"+ - "# A query like this could be used to get enough info to create a display\n"+ - "# page for an entity.\n"+ - "#\n"+ - "SELECT ?pred ?obj ?objLabel ?objType\n"+ - "WHERE \n"+ - "{\n"+ - " ?steve rdfs:label \"Tanksley, Steven D.\" .\n"+ - " ?steve ?pred ?obj \n"+ - " OPTIONAL { ?obj rdfs:label ?objLabel ; rdf:type ?objType }\n"+ - "}\n"+ - "ORDER BY ASC( ?pred )\n"; - */ - @SuppressWarnings("unused") private String example = "PREFIX rdf: \n"+