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
115 115
                                                        <taxonlabel>
116 116
                                                            <source_id><source><shortname>TNRS</shortname></source></source_id>
117 117
                                                            <taxonomicname>
118
                                                                <_join_words>
119
                                                                    <1>
120
                                                                        <_taxon_family_require_std>
121
                                                                            <family>
122
                                                                                <_nullIf>
123
                                                                                    <null>$SciName</null>
124
                                                                                    <value>$family</value>
125
                                                                                </_nullIf>
126
                                                                            </family>
127
                                                                        </_taxon_family_require_std>
128
                                                                    </1>
129
                                                                    <2>
118
                                                                <_merge_prefix>
119
                                                                    <prefix><_taxon_family_require_std><family>$family</family></_taxon_family_require_std></prefix>
120
                                                                    <value>
130 121
                                                                        <_join_words>
131 122
                                                                            <1>
132 123
                                                                                <_alt>
......
157 148
                                                                            </1>
158 149
                                                                            <2>$authors</2>
159 150
                                                                        </_join_words>
160
                                                                    </2>
161
                                                                </_join_words>
151
                                                                    </value>
152
                                                                </_merge_prefix>
162 153
                                                            </taxonomicname>
163 154
                                                        </taxonlabel>
164 155
                                                    </matched_label_id>
......
226 217
                                                        </_alt>
227 218
                                                    </rank>
228 219
                                                    <taxonomicname>
229
                                                        <_join_words>
230
                                                            <1>
231
                                                                <_taxon_family_require_std>
232
                                                                    <family>
233
                                                                        <_nullIf>
234
                                                                            <null>$SciName</null>
235
                                                                            <value>$family</value>
236
                                                                        </_nullIf>
237
                                                                    </family>
238
                                                                </_taxon_family_require_std>
239
                                                            </1>
240
                                                            <2>
220
                                                        <_merge_prefix>
221
                                                            <prefix><_taxon_family_require_std><family>$family</family></_taxon_family_require_std></prefix>
222
                                                            <value>
241 223
                                                                <_join_words>
242 224
                                                                    <1>
243 225
                                                                        <_alt>
......
268 250
                                                                    </1>
269 251
                                                                    <2>$authors</2>
270 252
                                                                </_join_words>
271
                                                            </2>
272
                                                        </_join_words>
253
                                                            </value>
254
                                                        </_merge_prefix>
273 255
                                                    </taxonomicname>
274 256
                                                </taxonlabel>
275 257
                                            </taxonlabel_id>

Also available in: Unified diff