From 8880d87484c3cf6ecc691aab8ff42ac0ba054a01 Mon Sep 17 00:00:00 2001
From: "Stephen V. Williams" <svwilliams@gmail.com>
Date: Fri, 31 May 2013 12:20:27 -0600
Subject: [PATCH] changed order so name is first, removed vivo items (added to
 the VIVO branch of this feature) from xmlResults.

---
 .../templates/freemarker/body/search/search-csvResults.ftl  | 4 ++--
 .../templates/freemarker/body/search/search-xmlResults.ftl  | 6 ------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/webapp/web/templates/freemarker/body/search/search-csvResults.ftl b/webapp/web/templates/freemarker/body/search/search-csvResults.ftl
index 4b028ab01..575af9584 100644
--- a/webapp/web/templates/freemarker/body/search/search-csvResults.ftl
+++ b/webapp/web/templates/freemarker/body/search/search-csvResults.ftl
@@ -3,7 +3,7 @@
 <#assign todayDate = today?date>
 Results from ${siteName} for ${querytext} on ${todayDate}
 
-URI, Name, URL
+Name, URI, URL
 <#list individuals as individual>                 
-"${individual.uri}","${individual.name}","${individual.profileUrl}"
+"${individual.name}","${individual.uri}","${individual.profileUrl}"
 </#list>
diff --git a/webapp/web/templates/freemarker/body/search/search-xmlResults.ftl b/webapp/web/templates/freemarker/body/search/search-xmlResults.ftl
index 5a47d3697..66821302b 100644
--- a/webapp/web/templates/freemarker/body/search/search-xmlResults.ftl
+++ b/webapp/web/templates/freemarker/body/search/search-xmlResults.ftl
@@ -14,12 +14,6 @@
         <doc>
           <str name="uri">${individual.uri?xml}</str>                      
           <str name="name">${individual.name?xml}</str>
-          <#if individual.preferredTitle?has_content>
-          <str name="title">${individual.preferredTitle?xml}</str>
-          </#if>
-          <#if individual.email?has_content>
-          <str name="email">"${individual.email}"</str>
-          </#if>
           <str name="vivo-url">${individual.profileUrl?xml}"</str>
         </doc>
     </#list>