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
117 117
                                                    <organizationname>TNRS</organizationname>
118 118
                                                </party>
119 119
                                            </creator_id>
120
                                            <identifyingtaxonomicname>
120
                                            <taxonomicname>
121 121
                                                <_join_words>
122 122
                                                    <1>
123 123
                                                        <_alt>
......
134 134
                                                    </1>
135 135
                                                    <2>$ScientificNameAuthor</2>
136 136
                                                </_join_words>
137
                                            </identifyingtaxonomicname>
137
                                            </taxonomicname>
138 138
                                        </taxonlabel>
139 139
                                    </matched_label_id>
140 140
                                    <creationdate>
......
168 168
                                            <path><party><fullname>$IdentifiedBy</fullname></party></path>
169 169
                                        </_simplifyPath>
170 170
                                    </creator_id>
171
                                    <identifyingtaxonomicname>
172
                                        <_join_words>
173
                                            <1>
174
                                                <_alt>
175
                                                    <1>$ScientificName</1>
176
                                                    <2>
177
                                                        <_join_words>
178
                                                            <1>$Family</1>
179
                                                            <2>$Genus</2>
180
                                                            <3>$Species</3>
181
                                                            <4>$Subspecies</4>
182
                                                        </_join_words>
183
                                                    </2>
184
                                                </_alt>
185
                                            </1>
186
                                            <2>$ScientificNameAuthor</2>
187
                                        </_join_words>
188
                                    </identifyingtaxonomicname>
189 171
                                    <parent_id>
190 172
                                        <taxonlabel>
191 173
                                            <parent_id>
......
253 235
                                            </parent_id>
254 236
                                        </taxonlabel>
255 237
                                    </parent_id>
238
                                    <taxonomicname>
239
                                        <_join_words>
240
                                            <1>
241
                                                <_alt>
242
                                                    <1>$ScientificName</1>
243
                                                    <2>
244
                                                        <_join_words>
245
                                                            <1>$Family</1>
246
                                                            <2>$Genus</2>
247
                                                            <3>$Species</3>
248
                                                            <4>$Subspecies</4>
249
                                                        </_join_words>
250
                                                    </2>
251
                                                </_alt>
252
                                            </1>
253
                                            <2>$ScientificNameAuthor</2>
254
                                        </_join_words>
255
                                    </taxonomicname>
256 256
                                    <taxonverbatim>
257 257
                                        <author>$ScientificNameAuthor</author>
258 258
                                        <binomial>$ScientificName</binomial>

Also available in: Unified diff