### Eclipse Workspace Patch 1.0
#P d1_cn_index_processor
Index: src/main/java/org/dataone/cn/indexer/parser/utility/TemplateStringProcessor.java
===================================================================
--- src/main/java/org/dataone/cn/indexer/parser/utility/TemplateStringProcessor.java	(revision 8327)
+++ src/main/java/org/dataone/cn/indexer/parser/utility/TemplateStringProcessor.java	(working copy)
@@ -34,6 +34,9 @@
                 result = result.replaceAll("\\[" + key + "\\]", value);
             }
         }
+        if (result != null) {
+            result = result.trim();
+        }
         return result;
     }
 }
Index: src/test/java/org/dataone/cn/index/SolrFieldXPathEmlTest.java
===================================================================
--- src/test/java/org/dataone/cn/index/SolrFieldXPathEmlTest.java	(revision 8395)
+++ src/test/java/org/dataone/cn/index/SolrFieldXPathEmlTest.java	(working copy)
@@ -71,14 +71,13 @@
         eml210Expected.put("beginDate", dateConverter.convert("1998"));
         eml210Expected.put("endDate", dateConverter.convert("2004-02-13"));
         eml210Expected.put("pubDate", "");
-        eml210Expected.put("author", "SANParks Steve");
+        eml210Expected.put("author", "SANParks");
         eml210Expected.put("authorLastName", "SANParks#Garcia#Freeman");
         eml210Expected.put("investigator", "SANParks#Garcia#Freeman");
         eml210Expected.put("contactOrganization", "SANParks#The Awesome Store");
         eml210Expected.put("fileID", "https://" + hostname + "/cn/v1/resolve/peggym.130.4");
 
-        eml210Expected.put("origin",
-                "Steve SANParks Freddy Garcia#Gordon Freeman#The Awesome Store");
+        eml210Expected.put("origin", "SANParks Freddy Garcia#Gordon Freeman#The Awesome Store");
 
         // system metadata
         eml210Expected.put("id", "peggym.130.4");
@@ -107,7 +106,7 @@
 
         eml210Expected
                 .put("text",
-                        "Augrabies falls National Park census data.   SANParks  Steve    Garcia  Freddy   SANParks  Regional Ecologists   Private Bag x402 Skukuza, 1350 South Africa     Freeman  Gordon   SANParks  Regional Ecologists   Private Bag x402 Skukuza, 1350 South Africa    The Awesome Store  Regional Ecologists   Private Bag x402 Skukuza, 1350 South Africa    This metadata record fred, describes a 12-34 TT-12 long-term data document can't frank.  This is a test.  If this was not a lower, an abstract \"double\" or 'single' would be present in UPPER (parenthized) this location.   SANParks, South Africa  Augrabies Falls National Park,South Africa  Census data    Agulhas falls national Park   -120.311210  -120.311210  26.0  26.0       1998    2004-02-13       Genus  Antidorcas   Species  marsupialis  Hartmans Zebra     Genus  Cercopithecus   Species  aethiops  Vervet monkey     Genus  Diceros   Species  bicornis  Baboon     Genus  Equus   Species  hartmannae  Giraffe     Genus  Giraffa   Species  camelopardalis  Kudu     Genus  Oreotragus   Species  oreotragus  Gemsbok     Genus  Oryz   Species  gazella  Eland     Genus  Papio   Species  hamadryas     Genus  Taurotragus   Species  oryx  Black rhino     Genus  Tragelaphus   Species  strepsiceros  Klipspringer      1251095992100 peggym.130.4");
+                        "Augrabies falls National Park census data.   SANParks    Garcia  Freddy   SANParks  Regional Ecologists   Private Bag x402 Skukuza, 1350 South Africa     Freeman  Gordon   SANParks  Regional Ecologists   Private Bag x402 Skukuza, 1350 South Africa    The Awesome Store  Regional Ecologists   Private Bag x402 Skukuza, 1350 South Africa    This metadata record fred, describes a 12-34 TT-12 long-term data document can't frank.  This is a test.  If this was not a lower, an abstract \"double\" or 'single' would be present in UPPER (parenthized) this location.   SANParks, South Africa  Augrabies Falls National Park,South Africa  Census data    Agulhas falls national Park   -120.311210  -120.311210  26.0  26.0       1998    2004-02-13       Genus  Antidorcas   Species  marsupialis  Hartmans Zebra     Genus  Cercopithecus   Species  aethiops  Vervet monkey     Genus  Diceros   Species  bicornis  Baboon     Genus  Equus   Species  hartmannae  Giraffe     Genus  Giraffa   Species  camelopardalis  Kudu     Genus  Oreotragus   Species  oreotragus  Gemsbok     Genus  Oryz   Species  gazella  Eland     Genus  Papio   Species  hamadryas     Genus  Taurotragus   Species  oryx  Black rhino     Genus  Tragelaphus   Species  strepsiceros  Klipspringer      1251095992100 peggym.130.4");
     }
 
     /**
Index: src/main/resources/application-context-eml-base.xml
===================================================================
--- src/main/resources/application-context-eml-base.xml	(revision 8395)
+++ src/main/resources/application-context-eml-base.xml	(working copy)
@@ -90,13 +90,24 @@
 		<property name="multivalue" value="false" />
 	</bean>	
 
-	<bean id="eml.author" class="org.dataone.cn.indexer.parser.SolrField">
-		<constructor-arg name="name" value="author" />
-		<constructor-arg name="xpath"
-			value="concat (//dataset/creator/individualName/surName/text(),' ',//dataset/creator/individualName/givenName/text())" />
-		<property name="multivalue" value="false" />
+	<bean id="eml.author" class="org.dataone.cn.indexer.parser.CommonRootSolrField"
+			p:multivalue="false"
+			p:root-ref="authorNameRoot">
+			<constructor-arg name="name" value="author" />
 	</bean>
 	
+	<bean id="authorNameRoot" class="org.dataone.cn.indexer.parser.utility.RootElement"
+		p:name="author"
+		p:xPath="//dataset/creator/individualName"
+		p:template="[givenName] [surName]">
+		<property name="leafs">
+			<list>
+				<ref bean="givenNameLeaf"/>
+				<ref bean="surNameLeaf"/>
+			</list>
+		</property>
+	</bean>
+	
 	<bean id="eml.author_lname" class="org.dataone.cn.indexer.parser.SolrField">
 		<constructor-arg name="name" value="authorLastName" />
 		<constructor-arg name="xpath"