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
121 121
                                                        <taxonlabel>
122 122
                                                            <source_id><source><shortname>TNRS</shortname></source></source_id>
123 123
                                                            <taxonomicname>
124
                                                                <_join_words>
125
                                                                    <1>
126
                                                                        <_taxon_family_require_std>
127
                                                                            <family>
128
                                                                                <_nullIf>
129
                                                                                    <null>$scientificName</null>
130
                                                                                    <value>$family</value>
131
                                                                                </_nullIf>
132
                                                                            </family>
133
                                                                        </_taxon_family_require_std>
134
                                                                    </1>
135
                                                                    <2>
124
                                                                <_merge_prefix>
125
                                                                    <prefix><_taxon_family_require_std><family>$family</family></_taxon_family_require_std></prefix>
126
                                                                    <value>
136 127
                                                                        <_alt>
137 128
                                                                            <1>$scientificName</1>
138 129
                                                                            <2>
......
158 149
                                                                                </_join_words>
159 150
                                                                            </2>
160 151
                                                                        </_alt>
161
                                                                    </2>
162
                                                                </_join_words>
152
                                                                    </value>
153
                                                                </_merge_prefix>
163 154
                                                            </taxonomicname>
164 155
                                                        </taxonlabel>
165 156
                                                    </matched_label_id>
......
232 223
                                                    </parent_id>
233 224
                                                    <rank>$taxonRank</rank>
234 225
                                                    <taxonomicname>
235
                                                        <_join_words>
236
                                                            <1>
237
                                                                <_taxon_family_require_std>
238
                                                                    <family>
239
                                                                        <_nullIf>
240
                                                                            <null>$scientificName</null>
241
                                                                            <value>$family</value>
242
                                                                        </_nullIf>
243
                                                                    </family>
244
                                                                </_taxon_family_require_std>
245
                                                            </1>
246
                                                            <2>
226
                                                        <_merge_prefix>
227
                                                            <prefix><_taxon_family_require_std><family>$family</family></_taxon_family_require_std></prefix>
228
                                                            <value>
247 229
                                                                <_alt>
248 230
                                                                    <1>$scientificName</1>
249 231
                                                                    <2>
......
269 251
                                                                        </_join_words>
270 252
                                                                    </2>
271 253
                                                                </_alt>
272
                                                            </2>
273
                                                        </_join_words>
254
                                                            </value>
255
                                                        </_merge_prefix>
274 256
                                                    </taxonomicname>
275 257
                                                </taxonlabel>
276 258
                                            </taxonlabel_id>

Also available in: Unified diff