From: Andreas Müller <a.mueller@bgbm.org>
Date: Thu, 23 Sep 2010 23:34:20 +0000 (+0000)
Subject: Update for tcs import
X-Git-Tag: 3.0.3~520
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/commitdiff_plain/5693f6f2bae923502a00c4580f23e13a018c18bc

Update for tcs import
---

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/tcs/TcsXmlTestActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/tcs/TcsXmlTestActivator.java
index 717b944d7e..99dada8a18 100644
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/tcs/TcsXmlTestActivator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/tcs/TcsXmlTestActivator.java
@@ -39,9 +39,9 @@ public class TcsXmlTestActivator {
 	//database validation status (create, update, validate ...)
 	static DbSchemaValidation hbm2dll = DbSchemaValidation.CREATE;
 	static final String tcsSource = TcsSources.tcsXml_cichorium();
-	static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_andreasM();
+//	static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_andreasM();
 //	static final ICdmDataSource cdmDestination = CdmDestinations.localH2();
-//	static final ICdmDataSource cdmDestination = CdmDestinations.cdm_local_postgres_CdmTest();
+	static final ICdmDataSource cdmDestination = CdmDestinations.cdm_local_postgres_CdmTest();
 
 	static final UUID treeUuid = UUID.fromString("00000000-0c97-48ac-8d33-6099ed68c625");
 	static final String sourceSecId = "TestTCS";
diff --git a/app-import/src/main/resources/tcs/Cichorium_tcs.xml b/app-import/src/main/resources/tcs/Cichorium_tcs.xml
index c428c8bbbc..e1167b8036 100644
--- a/app-import/src/main/resources/tcs/Cichorium_tcs.xml
+++ b/app-import/src/main/resources/tcs/Cichorium_tcs.xml
@@ -18,78 +18,91 @@
 		<Publication id="ref2">
 			<Simple>Sp. Pl.</Simple>
 			<PublicationDetailed>
+				<Title>Sp. Pl.</Title>
 				<DatePublished>1753</DatePublished>
 			</PublicationDetailed>
 		</Publication>
 		<Publication id="ref3">
-			<Simple>Voyage Yemen</Simple>
+			<Simple>Voyage Yemen 1889</Simple>
 			<PublicationDetailed>
+				<Title>Voyage Yemen</Title>
 				<DatePublished>1889</DatePublished>
 			</PublicationDetailed>
 		</Publication>
 		<Publication id="ref4">
 			<Simple>in Schweinfurth, Beitr. Fl. Äthiop.</Simple>
 			<PublicationDetailed>
+				<Title>in Schweinfurth, Beitr. Fl. Äthiop.</Title>
 				<DatePublished>1867</DatePublished>
 			</PublicationDetailed>
 		</Publication>
 		<Publication id="ref5">
 			<Simple>Consp. Fl. Graec. 2</Simple>
 			<PublicationDetailed>
+				<Title>Consp. Fl. Graec. 2</Title>
 				<DatePublished>1902</DatePublished>
 			</PublicationDetailed>
 		</Publication>
 		<Publication id="ref6">
 			<Simple>in Willdenowia 37</Simple>
 			<PublicationDetailed>
+				<Title>in Willdenowia 37</Title>
 				<DatePublished>2007</DatePublished>
 			</PublicationDetailed>
 		</Publication>
 		<Publication id="ref7">
 			<Simple>Observ. Bot. 4</Simple>
 			<PublicationDetailed>
+				<Title>Observ. Bot. 4</Title>
 				<DatePublished>1771</DatePublished>
 			</PublicationDetailed>
 		</Publication>
 		<Publication id="ref8">
 			<Simple>Syn. Gen. Compos.</Simple>
 			<PublicationDetailed>
+				<Title>Syn. Gen. Compos.</Title>
 				<DatePublished>1832</DatePublished>
 			</PublicationDetailed>
 		</Publication>
 		<Publication id="ref9">
 			<Simple>Compos. Ind.</Simple>
 			<PublicationDetailed>
+				<Title>Compos. Ind.</Title>
 				<DatePublished>1876</DatePublished>
 			</PublicationDetailed>
 		</Publication>
 		<Publication id="ref10">
 			<Simple>Prodr. Stirp. Chap. Allerton.</Simple>
 			<PublicationDetailed>
+				<Title>Prodr. Stirp. Chap. Allerton.</Title>
 				<DatePublished>1796</DatePublished>
 			</PublicationDetailed>
 		</Publication>
 		<Publication id="ref11">
 			<Simple>in Lamarck &amp; Candolle, Fl. Franç. ed. 3, 4</Simple>
 			<PublicationDetailed>
+				<Title>in Lamarck &amp; Candolle, Fl. Franç. ed. 3, 4</Title>
 				<DatePublished>1805</DatePublished>
 			</PublicationDetailed>
 		</Publication>
 		<Publication id="ref12">
 			<Simple>Prodr. 7</Simple>
 			<PublicationDetailed>
+				<Title>Prodr. 7</Title>
 				<DatePublished>1838</DatePublished>
 			</PublicationDetailed>
 		</Publication>
 		<Publication id="ref13">
 			<Simple>Fl. Portug. 2</Simple>
 			<PublicationDetailed>
+				<Title>Fl. Portug. 2</Title>
 				<DatePublished>1825-1828</DatePublished>
 			</PublicationDetailed>
 		</Publication>
 		<Publication id="ref14">
 			<Simple>in Komarov, Fl. SSSR 29</Simple>
 			<PublicationDetailed>
+				<Title>in Komarov, Fl. SSSR 29</Title>
 				<DatePublished>1964</DatePublished>
 			</PublicationDetailed>
 		</Publication>
diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/DefaultTcsXmlPlaceholders.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/DefaultTcsXmlPlaceholders.java
index 462ca2292a..72e33e88ab 100644
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/DefaultTcsXmlPlaceholders.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/DefaultTcsXmlPlaceholders.java
@@ -54,17 +54,49 @@ public class DefaultTcsXmlPlaceholders implements ITcsXmlPlaceholderClass {
 		}
 		if (elPublicationDetailed == null){
 			return true;
+		}else{
+			publication.setProtectedTitleCache(false);
 		}
 		
-		String childName = "DatePublished";
-		boolean obligatory = false;
-		Namespace ns = config.getTcsXmlNamespace();
-		Element elDatePublished = XmlHelp.getSingleChildElement(success, elPublicationDetailed, childName, ns, obligatory);
-		if (elDatePublished != null){
-			String strDatePublished = elDatePublished.getTextNormalize();
-			TimePeriod datePublished = TimePeriod.parseString(strDatePublished);
-			publication.setDatePublished(datePublished);
+		String childName;
+		Namespace tcsNs = config.getTcsXmlNamespace();
+		for (Object o : elPublicationDetailed.getChildren()){
+			Element element = (Element)o;
+			String value = element.getTextNormalize();
+			
+			childName = "Title";
+			if (element.getName().equalsIgnoreCase(childName) && element.getNamespace().equals(tcsNs)){
+				publication.setTitle(value);
+				continue;
+			}
+
+			childName = "DatePublished";
+			if (element.getName().equalsIgnoreCase(childName) && element.getNamespace().equals(tcsNs)){
+				TimePeriod datePublished = TimePeriod.parseString(value);
+				publication.setDatePublished(datePublished);
+				continue;
+			}
+			
+			logger.warn("Unhandled Publication Detailed child element: " +  element.getName());
+	
 		}
+//		String childName = "Title";
+//		boolean obligatory = false;
+//		Element elTitle = XmlHelp.getSingleChildElement(success, elPublicationDetailed, childName, ns, obligatory);
+//		if (elTitle != null){
+//			String strTitle = elTitle.getTextNormalize();
+//			publication.setTitle(strTitle);
+//		}
+
+//		childName = "DatePublished";
+//		obligatory = false;
+//		ns = config.getTcsXmlNamespace();
+//		Element elDatePublished = XmlHelp.getSingleChildElement(success, elPublicationDetailed, childName, ns, obligatory);
+//		if (elDatePublished != null){
+//			String strDatePublished = elDatePublished.getTextNormalize();
+//			TimePeriod datePublished = TimePeriod.parseString(strDatePublished);
+//			publication.setDatePublished(datePublished);
+//		}
 		
 		//Do nothing
 		//TODO implement EDIT TcsMetaData extension