Project

General

Profile

« Previous | Next » 

Revision 14454

Added by Aaron Marcuse-Kubitza over 10 years ago

bugfix: mappings/VegCore-VegBIEN.csv: prefixed taxonomic ranks: use _concat_nullify() so that the prefix is only added if the epithet is non-NULL

View differences:

trunk/inputs/TEX/Specimen2/test.xml.ref
138 138 
                                                                                <3>$specificEpithet</3>
139 139 
                                                                                <4>$subspecies</4>
140 140 
                                                                                <6>
141 
                                                                                    <_join_words>
142 
                                                                                        <1>var. </1>
143 
                                                                                        <2>$variety</2>
144 
                                                                                    </_join_words>
141 
                                                                                    <_concat_nullify>
142 
                                                                                        <0>var. </0>
143 
                                                                                        <1>$variety</1>
144 
                                                                                    </_concat_nullify>
145 145 
                                                                                </6>
146 146 
                                                                            </_join_words>
147 147 
                                                                        </1>
trunk/inputs/FIA/REF_PLANT_DICTIONARY/test.xml.ref
75 75 
                                                                                        <3>$specificEpithet</3>
76 76 
                                                                                        <4>$subspecies</4>
77 77 
                                                                                        <6>
78 
                                                                                            <_join_words>
79 
                                                                                                <1>var. </1>
80 
                                                                                                <2>$variety</2>
81 
                                                                                            </_join_words>
78 
                                                                                            <_concat_nullify>
79 
                                                                                                <0>var. </0>
80 
                                                                                                <1>$variety</1>
81 
                                                                                            </_concat_nullify>
82 82 
                                                                                        </6>
83 83 
                                                                                        <7>
84 
                                                                                            <_join_words>
85 
                                                                                                <1>fm. </1>
86 
                                                                                                <2>$forma</2>
87 
                                                                                            </_join_words>
84 
                                                                                            <_concat_nullify>
85 
                                                                                                <0>fm. </0>
86 
                                                                                                <1>$forma</1>
87 
                                                                                            </_concat_nullify>
88 88 
                                                                                        </7>
89 89 
                                                                                    </_join_words>
90 90 
                                                                                </2>
trunk/inputs/FIA/taxon_observation.**/test.xml.ref
126 126 
                                                                                        <3>$specificEpithet</3>
127 127 
                                                                                        <4>$subspecies</4>
128 128 
                                                                                        <6>
129 
                                                                                            <_join_words>
130 
                                                                                                <1>var. </1>
131 
                                                                                                <2>$variety</2>
132 
                                                                                            </_join_words>
129 
                                                                                            <_concat_nullify>
130 
                                                                                                <0>var. </0>
131 
                                                                                                <1>$variety</1>
132 
                                                                                            </_concat_nullify>
133 133 
                                                                                        </6>
134 134 
                                                                                        <7>
135 
                                                                                            <_join_words>
136 
                                                                                                <1>fm. </1>
137 
                                                                                                <2>$forma</2>
138 
                                                                                            </_join_words>
135 
                                                                                            <_concat_nullify>
136 
                                                                                                <0>fm. </0>
137 
                                                                                                <1>$forma</1>
138 
                                                                                            </_concat_nullify>
139 139 
                                                                                        </7>
140 140 
                                                                                    </_join_words>
141 141 
                                                                                </2>
trunk/mappings/VegCore-VegBIEN.csv
116 116 
acceptedInfraspecificEpithet,"/location/locationevent/locationevent:[@fkey=parent_id]/taxonoccurrence/_if[@name=""if has accepted name""]/then/taxondetermination:[determinationtype=accepted]/*_id/taxonverbatim/*_id/taxonlabel:[taxonstatus=Accepted]/taxonomicname/_merge_prefix/value/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/cond",
117 117 
acceptedTaxonRank,"/location/locationevent/locationevent:[@fkey=parent_id]/taxonoccurrence/_if[@name=""if has accepted name""]/then/taxondetermination:[determinationtype=accepted]/*_id/taxonverbatim/*_id/taxonlabel:[taxonstatus=Accepted]/taxonomicname/_merge_prefix/value/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/then",
118 118 
acceptedInfraspecificEpithet,"/location/locationevent/locationevent:[@fkey=parent_id]/taxonoccurrence/_if[@name=""if has accepted name""]/then/taxondetermination:[determinationtype=accepted]/*_id/taxonverbatim/*_id/taxonlabel:[taxonstatus=Accepted]/taxonomicname/_merge_prefix/value/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/2",
119 
acceptedVariety,"/location/locationevent/locationevent:[@fkey=parent_id]/taxonoccurrence/_if[@name=""if has accepted name""]/then/taxondetermination:[determinationtype=accepted]/*_id/taxonverbatim/*_id/taxonlabel:[taxonstatus=Accepted]/taxonomicname/_merge_prefix/value/_alt/2/_join_words/1/_alt/2/_join_words/6/_join_words:[1=""var. ""]/2",
120 
acceptedForma,"/location/locationevent/locationevent:[@fkey=parent_id]/taxonoccurrence/_if[@name=""if has accepted name""]/then/taxondetermination:[determinationtype=accepted]/*_id/taxonverbatim/*_id/taxonlabel:[taxonstatus=Accepted]/taxonomicname/_merge_prefix/value/_alt/2/_join_words/1/_alt/2/_join_words/7/_join_words:[1=""fm. ""]/2",
121 
acceptedCultivar,"/location/locationevent/locationevent:[@fkey=parent_id]/taxonoccurrence/_if[@name=""if has accepted name""]/then/taxondetermination:[determinationtype=accepted]/*_id/taxonverbatim/*_id/taxonlabel:[taxonstatus=Accepted]/taxonomicname/_merge_prefix/value/_alt/2/_join_words/1/_alt/2/_join_words/8/_join_words:[1=""cult. ""]/2",
119 
acceptedVariety,"/location/locationevent/locationevent:[@fkey=parent_id]/taxonoccurrence/_if[@name=""if has accepted name""]/then/taxondetermination:[determinationtype=accepted]/*_id/taxonverbatim/*_id/taxonlabel:[taxonstatus=Accepted]/taxonomicname/_merge_prefix/value/_alt/2/_join_words/1/_alt/2/_join_words/6/_concat_nullify:[0=""var. ""]/1",
120 
acceptedForma,"/location/locationevent/locationevent:[@fkey=parent_id]/taxonoccurrence/_if[@name=""if has accepted name""]/then/taxondetermination:[determinationtype=accepted]/*_id/taxonverbatim/*_id/taxonlabel:[taxonstatus=Accepted]/taxonomicname/_merge_prefix/value/_alt/2/_join_words/1/_alt/2/_join_words/7/_concat_nullify:[0=""fm. ""]/1",
121 
acceptedCultivar,"/location/locationevent/locationevent:[@fkey=parent_id]/taxonoccurrence/_if[@name=""if has accepted name""]/then/taxondetermination:[determinationtype=accepted]/*_id/taxonverbatim/*_id/taxonlabel:[taxonstatus=Accepted]/taxonomicname/_merge_prefix/value/_alt/2/_join_words/1/_alt/2/_join_words/8/_concat_nullify:[0=""cult. ""]/1",
122 122 
acceptedScientificNameAuthorship,"/location/locationevent/locationevent:[@fkey=parent_id]/taxonoccurrence/_if[@name=""if has accepted name""]/then/taxondetermination:[determinationtype=accepted]/*_id/taxonverbatim/*_id/taxonlabel:[taxonstatus=Accepted]/taxonomicname/_merge_prefix/value/_alt/2/_join_words/2",
123 123 
acceptedScientificNameAuthorship,"/location/locationevent/locationevent:[@fkey=parent_id]/taxonoccurrence/_if[@name=""if has accepted name""]/then/taxondetermination:[determinationtype=accepted]/*_id/taxonverbatim/author",
124 124 
acceptedFamily,"/location/locationevent/locationevent:[@fkey=parent_id]/taxonoccurrence/_if[@name=""if has accepted name""]/then/taxondetermination:[determinationtype=accepted]/*_id/taxonverbatim/family",
......
263 263 
infraspecificEpithet,"/location/locationevent/locationevent:[@fkey=parent_id]/taxonoccurrence/taxondetermination[!isoriginal=true]/*_id/taxonverbatim/*_id/taxonlabel/taxonomicname/_merge_prefix/value/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/cond",
264 264 
taxonRank,"/location/locationevent/locationevent:[@fkey=parent_id]/taxonoccurrence/taxondetermination[!isoriginal=true]/*_id/taxonverbatim/*_id/taxonlabel/taxonomicname/_merge_prefix/value/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/then",
265 265 
infraspecificEpithet,/location/locationevent/locationevent:[@fkey=parent_id]/taxonoccurrence/taxondetermination[!isoriginal=true]/*_id/taxonverbatim/*_id/taxonlabel/taxonomicname/_merge_prefix/value/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/2,
266 
variety,"/location/locationevent/locationevent:[@fkey=parent_id]/taxonoccurrence/taxondetermination[!isoriginal=true]/*_id/taxonverbatim/*_id/taxonlabel/taxonomicname/_merge_prefix/value/_alt/2/_join_words/1/_alt/2/_join_words/6/_join_words:[1=""var. ""]/2",
267 
forma,"/location/locationevent/locationevent:[@fkey=parent_id]/taxonoccurrence/taxondetermination[!isoriginal=true]/*_id/taxonverbatim/*_id/taxonlabel/taxonomicname/_merge_prefix/value/_alt/2/_join_words/1/_alt/2/_join_words/7/_join_words:[1=""fm. ""]/2",
268 
cultivar,"/location/locationevent/locationevent:[@fkey=parent_id]/taxonoccurrence/taxondetermination[!isoriginal=true]/*_id/taxonverbatim/*_id/taxonlabel/taxonomicname/_merge_prefix/value/_alt/2/_join_words/1/_alt/2/_join_words/8/_join_words:[1=""cult. ""]/2",
266 
variety,"/location/locationevent/locationevent:[@fkey=parent_id]/taxonoccurrence/taxondetermination[!isoriginal=true]/*_id/taxonverbatim/*_id/taxonlabel/taxonomicname/_merge_prefix/value/_alt/2/_join_words/1/_alt/2/_join_words/6/_concat_nullify:[0=""var. ""]/1",
267 
forma,"/location/locationevent/locationevent:[@fkey=parent_id]/taxonoccurrence/taxondetermination[!isoriginal=true]/*_id/taxonverbatim/*_id/taxonlabel/taxonomicname/_merge_prefix/value/_alt/2/_join_words/1/_alt/2/_join_words/7/_concat_nullify:[0=""fm. ""]/1",
268 
cultivar,"/location/locationevent/locationevent:[@fkey=parent_id]/taxonoccurrence/taxondetermination[!isoriginal=true]/*_id/taxonverbatim/*_id/taxonlabel/taxonomicname/_merge_prefix/value/_alt/2/_join_words/1/_alt/2/_join_words/8/_concat_nullify:[0=""cult. ""]/1",
269 269 
scientificNameAuthorship,/location/locationevent/locationevent:[@fkey=parent_id]/taxonoccurrence/taxondetermination[!isoriginal=true]/*_id/taxonverbatim/*_id/taxonlabel/taxonomicname/_merge_prefix/value/_alt/2/_join_words/2,
270 270 
taxonNameOrEpithet,/location/locationevent/locationevent:[@fkey=parent_id]/taxonoccurrence/taxondetermination[!isoriginal=true]/*_id/taxonverbatim/*_id/taxonlabel/taxonomicname/_merge_prefix/value/_alt/3,
271 271 
taxonomicStatus,/location/locationevent/locationevent:[@fkey=parent_id]/taxonoccurrence/taxondetermination[!isoriginal=true]/*_id/taxonverbatim/*_id/taxonlabel/taxonstatus,

Also available in: Unified diff