diff --git a/bacdive2alvisnlp.xslt b/bacdive2alvisnlp.xslt index 5a3fe2f631344a33aad2dea7e264df709295f98c..bdb35ea2006b0238ac1e12c19a5f7cbf9af83868 100644 --- a/bacdive2alvisnlp.xslt +++ b/bacdive2alvisnlp.xslt @@ -16,20 +16,6 @@ <xsl:template match="taxonomy_name/strains/list-item"> <a:section name="species" xpath-contents="species"/> - <xsl:variable name="complete"> - <xsl:choose> - <xsl:when test="subspecies_epithet != ''"> - <xsl:value-of select="concat(species, ' ', subspecies_epithet)"/> - </xsl:when> - <xsl:when test="species_epithet != ''"> - <xsl:value-of select="species"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="genus"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - <a:section name="complete" xpath-contents="$complete"/> <a:section name="full_scientific_name" xpath-contents="normalize-space(full_scientific_name)"/> <a:section name="designation" xpath-contents="designation"/> </xsl:template> diff --git a/dsmz-match.plan b/dsmz-match.plan index c46b7a93fe113d6a02aa205d59601c089596dbf2..0d02a854b87075900269d5602399f47ab7fcd157 100644 --- a/dsmz-match.plan +++ b/dsmz-match.plan @@ -27,7 +27,7 @@ <strain-name class="Action"> <target>documents.sections:strain-number</target> - <action>document.new:section:strain-name(sections:complete.contents ^ " " ^ target.contents)</action> + <action>document.new:section:strain-name(sections:species.contents ^ " " ^ target.contents)</action> <createSections/> </strain-name> @@ -44,7 +44,7 @@ <lines>documents.sections[@taxid]</lines> <columns> document.@id, - document.sections:complete.contents, + document.sections:species.contents, document.sections:full_scientific_name.contents, @name, contents, @@ -54,7 +54,7 @@ </columns> <headers> "ID", - "COMPLETE NAME", + "SPECIES NAME", "FULL NAME", "FIELD", "NAME",