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
26 26
                                                    <organizationname>TNRS</organizationname>
27 27
                                                </party>
28 28
                                            </creator_id>
29
                                            <identifyingtaxonomicname>
29
                                            <taxonomicname>
30 30
                                                <_join_words>
31 31
                                                    <1>$Family</1>
32 32
                                                    <2>$Genus</2>
......
45 45
                                                        </_join_words>
46 46
                                                    </8>
47 47
                                                </_join_words>
48
                                            </identifyingtaxonomicname>
48
                                            </taxonomicname>
49 49
                                        </taxonlabel>
50 50
                                    </matched_label_id>
51 51
                                    <creationdate><_date><date><_dateRangeStart><value>$interpretationdate</value></_dateRangeStart></date></_date></creationdate>
52
                                    <identifyingtaxonomicname>
53
                                        <_join_words>
54
                                            <1>$Family</1>
55
                                            <2>$Genus</2>
56
                                            <3>$Species</3>
57
                                            <4>$Subspecies</4>
58
                                            <7>
59
                                                <_join_words>
60
                                                    <1>var. </1>
61
                                                    <2>$Variety</2>
62
                                                </_join_words>
63
                                            </7>
64
                                            <8>
65
                                                <_join_words>
66
                                                    <1>fm. </1>
67
                                                    <2>$Forma</2>
68
                                                </_join_words>
69
                                            </8>
70
                                        </_join_words>
71
                                    </identifyingtaxonomicname>
72 52
                                    <parent_id>
73 53
                                        <taxonlabel>
74 54
                                            <parent_id>
......
137 117
                                            </parent_id>
138 118
                                        </taxonlabel>
139 119
                                    </parent_id>
120
                                    <taxonomicname>
121
                                        <_join_words>
122
                                            <1>$Family</1>
123
                                            <2>$Genus</2>
124
                                            <3>$Species</3>
125
                                            <4>$Subspecies</4>
126
                                            <7>
127
                                                <_join_words>
128
                                                    <1>var. </1>
129
                                                    <2>$Variety</2>
130
                                                </_join_words>
131
                                            </7>
132
                                            <8>
133
                                                <_join_words>
134
                                                    <1>fm. </1>
135
                                                    <2>$Forma</2>
136
                                                </_join_words>
137
                                            </8>
138
                                        </_join_words>
139
                                    </taxonomicname>
140 140
                                    <taxonverbatim>
141 141
                                        <family>$Family</family>
142 142
                                        <genus>$Genus</genus>
......
151 151
                            <isoriginal>true</isoriginal>
152 152
                            <taxonlabel_id>
153 153
                                <taxonlabel>
154
                                    <identifyingtaxonomicname>$authorplantname</identifyingtaxonomicname>
155 154
                                    <matched_label_id>
156 155
                                        <taxonlabel>
157 156
                                            <creator_id>
......
160 159
                                                    <organizationname>TNRS</organizationname>
161 160
                                                </party>
162 161
                                            </creator_id>
163
                                            <identifyingtaxonomicname>$authorplantname</identifyingtaxonomicname>
162
                                            <taxonomicname>$authorplantname</taxonomicname>
164 163
                                        </taxonlabel>
165 164
                                    </matched_label_id>
165
                                    <taxonomicname>$authorplantname</taxonomicname>
166 166
                                    <taxonverbatim><binomial>$authorplantname</binomial></taxonverbatim>
167 167
                                </taxonlabel>
168 168
                            </taxonlabel_id>

Also available in: Unified diff