From ca1518a5f4a0ff08e2da4a856ab7136d3ee240ec Mon Sep 17 00:00:00 2001
From: ryounes <ryounes@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Fri, 3 Jun 2011 14:28:00 +0000
Subject: [PATCH] NIHVIVO-2466 Order data property statements by value. Ensures
 a consistent ordering, and that the correct (in most cases) label is chosen
 in case of multiple labels.

---
 .../controller/freemarker/IndividualListController.java      | 5 +----
 .../vitro/webapp/dao/jena/DataPropertyStatementDaoJena.java  | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualListController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualListController.java
index 0c769f0af..045493361 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualListController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualListController.java
@@ -62,7 +62,6 @@ public class IndividualListController extends FreemarkerHttpServlet {
         String templateName = TEMPLATE_DEFAULT;
         Map<String, Object> body = new HashMap<String, Object>();
         String errorMessage = null;
-        String message = null;
         
         try {
             Object obj = vreq.getAttribute("vclass");
@@ -138,9 +137,7 @@ public class IndividualListController extends FreemarkerHttpServlet {
         if (errorMessage != null) {
             templateName = Template.ERROR_MESSAGE.toString();
             body.put("errorMessage", errorMessage);
-        } else if (message != null) {
-            body.put("message", message);
-        }
+        } 
     
         return new TemplateResponseValues(templateName, body);
     }
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoJena.java
index bb318c002..bff486886 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoJena.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoJena.java
@@ -301,7 +301,7 @@ public class DataPropertyStatementDaoJena extends JenaBaseDao implements DataPro
         "    ?subject ?property ?value . \n" +
         // ignore statements with uri values
         " FILTER ( isLiteral(?value) ) " +
-        "} ";
+        "} ORDER BY ?value";
     
     protected static Query dataPropertyValueQuery;
     static {