litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

when no subclass, set as unclassified publication; corrected plural display error

Browse source
This commit is contained in:
tworrall 2013-05-13 15:29:13 -04:00
parent fa05a88df6
commit cb2681de9c
2 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
productMods/templates/freemarker/edit/forms/managePublicationsForIndividual.ftl
View file

@ -21,7 +21,15 @@ Check those publications you want to exclude from the profile page.
<#list allSubclasses as sub> <#list allSubclasses as sub>
<h4>${sub}s</h4> <h4>
<#if sub = "Software" || sub = "Thesis">
${sub}
<#elseif sub = "Speech">
Speeches
<#else>
${sub}s
</#if>
</h4>
<section id="pubsContainer" role="container"> <section id="pubsContainer" role="container">
<#assign pubs = publications[sub]> <#assign pubs = publications[sub]>
<ul > <ul >

16
src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java
View file

@ -92,6 +92,7 @@ public class ManagePublicationsForIndividualController extends FreemarkerHttpSer
HashMap<String, List<Map<String,String>>> getPublications(String subjectUri, VitroRequest vreq) { HashMap<String, List<Map<String,String>>> getPublications(String subjectUri, VitroRequest vreq) {
String queryStr = QueryUtils.subUriForQueryVar(PUBLICATION_QUERY, "subject", subjectUri); String queryStr = QueryUtils.subUriForQueryVar(PUBLICATION_QUERY, "subject", subjectUri);
String subclass = "";
log.debug("queryStr = " + queryStr); log.debug("queryStr = " + queryStr);
HashMap<String, List<Map<String,String>>> subclassToPublications = new HashMap<String, List<Map<String,String>>>(); HashMap<String, List<Map<String,String>>> subclassToPublications = new HashMap<String, List<Map<String,String>>>();
try { try {
@ -102,13 +103,16 @@ public class ManagePublicationsForIndividualController extends FreemarkerHttpSer
if ( subclassUri != null ) { if ( subclassUri != null ) {
String subclassUriStr = soln.get("subclass").toString(); String subclassUriStr = soln.get("subclass").toString();
VClass vClass = (VClass) vcDao.getVClassByURI(subclassUriStr); VClass vClass = (VClass) vcDao.getVClassByURI(subclassUriStr);
String subclass = ((vClass.getName() == null) ? subclassUriStr : vClass.getName()); subclass = ((vClass.getName() == null) ? subclassUriStr : vClass.getName());
if(!subclassToPublications.containsKey(subclass)) {
subclassToPublications.put(subclass, new ArrayList<Map<String,String>>()); //list of publication information
}
List<Map<String,String>> publicationsList = subclassToPublications.get(subclass);
publicationsList.add(QueryUtils.querySolutionToStringValueMap(soln));
} }
else {
subclass = "Unclassified Publication";
}
if(!subclassToPublications.containsKey(subclass)) {
subclassToPublications.put(subclass, new ArrayList<Map<String,String>>()); //list of publication information
}
List<Map<String,String>> publicationsList = subclassToPublications.get(subclass);
publicationsList.add(QueryUtils.querySolutionToStringValueMap(soln));
} }
} catch (Exception e) { } catch (Exception e) {
log.error(e, e); log.error(e, e);