Project

General

Profile

« Previous | Next » 

Revision 5656

Added by Aaron Marcuse-Kubitza about 12 years ago

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
20 20 
                                                    <organizationname>TNRS</organizationname>
21 21 
                                                </party>
22 22 
                                            </creator_id>
23 
                                            <identifyingtaxonomicname>
23 
                                            <taxonomicname>
24 24 
                                                <_join_words>
25 25 
                                                    <1>$Family</1>
26 26 
                                                    <2>$Genus</2>
27 27 
                                                    <3>$SpeciesName</3>
28 28 
                                                    <4>$SubSpeciesName</4>
29 29 
                                                </_join_words>
30 
                                            </identifyingtaxonomicname>
30 
                                            </taxonomicname>
31 31 
                                        </taxonlabel>
32 32 
                                    </matched_label_id>
33 
                                    <identifyingtaxonomicname>
34 
                                        <_join_words>
35 
                                            <1>$Family</1>
36 
                                            <2>$Genus</2>
37 
                                            <3>$SpeciesName</3>
38 
                                            <4>$SubSpeciesName</4>
39 
                                        </_join_words>
40 
                                    </identifyingtaxonomicname>
41 33 
                                    <parent_id>
42 34 
                                        <taxonlabel>
43 35 
                                            <parent_id>
......
81 73 
                                            </parent_id>
82 74 
                                        </taxonlabel>
83 75 
                                    </parent_id>
76 
                                    <taxonomicname>
77 
                                        <_join_words>
78 
                                            <1>$Family</1>
79 
                                            <2>$Genus</2>
80 
                                            <3>$SpeciesName</3>
81 
                                            <4>$SubSpeciesName</4>
82 
                                        </_join_words>
83 
                                    </taxonomicname>
84 84 
                                    <taxonverbatim>
85 85 
                                        <family>$Family</family>
86 86 
                                        <genus>$Genus</genus>

Also available in: Unified diff