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
89 89
                                                    <organizationname>TNRS</organizationname>
90 90
                                                </party>
91 91
                                            </creator_id>
92
                                            <identifyingtaxonomicname>
92
                                            <taxonomicname>
93 93
                                                <_join_words>
94 94
                                                    <1>
95 95
                                                        <_alt>
......
106 106
                                                    </1>
107 107
                                                    <2>$ScientificNameAuthor</2>
108 108
                                                </_join_words>
109
                                            </identifyingtaxonomicname>
109
                                            </taxonomicname>
110 110
                                        </taxonlabel>
111 111
                                    </matched_label_id>
112 112
                                    <creator_id>
......
115 115
                                            <path><party><fullname>$IdentifiedBy</fullname></party></path>
116 116
                                        </_simplifyPath>
117 117
                                    </creator_id>
118
                                    <identifyingtaxonomicname>
119
                                        <_join_words>
120
                                            <1>
121
                                                <_alt>
122
                                                    <1>$ScientificName</1>
123
                                                    <2>
124
                                                        <_join_words>
125
                                                            <1>$family</1>
126
                                                            <2>$genus</2>
127
                                                            <3>$species</3>
128
                                                            <4>$Subspecies</4>
129
                                                        </_join_words>
130
                                                    </2>
131
                                                </_alt>
132
                                            </1>
133
                                            <2>$ScientificNameAuthor</2>
134
                                        </_join_words>
135
                                    </identifyingtaxonomicname>
136 118
                                    <parent_id>
137 119
                                        <taxonlabel>
138 120
                                            <parent_id>
......
197 179
                                            </parent_id>
198 180
                                        </taxonlabel>
199 181
                                    </parent_id>
182
                                    <taxonomicname>
183
                                        <_join_words>
184
                                            <1>
185
                                                <_alt>
186
                                                    <1>$ScientificName</1>
187
                                                    <2>
188
                                                        <_join_words>
189
                                                            <1>$family</1>
190
                                                            <2>$genus</2>
191
                                                            <3>$species</3>
192
                                                            <4>$Subspecies</4>
193
                                                        </_join_words>
194
                                                    </2>
195
                                                </_alt>
196
                                            </1>
197
                                            <2>$ScientificNameAuthor</2>
198
                                        </_join_words>
199
                                    </taxonomicname>
200 200
                                    <taxonverbatim>
201 201
                                        <author>$ScientificNameAuthor</author>
202 202
                                        <binomial>$ScientificName</binomial>

Also available in: Unified diff