From 0f3491f42d4180429c14869bd3df5b867aebfeee Mon Sep 17 00:00:00 2001
From: ryounes <ryounes@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Wed, 29 Jun 2011 15:50:23 +0000
Subject: [PATCH] Updates to default list view: remove moniker, and handle
 label vs. local name from sparql query rather than a data postprocessor

---
 .../individual/DataPropertyTemplateModel.java |  2 +-
 .../DefaultListViewDataPostProcessor.java     |  2 --
 webapp/web/config/listViewConfig-default.xml  | 20 +++++++------------
 .../individual/propStatement-default.ftl      |  2 +-
 4 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyTemplateModel.java
index 11732e976..0b7459628 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyTemplateModel.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyTemplateModel.java
@@ -89,8 +89,8 @@ public class DataPropertyTemplateModel extends PropertyTemplateModel {
             ParamMap params = new ParamMap(
                     "subjectUri", subjectUri,
                     "predicateUri", propertyUri);
-            //Check if special parameters being sent
             
+            //Check if special parameters being sent            
             HashMap<String, String> specialParams = UrlBuilder.getSpecialParams(vitroRequest);
             if(specialParams.size() > 0) {
             	params.putAll(specialParams);
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DefaultListViewDataPostProcessor.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DefaultListViewDataPostProcessor.java
index 60eacf181..53c89920d 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DefaultListViewDataPostProcessor.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DefaultListViewDataPostProcessor.java
@@ -16,7 +16,6 @@ public class DefaultListViewDataPostProcessor extends
     private static final Log log = LogFactory.getLog(DefaultListViewDataPostProcessor.class); 
     
     private static final String KEY_NAME = "name";
-    // private static final String KEY_MONIKER = "moniker";
     private static final String KEY_OBJECT = "object";
     
     public DefaultListViewDataPostProcessor(ObjectPropertyTemplateModel optm, WebappDaoFactory wdf) {
@@ -27,7 +26,6 @@ public class DefaultListViewDataPostProcessor extends
     /* Apply processing specific to this postprocessor */
     protected void process(Map<String, String> map) {
         addName(map, KEY_NAME, KEY_OBJECT);
-        // addMoniker(map, KEY_MONIKER, KEY_OBJECT);
     }
  
 }
\ No newline at end of file
diff --git a/webapp/web/config/listViewConfig-default.xml b/webapp/web/config/listViewConfig-default.xml
index e8646cddb..8aa6c35af 100644
--- a/webapp/web/config/listViewConfig-default.xml
+++ b/webapp/web/config/listViewConfig-default.xml
@@ -12,15 +12,15 @@
         PREFIX afn:  &lt;http://jena.hpl.hp.com/ARQ/function#&gt;
           
         SELECT <collated> ?subclass </collated>
-               ?object ?name ?moniker WHERE {
+               ?object ?label ?localName WHERE {
                
             ?subject ?property ?object
+            LET (?localName := afn:localname(?object)) 
             <collated> OPTIONAL { ?object a ?subclass } 
             FILTER ( afn:namespace(?subclass) != "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#" )   
             </collated>
-            OPTIONAL { ?object rdfs:label ?name }
-            OPTIONAL { ?object vitro:moniker ?moniker }      
-        } ORDER BY <collated> ?subclass </collated> ?name ?object  
+        OPTIONAL { ?object rdfs:label ?label } 
+        } ORDER BY <collated> ?subclass </collated> ?label ?label ?localName  
     </query-select>
 
     <query-construct>
@@ -30,8 +30,7 @@
         CONSTRUCT {
             ?subject ?property ?object .
             ?object a ?subclass .
-            ?object rdfs:label ?name .
-            ?object vitro:moniker ?moniker
+            ?object rdfs:label ?label .
         } WHERE {
             { 
                 ?subject ?property ?object 
@@ -42,16 +41,11 @@
             } 
             UNION {
                 ?subject ?property ?object .
-                ?object rdfs:label ?name .
+                ?object rdfs:label ?label .
             } 
-            UNION {
-                ?subject ?property ?object .
-                ?object vitro:moniker ?moniker .
-            }
+            
         }
     </query-construct>
-     
-    <postprocessor>edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.DefaultListViewDataPostProcessor</postprocessor>
     
     <template>propStatement-default.ftl</template>
 </list-view-config>
diff --git a/webapp/web/templates/freemarker/body/partials/individual/propStatement-default.ftl b/webapp/web/templates/freemarker/body/partials/individual/propStatement-default.ftl
index 5ae9359f1..dee213299 100644
--- a/webapp/web/templates/freemarker/body/partials/individual/propStatement-default.ftl
+++ b/webapp/web/templates/freemarker/body/partials/individual/propStatement-default.ftl
@@ -6,4 +6,4 @@
      is also used to generate the property statement during a deletion.  
  -->
 
-<a href="${profileUrl(statement.object)}">${statement.name!}</a> ${statement.moniker!} 
+<a href="${profileUrl(statement.object)}">${statement.label!statement.localName!}</a>