Project

General

Profile

« Previous | Next » 

Revision 5465

Added by Aaron Marcuse-Kubitza over 11 years ago

schemas/vegbien.sql: taxonconcept: Renamed canon_concept_id to matched_concept_id, because this is actually the closest-match taxonconcept in the match hierarchy (datasource concept -> parsed concept -> matched concept -> accepted concept) rather than the accepted synonym, which goes in accepted_concept_id

View differences:

test.xml.ref
37 37 
                                            <2>$Name_matched_author</2>
38 38 
                                        </_join_words>
39 39 
                                    </identifyingtaxonomicname>
40 
                                    <_set_canon_taxonconcept>
41 
                                        <canon_concept_id>
40 
                                    <_set_matched_taxonconcept>
41 
                                        <matched_concept_id>
42 42 
                                            <taxonconcept>
43 43 
                                                <author>$Accepted_name_author</author>
44 44 
                                                <family>$Accepted_name_family</family>
......
99 99 
                                                <taxonomicname>$Accepted_name</taxonomicname>
100 100 
                                                <verbatimrank>$Accepted_name_rank</verbatimrank>
101 101 
                                            </taxonconcept>
102 
                                        </canon_concept_id>
103 
                                    </_set_canon_taxonconcept>
102 
                                        </matched_concept_id>
103 
                                    </_set_matched_taxonconcept>
104 104 
                                    <author>$Name_matched_author</author>
105 105 
                                    <family>$Name_matched_accepted_family</family>
106 106 
                                    <genus>$Genus_matched</genus>
......
151 151 
                                    </parent_id>
152 152 
                                    <rank>$Name_matched_rank</rank>
153 153 
                                    <species>$Specific_epithet_matched</species>
154 
                                    <taxonconcept fkey="canon_concept_id">
154 
                                    <taxonconcept fkey="matched_concept_id">
155 155 
                                        <author>$Author_matched</author>
156 
                                        <canon_concept_fit_fraction>
156 
                                        <family>$Family_matched</family>
157 
                                        <genus>$Genus_matched</genus>
158 
                                        <identifyingtaxonomicname>$Name_submitted</identifyingtaxonomicname>
159 
                                        <matched_concept_fit_fraction>
157 160 
                                            <_max>
158 161 
                                                <1>$Family_score</1>
159 162 
                                                <2>$Genus_score</2>
160 163 
                                                <3>$Specific_epithet_score</3>
161 164 
                                                <4>$Overall_score</4>
162 165 
                                            </_max>
163 
                                        </canon_concept_fit_fraction>
164 
                                        <family>$Family_matched</family>
165 
                                        <genus>$Genus_matched</genus>
166 
                                        <identifyingtaxonomicname>$Name_submitted</identifyingtaxonomicname>
166 
                                        </matched_concept_fit_fraction>
167 167 
                                        <species>$Specific_epithet_matched</species>
168 168 
                                        <taxonname>$Unmatched_terms</taxonname>
169 169 
                                        <taxonomicname>$Name_matched</taxonomicname>

Also available in: Unified diff