From e7a04ae09b3adf7f32cc5b64f9543ce22eee564b Mon Sep 17 00:00:00 2001
From: tworrall <tlw72@cornell.edu>
Date: Mon, 22 Apr 2013 14:46:48 -0400
Subject: [PATCH] changes relating to issues raised by Scripps: author ordering
 and label editing

---
 .../mannlib/vitro/webapp/beans/DataPropertyComparator.java    | 4 ++--
 webapp/web/templates/freemarker/edit/forms/rdfsLabelForm.ftl  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyComparator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyComparator.java
index d6d562384..796edaeb1 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyComparator.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyComparator.java
@@ -44,8 +44,8 @@ public class DataPropertyComparator implements Comparator<Individual> {
             }
             if (datatype == null) {
                 log.warn("Can't compare data property statements: no datatype specified.");
-                // Perhaps we should throw an error here, but for now we need it to return 0
-                return 0;
+                // Perhaps we should throw an error here, but for now we need it to set the datatype
+                datatype = XSD.xint.toString();
             }
             
             if (XSD.xint.toString().equals(datatype)) {
diff --git a/webapp/web/templates/freemarker/edit/forms/rdfsLabelForm.ftl b/webapp/web/templates/freemarker/edit/forms/rdfsLabelForm.ftl
index 3816c7b94..6095f9f98 100644
--- a/webapp/web/templates/freemarker/edit/forms/rdfsLabelForm.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/rdfsLabelForm.ftl
@@ -11,7 +11,7 @@
 <#assign literalValues = "${editConfiguration.dataLiteralValuesAsString}" />
 
 <form class="editForm" action = "${submitUrl}" method="post">
-    <input type="text" name="${editConfiguration.varNameForObject}" id="label" size="70" value="${literalValues}"} role="input"/>
+    <input type="text" name="${editConfiguration.varNameForObject}" id="label" size="70" value="${literalValues?html}" role="input"/>
     <input type="hidden" name="editKey" id="editKey" value="${editKey}" role="input"/>
     <input type="hidden" name="vitroNsProp" value="true" role="input"/>