Revision 7142
Added by Aaron Marcuse-Kubitza over 11 years ago
| test.xml.ref | ||
|---|---|---|
| 160 | 160 |
<taxonlabel> |
| 161 | 161 |
<source_id><source><shortname>TNRS</shortname></source></source_id> |
| 162 | 162 |
<taxonomicname> |
| 163 |
<_join_words>
|
|
| 164 |
<1><_taxon_family_require_std><family>$Family</family></_taxon_family_require_std></1>
|
|
| 165 |
<2>
|
|
| 163 |
<_merge_prefix>
|
|
| 164 |
<prefix><_taxon_family_require_std><family>$Family</family></_taxon_family_require_std></prefix>
|
|
| 165 |
<value>
|
|
| 166 | 166 |
<_join_words> |
| 167 | 167 |
<1> |
| 168 | 168 |
<_join_words> |
| ... | ... | |
| 183 | 183 |
</1> |
| 184 | 184 |
<2>$auth</2> |
| 185 | 185 |
</_join_words> |
| 186 |
</2>
|
|
| 187 |
</_join_words>
|
|
| 186 |
</value>
|
|
| 187 |
</_merge_prefix>
|
|
| 188 | 188 |
</taxonomicname> |
| 189 | 189 |
</taxonlabel> |
| 190 | 190 |
</matched_label_id> |
| ... | ... | |
| 235 | 235 |
</parent_id> |
| 236 | 236 |
<rank>$infra_rank_1</rank> |
| 237 | 237 |
<taxonomicname> |
| 238 |
<_join_words>
|
|
| 239 |
<1><_taxon_family_require_std><family>$Family</family></_taxon_family_require_std></1>
|
|
| 240 |
<2>
|
|
| 238 |
<_merge_prefix>
|
|
| 239 |
<prefix><_taxon_family_require_std><family>$Family</family></_taxon_family_require_std></prefix>
|
|
| 240 |
<value>
|
|
| 241 | 241 |
<_join_words> |
| 242 | 242 |
<1> |
| 243 | 243 |
<_join_words> |
| ... | ... | |
| 258 | 258 |
</1> |
| 259 | 259 |
<2>$auth</2> |
| 260 | 260 |
</_join_words> |
| 261 |
</2>
|
|
| 262 |
</_join_words>
|
|
| 261 |
</value>
|
|
| 262 |
</_merge_prefix>
|
|
| 263 | 263 |
</taxonomicname> |
| 264 | 264 |
</taxonlabel> |
| 265 | 265 |
</taxonlabel_id> |
| ... | ... | |
| 282 | 282 |
<taxonlabel> |
| 283 | 283 |
<source_id><source><shortname>TNRS</shortname></source></source_id> |
| 284 | 284 |
<taxonomicname> |
| 285 |
<_join_words>
|
|
| 286 |
<1><_taxon_family_require_std><family>$OrigFamily</family></_taxon_family_require_std></1>
|
|
| 287 |
<2>
|
|
| 285 |
<_merge_prefix>
|
|
| 286 |
<prefix><_taxon_family_require_std><family>$OrigFamily</family></_taxon_family_require_std></prefix>
|
|
| 287 |
<value>
|
|
| 288 | 288 |
<_join_words> |
| 289 | 289 |
<2>$OrigGenus</2> |
| 290 | 290 |
<3>$OrigSpecies</3> |
| 291 | 291 |
</_join_words> |
| 292 |
</2>
|
|
| 293 |
</_join_words>
|
|
| 292 |
</value>
|
|
| 293 |
</_merge_prefix>
|
|
| 294 | 294 |
</taxonomicname> |
| 295 | 295 |
</taxonlabel> |
| 296 | 296 |
</matched_label_id> |
| ... | ... | |
| 337 | 337 |
</taxonlabel> |
| 338 | 338 |
</parent_id> |
| 339 | 339 |
<taxonomicname> |
| 340 |
<_join_words>
|
|
| 341 |
<1><_taxon_family_require_std><family>$OrigFamily</family></_taxon_family_require_std></1>
|
|
| 342 |
<2>
|
|
| 340 |
<_merge_prefix>
|
|
| 341 |
<prefix><_taxon_family_require_std><family>$OrigFamily</family></_taxon_family_require_std></prefix>
|
|
| 342 |
<value>
|
|
| 343 | 343 |
<_join_words> |
| 344 | 344 |
<2>$OrigGenus</2> |
| 345 | 345 |
<3>$OrigSpecies</3> |
| 346 | 346 |
</_join_words> |
| 347 |
</2>
|
|
| 348 |
</_join_words>
|
|
| 347 |
</value>
|
|
| 348 |
</_merge_prefix>
|
|
| 349 | 349 |
</taxonomicname> |
| 350 | 350 |
</taxonlabel> |
| 351 | 351 |
</taxonlabel_id> |
Also available in: Unified diff
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.