\r
import java.util.HashSet;\r
import java.util.List;\r
-import java.util.Map;\r
import java.util.Set;\r
\r
import org.apache.log4j.Logger;\r
import org.jdom.Namespace;\r
import org.springframework.stereotype.Component;\r
\r
-import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
import eu.etaxonomy.cdm.api.service.INameService;\r
-import eu.etaxonomy.cdm.io.common.CdmIoBase;\r
import eu.etaxonomy.cdm.io.common.ICdmIO;\r
-import eu.etaxonomy.cdm.io.common.IImportConfigurator;\r
import eu.etaxonomy.cdm.io.common.MapWrapper;\r
-import eu.etaxonomy.cdm.model.common.CdmBase;\r
import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
\r
* @version 1.0\r
*/\r
@Component\r
-public class TcsRdfTaxonNameRelationsImport extends CdmIoBase<IImportConfigurator> implements ICdmIO<IImportConfigurator> {\r
+public class TcsRdfTaxonNameRelationsImport extends TcsRdfImportBase implements ICdmIO<TcsRdfImportState> {\r
private static final Logger logger = Logger.getLogger(TcsRdfTaxonNameRelationsImport.class);\r
\r
private static int modCount = 5000;\r
}\r
\r
@Override\r
- public boolean doCheck(IImportConfigurator config){\r
+ public boolean doCheck(TcsRdfImportState state){\r
boolean result = true;\r
logger.warn("Checking for TaxonNameRelations not yet implemented");\r
//result &= checkArticlesWithoutJournal(tcsConfig);\r
}\r
\r
@Override\r
- public boolean doInvoke(IImportConfigurator config, Map<String, MapWrapper<? extends CdmBase>> stores){\r
+ public boolean doInvoke(TcsRdfImportState state){\r
\r
- MapWrapper<TaxonNameBase> taxonNameMap = (MapWrapper<TaxonNameBase>)stores.get(ICdmIO.TAXONNAME_STORE);\r
- MapWrapper<ReferenceBase> referenceMap = (MapWrapper<ReferenceBase>)stores.get(ICdmIO.REFERENCE_STORE);\r
+ MapWrapper<TaxonNameBase> taxonNameMap = (MapWrapper<TaxonNameBase>)state.getStore(ICdmIO.TAXONNAME_STORE);\r
+ MapWrapper<ReferenceBase> referenceMap = (MapWrapper<ReferenceBase>)state.getStore(ICdmIO.REFERENCE_STORE);\r
\r
String tcsElementName;\r
Namespace tcsNamespace;\r
String value;\r
\r
Set<TaxonNameBase> nameStore = new HashSet<TaxonNameBase>();\r
- TcsRdfImportConfigurator tcsConfig = (TcsRdfImportConfigurator)config;\r
- Element source = tcsConfig.getSourceRoot();\r
+ TcsRdfImportConfigurator config = state.getConfig();\r
+ Element source = config.getSourceRoot();\r
\r
logger.info("start makeNameRelationships ...");\r
INameService nameService = getNameService();\r
\r
// <tn:hasBasionym rdf:resource="palm_tn_14530"/>\r
\r
- Element root = tcsConfig.getSourceRoot();\r
+ Element root = config.getSourceRoot();\r
boolean success =true;\r
\r
- Namespace rdfNamespace = tcsConfig.getRdfNamespace();\r
- Namespace taxonNameNamespace = tcsConfig.getTnNamespace();\r
+ Namespace rdfNamespace = config.getRdfNamespace();\r
+ Namespace taxonNameNamespace = config.getTnNamespace();\r
\r
List<Element> elTaxonNames = root.getChildren("TaxonName", taxonNameNamespace);\r
\r
}\r
}\r
String ruleConcidered = null; //TODO\r
- fromName.addBasionym(basionym, ruleConcidered);\r
+ String microCitation = null; //TODO;\r
+ ReferenceBase citation = null; //TODO;\r
+ fromName.addBasionym(basionym, citation, microCitation, ruleConcidered);\r
nameStore.add(fromName);\r
\r
}\r
//TODO\r
\r
logger.info(nameRelCount + " nameRelations handled");\r
- nameService.saveTaxonNameAll(nameStore);\r
+ nameService.save(nameStore);\r
logger.info("end makeNameRelationships ...");\r
return success;\r
}\r
/* (non-Javadoc)\r
* @see eu.etaxonomy.cdm.io.common.CdmIoBase#isIgnore(eu.etaxonomy.cdm.io.common.IImportConfigurator)\r
*/\r
- protected boolean isIgnore(IImportConfigurator config){\r
- return ! config.isDoRelNames();\r
+ protected boolean isIgnore(TcsRdfImportState state){\r
+ return ! state.getConfig().isDoRelNames();\r
}\r
\r
}\r