From cb2681de9c0809b216cace77b436893fc28478ce Mon Sep 17 00:00:00 2001
From: tworrall <tlw72@cornell.edu>
Date: Mon, 13 May 2013 15:29:13 -0400
Subject: [PATCH] when no subclass, set as unclassified publication; corrected
 plural display error

---
 .../forms/managePublicationsForIndividual.ftl    | 10 +++++++++-
 ...anagePublicationsForIndividualController.java | 16 ++++++++++------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/productMods/templates/freemarker/edit/forms/managePublicationsForIndividual.ftl b/productMods/templates/freemarker/edit/forms/managePublicationsForIndividual.ftl
index 6aac7365..60d3cbe0 100644
--- a/productMods/templates/freemarker/edit/forms/managePublicationsForIndividual.ftl
+++ b/productMods/templates/freemarker/edit/forms/managePublicationsForIndividual.ftl
@@ -21,7 +21,15 @@ Check those publications you want to exclude from the profile page.
 
        
     <#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">
         <#assign pubs = publications[sub]>
         <ul >
diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java b/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java
index d00703e6..cc9ff488 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java
@@ -92,6 +92,7 @@ public class ManagePublicationsForIndividualController extends FreemarkerHttpSer
     HashMap<String, List<Map<String,String>>>  getPublications(String subjectUri, VitroRequest vreq) {
           
         String queryStr = QueryUtils.subUriForQueryVar(PUBLICATION_QUERY, "subject", subjectUri);
+        String subclass = "";
         log.debug("queryStr = " + queryStr);
         HashMap<String, List<Map<String,String>>>  subclassToPublications = new HashMap<String, List<Map<String,String>>>();
         try {
@@ -102,13 +103,16 @@ public class ManagePublicationsForIndividualController extends FreemarkerHttpSer
                 if ( subclassUri != null ) {
                     String subclassUriStr = soln.get("subclass").toString();
                     VClass vClass = (VClass) vcDao.getVClassByURI(subclassUriStr);
-                    String 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));
+                    subclass = ((vClass.getName() == null) ? subclassUriStr : vClass.getName());
                 }
+                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) {
             log.error(e, e);