Project

General

Profile

« Previous | Next » 

Revision 5656

schemas/vegbien.sql: taxonlabel: Renamed identifyingtaxonomicname to taxonomicname because the taxonomicname provided by the datasource is now in taxonverbatim, so there is no name collision. Note that both of these fields store the same type of information, but taxonlabel's is autogenerated while taxonverbatim's is verbatim (and is only set if provided by the datasource).

View differences:

test.xml.ref
155 155
                                                    <organizationname>TNRS</organizationname>
156 156
                                                </party>
157 157
                                            </creator_id>
158
                                            <identifyingtaxonomicname>
158
                                            <taxonomicname>
159 159
                                                <_join_words>
160 160
                                                    <1>
161 161
                                                        <_join_words>
......
177 177
                                                    </1>
178 178
                                                    <2>$specific_authority</2>
179 179
                                                </_join_words>
180
                                            </identifyingtaxonomicname>
180
                                            </taxonomicname>
181 181
                                        </taxonlabel>
182 182
                                    </matched_label_id>
183
                                    <identifyingtaxonomicname>
184
                                        <_join_words>
185
                                            <1>
186
                                                <_join_words>
187
                                                    <1>$family</1>
188
                                                    <2>$genus</2>
189
                                                    <3>$specific_epithet</3>
190
                                                    <5>
191
                                                        <_join_words>
192
                                                            <1>
193
                                                                <_if name="if has infraspecificEpithet">
194
                                                                    <cond>$infra_ep_1</cond>
195
                                                                    <then>$infra_rank_1</then>
196
                                                                </_if>
197
                                                            </1>
198
                                                            <2>$infra_ep_1</2>
199
                                                        </_join_words>
200
                                                    </5>
201
                                                </_join_words>
202
                                            </1>
203
                                            <2>$specific_authority</2>
204
                                        </_join_words>
205
                                    </identifyingtaxonomicname>
206 183
                                    <parent_id>
207 184
                                        <taxonlabel>
208 185
                                            <rank>$infra_rank_1</rank>
......
249 226
                                        </taxonlabel>
250 227
                                    </parent_id>
251 228
                                    <rank>$infra_rank_1</rank>
229
                                    <taxonomicname>
230
                                        <_join_words>
231
                                            <1>
232
                                                <_join_words>
233
                                                    <1>$family</1>
234
                                                    <2>$genus</2>
235
                                                    <3>$specific_epithet</3>
236
                                                    <5>
237
                                                        <_join_words>
238
                                                            <1>
239
                                                                <_if name="if has infraspecificEpithet">
240
                                                                    <cond>$infra_ep_1</cond>
241
                                                                    <then>$infra_rank_1</then>
242
                                                                </_if>
243
                                                            </1>
244
                                                            <2>$infra_ep_1</2>
245
                                                        </_join_words>
246
                                                    </5>
247
                                                </_join_words>
248
                                            </1>
249
                                            <2>$specific_authority</2>
250
                                        </_join_words>
251
                                    </taxonomicname>
252 252
                                    <taxonverbatim>
253 253
                                        <author>$specific_authority</author>
254 254
                                        <family>$family</family>
......
264 264
                            <isoriginal>true</isoriginal>
265 265
                            <taxonlabel_id>
266 266
                                <taxonlabel>
267
                                    <identifyingtaxonomicname>
268
                                        <_join_words>
269
                                            <1>$orig_family</1>
270
                                            <3>$orig_species</3>
271
                                        </_join_words>
272
                                    </identifyingtaxonomicname>
273 267
                                    <matched_label_id>
274 268
                                        <taxonlabel>
275 269
                                            <creator_id>
......
278 272
                                                    <organizationname>TNRS</organizationname>
279 273
                                                </party>
280 274
                                            </creator_id>
281
                                            <identifyingtaxonomicname>
275
                                            <taxonomicname>
282 276
                                                <_join_words>
283 277
                                                    <1>$orig_family</1>
284 278
                                                    <3>$orig_species</3>
285 279
                                                </_join_words>
286
                                            </identifyingtaxonomicname>
280
                                            </taxonomicname>
287 281
                                        </taxonlabel>
288 282
                                    </matched_label_id>
289 283
                                    <parent_id>
......
327 321
                                            </parent_id>
328 322
                                        </taxonlabel>
329 323
                                    </parent_id>
324
                                    <taxonomicname>
325
                                        <_join_words>
326
                                            <1>$orig_family</1>
327
                                            <3>$orig_species</3>
328
                                        </_join_words>
329
                                    </taxonomicname>
330 330
                                    <taxonverbatim>
331 331
                                        <family>$orig_family</family>
332 332
                                        <species>$orig_species</species>

Also available in: Unified diff