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
101 101
                                                    <organizationname>TNRS</organizationname>
102 102
                                                </party>
103 103
                                            </creator_id>
104
                                            <identifyingtaxonomicname>
104
                                            <taxonomicname>
105 105
                                                <_join_words>
106 106
                                                    <1>
107 107
                                                        <_alt>
......
128 128
                                                    </1>
129 129
                                                    <2>$scientificNameAuthorship</2>
130 130
                                                </_join_words>
131
                                            </identifyingtaxonomicname>
131
                                            </taxonomicname>
132 132
                                        </taxonlabel>
133 133
                                    </matched_label_id>
134 134
                                    <creationdate><_date><date><_dateRangeStart><value>$dateIdentified</value></_dateRangeStart></date></_date></creationdate>
......
138 138
                                            <path><party><fullname>$identifiedBy</fullname></party></path>
139 139
                                        </_simplifyPath>
140 140
                                    </creator_id>
141
                                    <identifyingtaxonomicname>
142
                                        <_join_words>
143
                                            <1>
144
                                                <_alt>
145
                                                    <1>$scientificName</1>
146
                                                    <2>
147
                                                        <_join_words>
148
                                                            <1>$family</1>
149
                                                            <2>$genus</2>
150
                                                            <3>$specificEpithet</3>
151
                                                            <5>
152
                                                                <_join_words>
153
                                                                    <1>
154
                                                                        <_if name="if has infraspecificEpithet">
155
                                                                            <cond>$infraspecificEpithet</cond>
156
                                                                            <then>$taxonRank</then>
157
                                                                        </_if>
158
                                                                    </1>
159
                                                                    <2>$infraspecificEpithet</2>
160
                                                                </_join_words>
161
                                                            </5>
162
                                                        </_join_words>
163
                                                    </2>
164
                                                </_alt>
165
                                            </1>
166
                                            <2>$scientificNameAuthorship</2>
167
                                        </_join_words>
168
                                    </identifyingtaxonomicname>
169 141
                                    <parent_id>
170 142
                                        <taxonlabel>
171 143
                                            <rank>$taxonRank</rank>
......
236 208
                                        </taxonlabel>
237 209
                                    </parent_id>
238 210
                                    <rank>$taxonRank</rank>
211
                                    <taxonomicname>
212
                                        <_join_words>
213
                                            <1>
214
                                                <_alt>
215
                                                    <1>$scientificName</1>
216
                                                    <2>
217
                                                        <_join_words>
218
                                                            <1>$family</1>
219
                                                            <2>$genus</2>
220
                                                            <3>$specificEpithet</3>
221
                                                            <5>
222
                                                                <_join_words>
223
                                                                    <1>
224
                                                                        <_if name="if has infraspecificEpithet">
225
                                                                            <cond>$infraspecificEpithet</cond>
226
                                                                            <then>$taxonRank</then>
227
                                                                        </_if>
228
                                                                    </1>
229
                                                                    <2>$infraspecificEpithet</2>
230
                                                                </_join_words>
231
                                                            </5>
232
                                                        </_join_words>
233
                                                    </2>
234
                                                </_alt>
235
                                            </1>
236
                                            <2>$scientificNameAuthorship</2>
237
                                        </_join_words>
238
                                    </taxonomicname>
239 239
                                    <taxonverbatim>
240 240
                                        <author>$scientificNameAuthorship</author>
241 241
                                        <binomial>$scientificName</binomial>

Also available in: Unified diff