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
12 12
                                    <_taxonlabel_set_matched_label_id>
13 13
                                        <matched_label_id>
14 14
                                            <taxonlabel>
15
                                                <identifyingtaxonomicname>
16
                                                    <_join_words>
17
                                                        <1>
18
                                                            <_alt>
19
                                                                <1>$Accepted_name</1>
20
                                                                <2>$Accepted_name_family</2>
21
                                                            </_alt>
22
                                                        </1>
23
                                                        <2>$Accepted_name_author</2>
24
                                                    </_join_words>
25
                                                </identifyingtaxonomicname>
26 15
                                                <parent_id>
27 16
                                                    <taxonlabel>
28 17
                                                        <parent_id>
......
78 67
                                                    </taxonlabel>
79 68
                                                </parent_id>
80 69
                                                <rank>$Accepted_name_rank</rank>
70
                                                <taxonomicname>
71
                                                    <_join_words>
72
                                                        <1>
73
                                                            <_alt>
74
                                                                <1>$Accepted_name</1>
75
                                                                <2>$Accepted_name_family</2>
76
                                                            </_alt>
77
                                                        </1>
78
                                                        <2>$Accepted_name_author</2>
79
                                                    </_join_words>
80
                                                </taxonomicname>
81 81
                                                <taxonverbatim>
82 82
                                                    <author>$Accepted_name_author</author>
83 83
                                                    <binomial>$Accepted_name</binomial>
......
87 87
                                            </taxonlabel>
88 88
                                        </matched_label_id>
89 89
                                    </_taxonlabel_set_matched_label_id>
90
                                    <identifyingtaxonomicname>
91
                                        <_join_words>
92
                                            <1>
93
                                                <_alt>
94
                                                    <1>$Name_matched</1>
95
                                                    <2>
96
                                                        <_join_words>
97
                                                            <1>$Name_matched_accepted_family</1>
98
                                                            <2>$Genus_matched</2>
99
                                                            <3>$Specific_epithet_matched</3>
100
                                                            <5>
101
                                                                <_join_words>
102
                                                                    <1>
103
                                                                        <_if name="if has infraspecificEpithet">
104
                                                                            <cond>$Infraspecific_epithet_matched</cond>
105
                                                                            <then>$Name_matched_rank</then>
106
                                                                        </_if>
107
                                                                    </1>
108
                                                                    <2>$Infraspecific_epithet_matched</2>
109
                                                                </_join_words>
110
                                                            </5>
111
                                                        </_join_words>
112
                                                    </2>
113
                                                </_alt>
114
                                            </1>
115
                                            <2>$Name_matched_author</2>
116
                                        </_join_words>
117
                                    </identifyingtaxonomicname>
118 90
                                    <parent_id>
119 91
                                        <taxonlabel>
120 92
                                            <rank>$Name_matched_rank</rank>
......
163 135
                                    <rank>$Name_matched_rank</rank>
164 136
                                    <sourceaccessioncode>$Name_matched_url</sourceaccessioncode>
165 137
                                    <taxonlabel fkey="matched_label_id">
166
                                        <identifyingtaxonomicname>$Name_submitted</identifyingtaxonomicname>
167 138
                                        <matched_label_fit_fraction>
168 139
                                            <_max>
169 140
                                                <1>$Family_score</1>
......
172 143
                                                <4>$Overall_score</4>
173 144
                                            </_max>
174 145
                                        </matched_label_fit_fraction>
146
                                        <taxonomicname>$Name_submitted</taxonomicname>
175 147
                                        <taxonverbatim>
176 148
                                            <author>$Author_matched</author>
177 149
                                            <binomial>$Name_matched</binomial>
......
182 154
                                            <verbatimrank>$Infraspecific_rank</verbatimrank>
183 155
                                        </taxonverbatim>
184 156
                                    </taxonlabel>
157
                                    <taxonomicname>
158
                                        <_join_words>
159
                                            <1>
160
                                                <_alt>
161
                                                    <1>$Name_matched</1>
162
                                                    <2>
163
                                                        <_join_words>
164
                                                            <1>$Name_matched_accepted_family</1>
165
                                                            <2>$Genus_matched</2>
166
                                                            <3>$Specific_epithet_matched</3>
167
                                                            <5>
168
                                                                <_join_words>
169
                                                                    <1>
170
                                                                        <_if name="if has infraspecificEpithet">
171
                                                                            <cond>$Infraspecific_epithet_matched</cond>
172
                                                                            <then>$Name_matched_rank</then>
173
                                                                        </_if>
174
                                                                    </1>
175
                                                                    <2>$Infraspecific_epithet_matched</2>
176
                                                                </_join_words>
177
                                                            </5>
178
                                                        </_join_words>
179
                                                    </2>
180
                                                </_alt>
181
                                            </1>
182
                                            <2>$Name_matched_author</2>
183
                                        </_join_words>
184
                                    </taxonomicname>
185 185
                                    <taxonstatus>$Taxonomic_status</taxonstatus>
186 186
                                    <taxonverbatim>
187 187
                                        <author>$Name_matched_author</author>

Also available in: Unified diff