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
86 86
                                                        <taxonlabel>
87 87
                                                            <source_id><source><shortname>TNRS</shortname></source></source_id>
88 88
                                                            <taxonomicname>
89
                                                                <_join_words>
90
                                                                    <1>
91
                                                                        <_taxon_family_require_std>
92
                                                                            <family>
93
                                                                                <_nullIf>
94
                                                                                    <null>$scientificName</null>
95
                                                                                    <value>$family</value>
96
                                                                                </_nullIf>
97
                                                                            </family>
98
                                                                        </_taxon_family_require_std>
99
                                                                    </1>
100
                                                                    <2>
89
                                                                <_merge_prefix>
90
                                                                    <prefix><_taxon_family_require_std><family>$family</family></_taxon_family_require_std></prefix>
91
                                                                    <value>
101 92
                                                                        <_alt>
102 93
                                                                            <1>$scientificName</1>
103 94
                                                                            <2>
......
123 114
                                                                                </_join_words>
124 115
                                                                            </2>
125 116
                                                                        </_alt>
126
                                                                    </2>
127
                                                                </_join_words>
117
                                                                    </value>
118
                                                                </_merge_prefix>
128 119
                                                            </taxonomicname>
129 120
                                                        </taxonlabel>
130 121
                                                    </matched_label_id>
......
200 191
                                                    </parent_id>
201 192
                                                    <rank>$taxonRank</rank>
202 193
                                                    <taxonomicname>
203
                                                        <_join_words>
204
                                                            <1>
205
                                                                <_taxon_family_require_std>
206
                                                                    <family>
207
                                                                        <_nullIf>
208
                                                                            <null>$scientificName</null>
209
                                                                            <value>$family</value>
210
                                                                        </_nullIf>
211
                                                                    </family>
212
                                                                </_taxon_family_require_std>
213
                                                            </1>
214
                                                            <2>
194
                                                        <_merge_prefix>
195
                                                            <prefix><_taxon_family_require_std><family>$family</family></_taxon_family_require_std></prefix>
196
                                                            <value>
215 197
                                                                <_alt>
216 198
                                                                    <1>$scientificName</1>
217 199
                                                                    <2>
......
237 219
                                                                        </_join_words>
238 220
                                                                    </2>
239 221
                                                                </_alt>
240
                                                            </2>
241
                                                        </_join_words>
222
                                                            </value>
223
                                                        </_merge_prefix>
242 224
                                                    </taxonomicname>
243 225
                                                </taxonlabel>
244 226
                                            </taxonlabel_id>

Also available in: Unified diff