From 38fef41a12efb1fe508cbb10d1c6e47d808f95b1 Mon Sep 17 00:00:00 2001 From: rjy7 Date: Wed, 8 Dec 2010 17:10:37 +0000 Subject: [PATCH] Moved utility methods for parsing query results back to PageDaoJena from JenaBaseDao, because they are not all-purpose at this point. --- .../vitro/webapp/dao/jena/JenaBaseDao.java | 63 ------------------- .../vitro/webapp/dao/jena/PageDaoJena.java | 63 +++++++++++++++++++ .../mannlib/vitro/webapp/web/ViewFinder.java | 3 +- .../individual/IndividualTemplateModel.java | 4 -- .../individual/objectPropertyList-default.ftl | 1 - 5 files changed, 64 insertions(+), 70 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java index bc9c710af..1cbe821f2 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java @@ -948,68 +948,5 @@ public class JenaBaseDao extends JenaBaseDaoCon { return temp; } - /* ****************************************************************************** */ - - /** - * Converts a sparql query that returns a multiple rows to a list of maps. - * The maps will have column names as keys to the values. - */ - protected List> executeQueryToCollection( - QueryExecution qexec) { - List> rv = new ArrayList>(); - ResultSet results = qexec.execSelect(); - while (results.hasNext()) { - QuerySolution soln = results.nextSolution(); - rv.add(querySolutionToMap(soln)); - } - return rv; - } - - protected Map querySolutionToMap( QuerySolution soln ){ - Map map = new HashMap(); - Iterator varNames = soln.varNames(); - while(varNames.hasNext()){ - String varName = varNames.next(); - map.put(varName, nodeToObject( soln.get(varName))); - } - return map; - } - - static protected Object nodeToObject( RDFNode node ){ - if( node == null ){ - return ""; - }else if( node.isLiteral() ){ - Literal literal = node.asLiteral(); - return literal.getValue(); - }else if( node.isURIResource() ){ - Resource resource = node.asResource(); - return resource.getURI(); - }else if( node.isAnon() ){ - Resource resource = node.asResource(); - return resource.getId().getLabelString(); //get b-node id - }else{ - return ""; - } - } - - static protected String nodeToString( RDFNode node ){ - if( node == null ){ - return ""; - }else if( node.isLiteral() ){ - Literal literal = node.asLiteral(); - return literal.getLexicalForm(); - }else if( node.isURIResource() ){ - Resource resource = node.asResource(); - return resource.getURI(); - }else if( node.isAnon() ){ - Resource resource = node.asResource(); - return resource.getId().getLabelString(); //get b-node id - }else{ - return ""; - } - } - protected Map resultsToMap(){ - return null; - } } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PageDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PageDaoJena.java index 9ffe422ff..e178bb193 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PageDaoJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PageDaoJena.java @@ -160,6 +160,69 @@ public class PageDaoJena extends JenaBaseDao implements PageDao { return rv.get(0); } + /* ****************************************************************************** */ + + /** + * Converts a sparql query that returns a multiple rows to a list of maps. + * The maps will have column names as keys to the values. + */ + protected List> executeQueryToCollection( + QueryExecution qexec) { + List> rv = new ArrayList>(); + ResultSet results = qexec.execSelect(); + while (results.hasNext()) { + QuerySolution soln = results.nextSolution(); + rv.add(querySolutionToMap(soln)); + } + return rv; + } + + protected Map querySolutionToMap( QuerySolution soln ){ + Map map = new HashMap(); + Iterator varNames = soln.varNames(); + while(varNames.hasNext()){ + String varName = varNames.next(); + map.put(varName, nodeToObject( soln.get(varName))); + } + return map; + } + + static protected Object nodeToObject( RDFNode node ){ + if( node == null ){ + return ""; + }else if( node.isLiteral() ){ + Literal literal = node.asLiteral(); + return literal.getValue(); + }else if( node.isURIResource() ){ + Resource resource = node.asResource(); + return resource.getURI(); + }else if( node.isAnon() ){ + Resource resource = node.asResource(); + return resource.getId().getLabelString(); //get b-node id + }else{ + return ""; + } + } + + static protected String nodeToString( RDFNode node ){ + if( node == null ){ + return ""; + }else if( node.isLiteral() ){ + Literal literal = node.asLiteral(); + return literal.getLexicalForm(); + }else if( node.isURIResource() ){ + Resource resource = node.asResource(); + return resource.getURI(); + }else if( node.isAnon() ){ + Resource resource = node.asResource(); + return resource.getId().getLabelString(); //get b-node id + }else{ + return ""; + } + } + protected Map resultsToMap(){ + return null; + } } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/ViewFinder.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/ViewFinder.java index e5942352f..ee33622ce 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/ViewFinder.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/ViewFinder.java @@ -36,8 +36,7 @@ public class ViewFinder { // NB this is not the value currently used for custom forms - we use the value on the object property. // This value is specifiable from the backend editor, however. FORM("getCustomEntryForm", "form-default.ftl"), - SEARCH("getCustomSearchView", "view-search-default.ftl"), - SHORT("getCustomShortView", "view-short-default.ftl"); + SEARCH("getCustomSearchView", "view-search-default.ftl"); private Method method = null; private String defaultTemplate = null; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java index b36badd9e..ffa0f221a 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java @@ -109,10 +109,6 @@ public class IndividualTemplateModel extends BaseTemplateModel { return getView(ClassView.SEARCH); } - public String getShortView() { - return getView(ClassView.SHORT); - } - public String getDisplayView() { return getView(ClassView.DISPLAY); } diff --git a/webapp/web/templates/freemarker/body/individual/objectPropertyList-default.ftl b/webapp/web/templates/freemarker/body/individual/objectPropertyList-default.ftl index 71fccfe2b..45f67f91a 100644 --- a/webapp/web/templates/freemarker/body/individual/objectPropertyList-default.ftl +++ b/webapp/web/templates/freemarker/body/individual/objectPropertyList-default.ftl @@ -4,7 +4,6 @@ <#list property.statements as statement>
- <#-- ${statement.object.name} --> statement ${statement_index +1}
\ No newline at end of file