Project

General

Profile

« Previous | Next » 

Revision 7142

mappings/VegCore-VegBIEN.csv: taxonlabel.taxonomicname: Prepend the family to the rest of the name using new _merge_prefix() instead of _join_words()/_nullIf(), so that any input taxonomic name that includes the family will not have the family duplicated in the combined taxonomic name. Previously, the duplication was removed only when the rest of the input name was equal to the family. This change fixes a bug in the new TNRS import where a pre-concatenated taxonomic name (Accepted_scientific_name) which includes the family is now used instead of Accepted_name, which only includes it when it's equal to the family.

View differences:

test.xml.ref
19 19
                                                        <taxonlabel>
20 20
                                                            <source_id><source><shortname>TNRS</shortname></source></source_id>
21 21
                                                            <taxonomicname>
22
                                                                <_join_words>
23
                                                                    <1>
24
                                                                        <_taxon_family_require_std>
25
                                                                            <family>
26
                                                                                <_nullIf>
27
                                                                                    <null>$scientificName</null>
28
                                                                                    <value>$family</value>
29
                                                                                </_nullIf>
30
                                                                            </family>
31
                                                                        </_taxon_family_require_std>
32
                                                                    </1>
33
                                                                    <2>
22
                                                                <_merge_prefix>
23
                                                                    <prefix><_taxon_family_require_std><family>$family</family></_taxon_family_require_std></prefix>
24
                                                                    <value>
34 25
                                                                        <_alt>
35 26
                                                                            <1>$scientificName</1>
36 27
                                                                            <2>
......
56 47
                                                                                </_join_words>
57 48
                                                                            </2>
58 49
                                                                        </_alt>
59
                                                                    </2>
60
                                                                </_join_words>
50
                                                                    </value>
51
                                                                </_merge_prefix>
61 52
                                                            </taxonomicname>
62 53
                                                        </taxonlabel>
63 54
                                                    </matched_label_id>
......
132 123
                                                    <rank>$taxonRank</rank>
133 124
                                                    <sourceaccessioncode>$id</sourceaccessioncode>
134 125
                                                    <taxonomicname>
135
                                                        <_join_words>
136
                                                            <1>
137
                                                                <_taxon_family_require_std>
138
                                                                    <family>
139
                                                                        <_nullIf>
140
                                                                            <null>$scientificName</null>
141
                                                                            <value>$family</value>
142
                                                                        </_nullIf>
143
                                                                    </family>
144
                                                                </_taxon_family_require_std>
145
                                                            </1>
146
                                                            <2>
126
                                                        <_merge_prefix>
127
                                                            <prefix><_taxon_family_require_std><family>$family</family></_taxon_family_require_std></prefix>
128
                                                            <value>
147 129
                                                                <_alt>
148 130
                                                                    <1>$scientificName</1>
149 131
                                                                    <2>
......
169 151
                                                                        </_join_words>
170 152
                                                                    </2>
171 153
                                                                </_alt>
172
                                                            </2>
173
                                                        </_join_words>
154
                                                            </value>
155
                                                        </_merge_prefix>
174 156
                                                    </taxonomicname>
175 157
                                                    <taxonstatus>$taxonomicStatus</taxonstatus>
176 158
                                                </taxonlabel>

Also available in: Unified diff