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
72 72
                                                    <organizationname>TNRS</organizationname>
73 73
                                                </party>
74 74
                                            </creator_id>
75
                                            <identifyingtaxonomicname>
75
                                            <taxonomicname>
76 76
                                                <_alt>
77 77
                                                    <1>$Specie+autor</1>
78 78
                                                    <2>
......
93 93
                                                        </_join_words>
94 94
                                                    </2>
95 95
                                                </_alt>
96
                                            </identifyingtaxonomicname>
96
                                            </taxonomicname>
97 97
                                        </taxonlabel>
98 98
                                    </matched_label_id>
99 99
                                    <creator_id>
......
102 102
                                            <path><party><fullname>$Determined by</fullname></party></path>
103 103
                                        </_simplifyPath>
104 104
                                    </creator_id>
105
                                    <identifyingtaxonomicname>
106
                                        <_alt>
107
                                            <1>$Specie+autor</1>
108
                                            <2>
109
                                                <_join_words>
110
                                                    <1>
111
                                                        <_alt>
112
                                                            <1>$Species and morphotypes</1>
113
                                                            <2>
114
                                                                <_join_words>
115
                                                                    <1>$Family (revised)</1>
116
                                                                    <2>$Genera</2>
117
                                                                    <3>$Specific epithet</3>
118
                                                                </_join_words>
119
                                                            </2>
120
                                                        </_alt>
121
                                                    </1>
122
                                                    <2>$Autor (revised)</2>
123
                                                </_join_words>
124
                                            </2>
125
                                        </_alt>
126
                                    </identifyingtaxonomicname>
127 105
                                    <parent_id>
128 106
                                        <taxonlabel>
129 107
                                            <parent_id>
......
166 144
                                            </parent_id>
167 145
                                        </taxonlabel>
168 146
                                    </parent_id>
147
                                    <taxonomicname>
148
                                        <_alt>
149
                                            <1>$Specie+autor</1>
150
                                            <2>
151
                                                <_join_words>
152
                                                    <1>
153
                                                        <_alt>
154
                                                            <1>$Species and morphotypes</1>
155
                                                            <2>
156
                                                                <_join_words>
157
                                                                    <1>$Family (revised)</1>
158
                                                                    <2>$Genera</2>
159
                                                                    <3>$Specific epithet</3>
160
                                                                </_join_words>
161
                                                            </2>
162
                                                        </_alt>
163
                                                    </1>
164
                                                    <2>$Autor (revised)</2>
165
                                                </_join_words>
166
                                            </2>
167
                                        </_alt>
168
                                    </taxonomicname>
169 169
                                    <taxonverbatim>
170 170
                                        <author>$Autor (revised)</author>
171 171
                                        <binomial>$Species and morphotypes</binomial>
......
182 182
                            <isoriginal>true</isoriginal>
183 183
                            <taxonlabel_id>
184 184
                                <taxonlabel>
185
                                    <identifyingtaxonomicname>
186
                                        <_join_words>
187
                                            <1>$Field family</1>
188
                                            <2>$Field name</2>
189
                                        </_join_words>
190
                                    </identifyingtaxonomicname>
191 185
                                    <matched_label_id>
192 186
                                        <taxonlabel>
193 187
                                            <creator_id>
......
196 190
                                                    <organizationname>TNRS</organizationname>
197 191
                                                </party>
198 192
                                            </creator_id>
199
                                            <identifyingtaxonomicname>
193
                                            <taxonomicname>
200 194
                                                <_join_words>
201 195
                                                    <1>$Field family</1>
202 196
                                                    <2>$Field name</2>
203 197
                                                </_join_words>
204
                                            </identifyingtaxonomicname>
198
                                            </taxonomicname>
205 199
                                        </taxonlabel>
206 200
                                    </matched_label_id>
207 201
                                    <parent_id>
......
245 239
                                            </parent_id>
246 240
                                        </taxonlabel>
247 241
                                    </parent_id>
242
                                    <taxonomicname>
243
                                        <_join_words>
244
                                            <1>$Field family</1>
245
                                            <2>$Field name</2>
246
                                        </_join_words>
247
                                    </taxonomicname>
248 248
                                    <taxonverbatim>
249 249
                                        <family>$Field family</family>
250 250
                                        <genus>$Field name</genus>

Also available in: Unified diff