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
222 222
                                                        <taxonlabel>
223 223
                                                            <source_id><source><shortname>TNRS</shortname></source></source_id>
224 224
                                                            <taxonomicname>
225
                                                                <_join_words>
226
                                                                    <1>
225
                                                                <_merge_prefix>
226
                                                                    <prefix>
227 227
                                                                        <_taxon_family_require_std>
228 228
                                                                            <family>
229
                                                                                <_nullIf>
230
                                                                                    <null>
231
                                                                                        <_alt>
232
                                                                                            <0>$conceptual_darwin_2003_1_0_ScientificName</0>
233
                                                                                            <1>$dwc_dwcore_ScientificName</1>
234
                                                                                            <2>$dwc_terms_scientificName</2>
235
                                                                                        </_alt>
236
                                                                                    </null>
237
                                                                                    <value>
238
                                                                                        <_alt>
239
                                                                                            <0>$conceptual_darwin_2003_1_0_Family</0>
240
                                                                                            <1>$dwc_dwcore_Family</1>
241
                                                                                            <2>$dwc_terms_family</2>
242
                                                                                        </_alt>
243
                                                                                    </value>
244
                                                                                </_nullIf>
229
                                                                                <_alt>
230
                                                                                    <0>$conceptual_darwin_2003_1_0_Family</0>
231
                                                                                    <1>$dwc_dwcore_Family</1>
232
                                                                                    <2>$dwc_terms_family</2>
233
                                                                                </_alt>
245 234
                                                                            </family>
246 235
                                                                        </_taxon_family_require_std>
247
                                                                    </1>
248
                                                                    <2>
236
                                                                    </prefix>
237
                                                                    <value>
249 238
                                                                        <_join_words>
250 239
                                                                            <1>
251 240
                                                                                <_alt>
......
291 280
                                                                                </_alt>
292 281
                                                                            </2>
293 282
                                                                        </_join_words>
294
                                                                    </2>
295
                                                                </_join_words>
283
                                                                    </value>
284
                                                                </_merge_prefix>
296 285
                                                            </taxonomicname>
297 286
                                                        </taxonlabel>
298 287
                                                    </matched_label_id>
......
442 431
                                                        </taxonlabel>
443 432
                                                    </parent_id>
444 433
                                                    <taxonomicname>
445
                                                        <_join_words>
446
                                                            <1>
434
                                                        <_merge_prefix>
435
                                                            <prefix>
447 436
                                                                <_taxon_family_require_std>
448 437
                                                                    <family>
449
                                                                        <_nullIf>
450
                                                                            <null>
451
                                                                                <_alt>
452
                                                                                    <0>$conceptual_darwin_2003_1_0_ScientificName</0>
453
                                                                                    <1>$dwc_dwcore_ScientificName</1>
454
                                                                                    <2>$dwc_terms_scientificName</2>
455
                                                                                </_alt>
456
                                                                            </null>
457
                                                                            <value>
458
                                                                                <_alt>
459
                                                                                    <0>$conceptual_darwin_2003_1_0_Family</0>
460
                                                                                    <1>$dwc_dwcore_Family</1>
461
                                                                                    <2>$dwc_terms_family</2>
462
                                                                                </_alt>
463
                                                                            </value>
464
                                                                        </_nullIf>
438
                                                                        <_alt>
439
                                                                            <0>$conceptual_darwin_2003_1_0_Family</0>
440
                                                                            <1>$dwc_dwcore_Family</1>
441
                                                                            <2>$dwc_terms_family</2>
442
                                                                        </_alt>
465 443
                                                                    </family>
466 444
                                                                </_taxon_family_require_std>
467
                                                            </1>
468
                                                            <2>
445
                                                            </prefix>
446
                                                            <value>
469 447
                                                                <_join_words>
470 448
                                                                    <1>
471 449
                                                                        <_alt>
......
511 489
                                                                        </_alt>
512 490
                                                                    </2>
513 491
                                                                </_join_words>
514
                                                            </2>
515
                                                        </_join_words>
492
                                                            </value>
493
                                                        </_merge_prefix>
516 494
                                                    </taxonomicname>
517 495
                                                </taxonlabel>
518 496
                                            </taxonlabel_id>

Also available in: Unified diff