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
132 132
                                                        <taxonlabel>
133 133
                                                            <source_id><source><shortname>TNRS</shortname></source></source_id>
134 134
                                                            <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>
135
                                                                <_merge_prefix>
136
                                                                    <prefix><_taxon_family_require_std><family>$Family</family></_taxon_family_require_std></prefix>
137
                                                                    <value>
147 138
                                                                        <_join_words>
148 139
                                                                            <1>
149 140
                                                                                <_alt>
......
159 150
                                                                            </1>
160 151
                                                                            <2>$ScientificNameAuthor</2>
161 152
                                                                        </_join_words>
162
                                                                    </2>
163
                                                                </_join_words>
153
                                                                    </value>
154
                                                                </_merge_prefix>
164 155
                                                            </taxonomicname>
165 156
                                                        </taxonlabel>
166 157
                                                    </matched_label_id>
......
257 248
                                                        </taxonlabel>
258 249
                                                    </parent_id>
259 250
                                                    <taxonomicname>
260
                                                        <_join_words>
261
                                                            <1>
262
                                                                <_taxon_family_require_std>
263
                                                                    <family>
264
                                                                        <_nullIf>
265
                                                                            <null>$ScientificName</null>
266
                                                                            <value>$Family</value>
267
                                                                        </_nullIf>
268
                                                                    </family>
269
                                                                </_taxon_family_require_std>
270
                                                            </1>
271
                                                            <2>
251
                                                        <_merge_prefix>
252
                                                            <prefix><_taxon_family_require_std><family>$Family</family></_taxon_family_require_std></prefix>
253
                                                            <value>
272 254
                                                                <_join_words>
273 255
                                                                    <1>
274 256
                                                                        <_alt>
......
284 266
                                                                    </1>
285 267
                                                                    <2>$ScientificNameAuthor</2>
286 268
                                                                </_join_words>
287
                                                            </2>
288
                                                        </_join_words>
269
                                                            </value>
270
                                                        </_merge_prefix>
289 271
                                                    </taxonomicname>
290 272
                                                </taxonlabel>
291 273
                                            </taxonlabel_id>

Also available in: Unified diff