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
126 126
                                                    <organizationname>TNRS</organizationname>
127 127
                                                </party>
128 128
                                            </creator_id>
129
                                            <identifyingtaxonomicname>
129
                                            <taxonomicname>
130 130
                                                <_join_words>
131 131
                                                    <1>
132 132
                                                        <_join_words>
......
148 148
                                                    </1>
149 149
                                                    <2>$auth</2>
150 150
                                                </_join_words>
151
                                            </identifyingtaxonomicname>
151
                                            </taxonomicname>
152 152
                                        </taxonlabel>
153 153
                                    </matched_label_id>
154
                                    <identifyingtaxonomicname>
155
                                        <_join_words>
156
                                            <1>
157
                                                <_join_words>
158
                                                    <1>$Family</1>
159
                                                    <2>$Genus</2>
160
                                                    <3>$Species</3>
161
                                                    <5>
162
                                                        <_join_words>
163
                                                            <1>
164
                                                                <_if name="if has infraspecificEpithet">
165
                                                                    <cond>$infra_ep_1</cond>
166
                                                                    <then>$infra_rank_1</then>
167
                                                                </_if>
168
                                                            </1>
169
                                                            <2>$infra_ep_1</2>
170
                                                        </_join_words>
171
                                                    </5>
172
                                                </_join_words>
173
                                            </1>
174
                                            <2>$auth</2>
175
                                        </_join_words>
176
                                    </identifyingtaxonomicname>
177 154
                                    <parent_id>
178 155
                                        <taxonlabel>
179 156
                                            <rank>$infra_rank_1</rank>
......
220 197
                                        </taxonlabel>
221 198
                                    </parent_id>
222 199
                                    <rank>$infra_rank_1</rank>
200
                                    <taxonomicname>
201
                                        <_join_words>
202
                                            <1>
203
                                                <_join_words>
204
                                                    <1>$Family</1>
205
                                                    <2>$Genus</2>
206
                                                    <3>$Species</3>
207
                                                    <5>
208
                                                        <_join_words>
209
                                                            <1>
210
                                                                <_if name="if has infraspecificEpithet">
211
                                                                    <cond>$infra_ep_1</cond>
212
                                                                    <then>$infra_rank_1</then>
213
                                                                </_if>
214
                                                            </1>
215
                                                            <2>$infra_ep_1</2>
216
                                                        </_join_words>
217
                                                    </5>
218
                                                </_join_words>
219
                                            </1>
220
                                            <2>$auth</2>
221
                                        </_join_words>
222
                                    </taxonomicname>
223 223
                                    <taxonverbatim>
224 224
                                        <author>$auth</author>
225 225
                                        <family>$Family</family>
......
235 235
                            <isoriginal>true</isoriginal>
236 236
                            <taxonlabel_id>
237 237
                                <taxonlabel>
238
                                    <identifyingtaxonomicname>
239
                                        <_join_words>
240
                                            <1>$OrigFamily</1>
241
                                            <2>$OrigGenus</2>
242
                                            <3>$OrigSpecies</3>
243
                                        </_join_words>
244
                                    </identifyingtaxonomicname>
245 238
                                    <matched_label_id>
246 239
                                        <taxonlabel>
247 240
                                            <creator_id>
......
250 243
                                                    <organizationname>TNRS</organizationname>
251 244
                                                </party>
252 245
                                            </creator_id>
253
                                            <identifyingtaxonomicname>
246
                                            <taxonomicname>
254 247
                                                <_join_words>
255 248
                                                    <1>$OrigFamily</1>
256 249
                                                    <2>$OrigGenus</2>
257 250
                                                    <3>$OrigSpecies</3>
258 251
                                                </_join_words>
259
                                            </identifyingtaxonomicname>
252
                                            </taxonomicname>
260 253
                                        </taxonlabel>
261 254
                                    </matched_label_id>
262 255
                                    <parent_id>
......
301 294
                                            </parent_id>
302 295
                                        </taxonlabel>
303 296
                                    </parent_id>
297
                                    <taxonomicname>
298
                                        <_join_words>
299
                                            <1>$OrigFamily</1>
300
                                            <2>$OrigGenus</2>
301
                                            <3>$OrigSpecies</3>
302
                                        </_join_words>
303
                                    </taxonomicname>
304 304
                                    <taxonverbatim>
305 305
                                        <family>$OrigFamily</family>
306 306
                                        <genus>$OrigGenus</genus>

Also available in: Unified diff