From 1dde11c58148a34bb64b25998158423e613429f5 Mon Sep 17 00:00:00 2001
From: tworrall <tlw72@cornell.edu>
Date: Thu, 6 Jun 2013 15:44:16 -0400
Subject: [PATCH] VIVO-123 - handle malformed data more gracefully on manage
 pubs page

---
 .../edit/forms/managePublicationsForIndividual.ftl       | 7 ++++++-
 .../ManagePublicationsForIndividualController.java       | 9 +++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/productMods/templates/freemarker/edit/forms/managePublicationsForIndividual.ftl b/productMods/templates/freemarker/edit/forms/managePublicationsForIndividual.ftl
index 58fa045d..9d01f2eb 100644
--- a/productMods/templates/freemarker/edit/forms/managePublicationsForIndividual.ftl
+++ b/productMods/templates/freemarker/edit/forms/managePublicationsForIndividual.ftl
@@ -37,7 +37,8 @@ ${i18n().check_pubs_to_exclude}
         <ul >
             <#list pubs as pub>
             <li>
-                <input type="checkbox" class="pubCheckbox" <#if pub.hideThis??>checked</#if> />${pub.title}
+                <input type="checkbox" class="pubCheckbox" <#if pub.hideThis??>checked</#if> />
+                <#if pub.title?has_content>${pub.title!}<#else>Title not found.</#if>
             </li>
             <script type="text/javascript">
                 publicationData.push({
@@ -59,6 +60,10 @@ ${i18n().check_pubs_to_exclude}
 var customFormData = {
     processingUrl: '${urls.base}/edit/primitiveRdfEdit'
 };
+var i18nStrings = {
+    publicationSuccessfullyExcluded: '${i18n().publication_successfully_excluded}',
+    errorExcludingPublication: '${i18n().error_excluding_publication}'
+};
 </script>
 
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customForm.css" />',
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 cc9ff488..ced25681 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java
@@ -82,10 +82,11 @@ public class ManagePublicationsForIndividualController extends FreemarkerHttpSer
         + "SELECT DISTINCT ?subclass ?authorship (str(?label) as ?title) ?pub ?hideThis WHERE { \n"
         + "    ?subject core:authorInAuthorship ?authorship . \n"
         + "    OPTIONAL { ?authorship core:linkedInformationResource ?pub . " 
-        + "               ?pub rdfs:label ?label } \n"
-        + "    OPTIONAL { ?pub vitro:mostSpecificType ?subclass . \n"
-        + "              ?subclass rdfs:subClassOf core:InformationResource } \n"
-        + "    OPTIONAL { ?authorship core:hideFromDisplay ?hideThis } \n "
+        + "               ?pub rdfs:label ?label  \n"
+        + "               OPTIONAL { ?pub vitro:mostSpecificType ?subclass . \n"
+        + "                          ?subclass rdfs:subClassOf core:InformationResource } \n"
+        + "    } \n" 
+        + "    OPTIONAL { ?authorship core:hideFromDisplay ?hideThis } \n"
         + "} ORDER BY ?subclass ?title";