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
77 77
                                                    <organizationname>TNRS</organizationname>
78 78
                                                </party>
79 79
                                            </creator_id>
80
                                            <identifyingtaxonomicname>
80
                                            <taxonomicname>
81 81
                                                <_alt>
82 82
                                                    <1>$scientificName</1>
83 83
                                                    <2>
......
104 104
                                                        </_join_words>
105 105
                                                    </2>
106 106
                                                </_alt>
107
                                            </identifyingtaxonomicname>
107
                                            </taxonomicname>
108 108
                                        </taxonlabel>
109 109
                                    </matched_label_id>
110 110
                                    <creationdate><_date><date><_dateRangeStart><value>$dateIdentified</value></_dateRangeStart></date></_date></creationdate>
......
114 114
                                            <path><party><fullname>$identifiedBy</fullname></party></path>
115 115
                                        </_simplifyPath>
116 116
                                    </creator_id>
117
                                    <identifyingtaxonomicname>
118
                                        <_alt>
119
                                            <1>$scientificName</1>
120
                                            <2>
121
                                                <_join_words>
122
                                                    <1>
123
                                                        <_join_words>
124
                                                            <1>$family</1>
125
                                                            <2>$genus</2>
126
                                                            <3>$specificEpithet</3>
127
                                                            <5>
128
                                                                <_join_words>
129
                                                                    <1>
130
                                                                        <_if name="if has infraspecificEpithet">
131
                                                                            <cond>$infraspecificEpithet</cond>
132
                                                                            <then>$taxonRank</then>
133
                                                                        </_if>
134
                                                                    </1>
135
                                                                    <2>$infraspecificEpithet</2>
136
                                                                </_join_words>
137
                                                            </5>
138
                                                        </_join_words>
139
                                                    </1>
140
                                                    <2>$scientificNameAuthorship</2>
141
                                                </_join_words>
142
                                            </2>
143
                                        </_alt>
144
                                    </identifyingtaxonomicname>
145 117
                                    <parent_id>
146 118
                                        <taxonlabel>
147 119
                                            <rank>$taxonRank</rank>
......
212 184
                                        </taxonlabel>
213 185
                                    </parent_id>
214 186
                                    <rank>$taxonRank</rank>
187
                                    <taxonomicname>
188
                                        <_alt>
189
                                            <1>$scientificName</1>
190
                                            <2>
191
                                                <_join_words>
192
                                                    <1>
193
                                                        <_join_words>
194
                                                            <1>$family</1>
195
                                                            <2>$genus</2>
196
                                                            <3>$specificEpithet</3>
197
                                                            <5>
198
                                                                <_join_words>
199
                                                                    <1>
200
                                                                        <_if name="if has infraspecificEpithet">
201
                                                                            <cond>$infraspecificEpithet</cond>
202
                                                                            <then>$taxonRank</then>
203
                                                                        </_if>
204
                                                                    </1>
205
                                                                    <2>$infraspecificEpithet</2>
206
                                                                </_join_words>
207
                                                            </5>
208
                                                        </_join_words>
209
                                                    </1>
210
                                                    <2>$scientificNameAuthorship</2>
211
                                                </_join_words>
212
                                            </2>
213
                                        </_alt>
214
                                    </taxonomicname>
215 215
                                    <taxonverbatim>
216 216
                                        <author>$scientificNameAuthorship</author>
217 217
                                        <family>$family</family>

Also available in: Unified diff