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
57 57
                                                    <organizationname>TNRS</organizationname>
58 58
                                                </party>
59 59
                                            </creator_id>
60
                                            <identifyingtaxonomicname>
60
                                            <taxonomicname>
61 61
                                                <_join_words>
62 62
                                                    <1>
63 63
                                                        <_alt>
......
74 74
                                                    </1>
75 75
                                                    <2>$AuthorOfScientificName</2>
76 76
                                                </_join_words>
77
                                            </identifyingtaxonomicname>
77
                                            </taxonomicname>
78 78
                                        </taxonlabel>
79 79
                                    </matched_label_id>
80 80
                                    <creator_id>
......
83 83
                                            <path><party><fullname>$IdentifiedBy</fullname></party></path>
84 84
                                        </_simplifyPath>
85 85
                                    </creator_id>
86
                                    <identifyingtaxonomicname>
87
                                        <_join_words>
88
                                            <1>
89
                                                <_alt>
90
                                                    <1>$ScientificName</1>
91
                                                    <2>
92
                                                        <_join_words>
93
                                                            <1>$Family</1>
94
                                                            <2>$Genus</2>
95
                                                            <3>$SpecificEpithet</3>
96
                                                            <5>$InfraspecificEpithet</5>
97
                                                        </_join_words>
98
                                                    </2>
99
                                                </_alt>
100
                                            </1>
101
                                            <2>$AuthorOfScientificName</2>
102
                                        </_join_words>
103
                                    </identifyingtaxonomicname>
104 86
                                    <parent_id>
105 87
                                        <taxonlabel>
106 88
                                            <parent_id>
......
144 126
                                            <taxonepithet>$InfraspecificEpithet</taxonepithet>
145 127
                                        </taxonlabel>
146 128
                                    </parent_id>
129
                                    <taxonomicname>
130
                                        <_join_words>
131
                                            <1>
132
                                                <_alt>
133
                                                    <1>$ScientificName</1>
134
                                                    <2>
135
                                                        <_join_words>
136
                                                            <1>$Family</1>
137
                                                            <2>$Genus</2>
138
                                                            <3>$SpecificEpithet</3>
139
                                                            <5>$InfraspecificEpithet</5>
140
                                                        </_join_words>
141
                                                    </2>
142
                                                </_alt>
143
                                            </1>
144
                                            <2>$AuthorOfScientificName</2>
145
                                        </_join_words>
146
                                    </taxonomicname>
147 147
                                    <taxonverbatim>
148 148
                                        <author>$AuthorOfScientificName</author>
149 149
                                        <binomial>$ScientificName</binomial>
......
158 158
                            <isoriginal>true</isoriginal>
159 159
                            <taxonlabel_id>
160 160
                                <taxonlabel>
161
                                    <identifyingtaxonomicname>
162
                                        <_alt>
163
                                            <1>$ScientificNameOriginal</1>
164
                                            <2>
165
                                                <_join_words>
166
                                                    <1>$GBIFFamilyOriginal</1>
167
                                                    <2>$GBIFGenusOriginal</2>
168
                                                </_join_words>
169
                                            </2>
170
                                        </_alt>
171
                                    </identifyingtaxonomicname>
172 161
                                    <matched_label_id>
173 162
                                        <taxonlabel>
174 163
                                            <creator_id>
......
177 166
                                                    <organizationname>TNRS</organizationname>
178 167
                                                </party>
179 168
                                            </creator_id>
180
                                            <identifyingtaxonomicname>
169
                                            <taxonomicname>
181 170
                                                <_alt>
182 171
                                                    <1>$ScientificNameOriginal</1>
183 172
                                                    <2>
......
187 176
                                                        </_join_words>
188 177
                                                    </2>
189 178
                                                </_alt>
190
                                            </identifyingtaxonomicname>
179
                                            </taxonomicname>
191 180
                                        </taxonlabel>
192 181
                                    </matched_label_id>
193 182
                                    <parent_id>
......
231 220
                                            </parent_id>
232 221
                                        </taxonlabel>
233 222
                                    </parent_id>
223
                                    <taxonomicname>
224
                                        <_alt>
225
                                            <1>$ScientificNameOriginal</1>
226
                                            <2>
227
                                                <_join_words>
228
                                                    <1>$GBIFFamilyOriginal</1>
229
                                                    <2>$GBIFGenusOriginal</2>
230
                                                </_join_words>
231
                                            </2>
232
                                        </_alt>
233
                                    </taxonomicname>
234 234
                                    <taxonverbatim>
235 235
                                        <binomial>$ScientificNameOriginal</binomial>
236 236
                                        <family>$GBIFFamilyOriginal</family>

Also available in: Unified diff