Project

General

Profile

« Previous | Next » 

Revision 10260

inputs/*/ which do not contain any explicit collisions (wiki.vegpath.org/2013-06-27_conference_call#To-do-for-Aaron > #3.2 > the following datasources ...): switched to new-style import, which adds the staging table column renaming

View differences:

test.xml.ref
7 7
                <next>parent_id</next>
8 8
                <path>
9 9
                    <location>
10
                        <authorlocationcode>$&#65279;specimenid</authorlocationcode>
10
                        <authorlocationcode>$dataProviderRecordID</authorlocationcode>
11 11
                        <elevation_m>
12 12
                            <_avg>
13
                                <1>$minimumelevation</1>
14
                                <2>$maximumelevation</2>
13
                                <1>$minimumElevationInMeters</1>
14
                                <2>$maximumElevationInMeters</2>
15 15
                            </_avg>
16 16
                        </elevation_m>
17 17
                        <iscultivated><_locationnarrative_is_cultivated><locationnarrative>$locality</locationnarrative></_locationnarrative_is_cultivated></iscultivated>
......
19 19
                            <taxonoccurrence>
20 20
                                <aggregateoccurrence>
21 21
                                    <plantobservation>
22
                                        <authorplantcode>$collectionnumber</authorplantcode>
23
                                        <reproductivecondition>$ecologicalcondition</reproductivecondition>
22
                                        <authorplantcode>$collectorNumber</authorplantcode>
23
                                        <reproductivecondition>$reproductiveCondition</reproductivecondition>
24 24
                                        <specimenreplicate>
25
                                            <collectionnumber>$collectionnumber</collectionnumber>
25
                                            <collectionnumber>$collectorNumber</collectionnumber>
26 26
                                            <institution_id>
27 27
                                                <sourcelist>
28
                                                    <name>$acronyms</name>
28
                                                    <name>$specimenHolderInstitutions</name>
29 29
                                                    <sourcename>
30 30
                                                        <name>
31 31
                                                            <_split>
32 32
                                                                <separator>[,;] *</separator>
33
                                                                <value>$acronyms</value>
33
                                                                <value>$specimenHolderInstitutions</value>
34 34
                                                            </_split>
35 35
                                                        </name>
36 36
                                                    </sourcename>
37 37
                                                </sourcelist>
38 38
                                            </institution_id>
39
                                            <sourceaccessioncode>$&#65279;specimenid</sourceaccessioncode>
39
                                            <sourceaccessioncode>$dataProviderRecordID</sourceaccessioncode>
40 40
                                        </specimenreplicate>
41 41
                                    </plantobservation>
42 42
                                </aggregateoccurrence>
43
                                <collector_id><party><fullname>$collectorstring</fullname></party></collector_id>
44
                                <iscultivated>$iscultivated</iscultivated>
45
                                <sourceaccessioncode>$&#65279;specimenid</sourceaccessioncode>
43
                                <collector_id><party><fullname>$recordedBy</fullname></party></collector_id>
44
                                <iscultivated>$cultivated</iscultivated>
45
                                <sourceaccessioncode>$dataProviderRecordID</sourceaccessioncode>
46 46
                                <taxondetermination>
47
                                    <party_id><party><fullname>$determinedby</fullname></party></party_id>
47
                                    <party_id><party><fullname>$identifiedBy</fullname></party></party_id>
48 48
                                    <taxonverbatim_id>
49 49
                                        <taxonverbatim>
50 50
                                            <taxonlabel_id>
51 51
                                                <taxonlabel>
52 52
                                                    <parent_id>
53 53
                                                        <taxonlabel>
54
                                                            <rank>$rankabbreviation</rank>
54
                                                            <rank>$taxonRank</rank>
55 55
                                                            <parent_id>
56 56
                                                                <taxonlabel>
57 57
                                                                    <rank>cultivar</rank>
......
67 67
                                                                                            <parent_id>
68 68
                                                                                                <taxonlabel>
69 69
                                                                                                    <rank>species</rank>
70
                                                                                                    <taxonepithet>$speciesnamepart</taxonepithet>
70
                                                                                                    <taxonepithet>$specificEpithet</taxonepithet>
71 71
                                                                                                    <parent_id>
72 72
                                                                                                        <taxonlabel>
73 73
                                                                                                            <rank>genus</rank>
74
                                                                                                            <taxonepithet>$genusnamepart</taxonepithet>
74
                                                                                                            <taxonepithet>$genus</taxonepithet>
75 75
                                                                                                            <parent_id>
76 76
                                                                                                                <taxonlabel>
77 77
                                                                                                                    <rank>family</rank>
......
90 90
                                                                    </parent_id>
91 91
                                                                </taxonlabel>
92 92
                                                            </parent_id>
93
                                                            <taxonepithet>$epithet</taxonepithet>
93
                                                            <taxonepithet>$infraspecificEpithet</taxonepithet>
94 94
                                                        </taxonlabel>
95 95
                                                    </parent_id>
96
                                                    <rank>$rankabbreviation</rank>
97
                                                    <sourceaccessioncode>$determinationnameid</sourceaccessioncode>
96
                                                    <rank>$taxonRank</rank>
97
                                                    <sourceaccessioncode>$scientificNameID</sourceaccessioncode>
98 98
                                                    <taxonomicname>
99 99
                                                        <_merge_prefix>
100 100
                                                            <prefix><_taxon_family_require_std><family>$family</family></_taxon_family_require_std></prefix>
101 101
                                                            <value>
102 102
                                                                <_alt>
103
                                                                    <1>$fullname</1>
103
                                                                    <1>$scientificName</1>
104 104
                                                                    <2>
105 105
                                                                        <_alt>
106
                                                                            <1>$name</1>
106
                                                                            <1>$taxonName</1>
107 107
                                                                            <2>
108 108
                                                                                <_join_words>
109
                                                                                    <2><_filter_genus><value>$genusnamepart</value></_filter_genus></2>
110
                                                                                    <3>$speciesnamepart</3>
109
                                                                                    <2><_filter_genus><value>$genus</value></_filter_genus></2>
110
                                                                                    <3>$specificEpithet</3>
111 111
                                                                                    <5>
112 112
                                                                                        <_join_words>
113 113
                                                                                            <1>
114 114
                                                                                                <_if name="if has infraspecificEpithet">
115
                                                                                                    <cond>$epithet</cond>
116
                                                                                                    <then>$rankabbreviation</then>
115
                                                                                                    <cond>$infraspecificEpithet</cond>
116
                                                                                                    <then>$taxonRank</then>
117 117
                                                                                                </_if>
118 118
                                                                                            </1>
119
                                                                                            <2>$epithet</2>
119
                                                                                            <2>$infraspecificEpithet</2>
120 120
                                                                                        </_join_words>
121 121
                                                                                    </5>
122 122
                                                                                </_join_words>
......
130 130
                                                </taxonlabel>
131 131
                                            </taxonlabel_id>
132 132
                                            <family>$family</family>
133
                                            <genus>$genusnamepart</genus>
134
                                            <specific_epithet>$speciesnamepart</specific_epithet>
135
                                            <taxonname>$name</taxonname>
136
                                            <taxonomicname>$fullname</taxonomicname>
137
                                            <verbatimrank>$rankabbreviation</verbatimrank>
133
                                            <genus>$genus</genus>
134
                                            <specific_epithet>$specificEpithet</specific_epithet>
135
                                            <taxonname>$taxonName</taxonname>
136
                                            <taxonomicname>$scientificName</taxonomicname>
137
                                            <verbatimrank>$taxonRank</verbatimrank>
138 138
                                        </taxonverbatim>
139 139
                                    </taxonverbatim_id>
140 140
                                    <determinationdate>
......
143 143
                                                <_nullIf>
144 144
                                                    <null>0</null>
145 145
                                                    <type>float</type>
146
                                                    <value>$determinationyear</value>
146
                                                    <value>$yearIdentified</value>
147 147
                                                </_nullIf>
148 148
                                            </year>
149 149
                                        </_date>
150 150
                                    </determinationdate>
151
                                    <taxonfit>$qualifier</taxonfit>
151
                                    <taxonfit>$identificationQualifier</taxonfit>
152 152
                                </taxondetermination>
153 153
                            </taxonoccurrence>
154 154
                        </locationevent>
155 155
                        <locationnarrative>
156 156
                            <_merge>
157 157
                                <1>$locality</1>
158
                                <4>$notes</4>
158
                                <4>$locationRemarks</4>
159 159
                            </_merge>
160 160
                        </locationnarrative>
161 161
                        <locationplace>
......
167 167
                                                <_nullIf>
168 168
                                                    <null>0</null>
169 169
                                                    <type>float</type>
170
                                                    <value>$minlatdecdeg</value>
170
                                                    <value>$decimalLatitude</value>
171 171
                                                </_nullIf>
172 172
                                            </latitude_deg>
173 173
                                            <longitude_deg>
174 174
                                                <_nullIf>
175 175
                                                    <null>0</null>
176 176
                                                    <type>float</type>
177
                                                    <value>$minlongdecdeg</value>
177
                                                    <value>$decimalLongitude</value>
178 178
                                                </_nullIf>
179 179
                                            </longitude_deg>
180 180
                                        </coordinates>
181 181
                                    </coordinates_id>
182 182
                                    <continent>$continent</continent>
183 183
                                    <country>$country</country>
184
                                    <county>$lower</county>
184
                                    <county>$county</county>
185 185
                                    <matched_place_id>
186 186
                                        <place>
187 187
                                            <source_id><source><shortname>geoscrub</shortname></source></source_id>
......
192 192
                                                        <_nullIf>
193 193
                                                            <null>0</null>
194 194
                                                            <type>float</type>
195
                                                            <value>$minlatdecdeg</value>
195
                                                            <value>$decimalLatitude</value>
196 196
                                                        </_nullIf>
197 197
                                                    </latitude_deg>
198 198
                                                    <longitude_deg>
199 199
                                                        <_nullIf>
200 200
                                                            <null>0</null>
201 201
                                                            <type>float</type>
202
                                                            <value>$minlongdecdeg</value>
202
                                                            <value>$decimalLongitude</value>
203 203
                                                        </_nullIf>
204 204
                                                    </longitude_deg>
205 205
                                                </coordinates>
206 206
                                            </coordinates_id>
207 207
                                            <country>$country</country>
208
                                            <county>$lower</county>
209
                                            <stateprovince>$upper</stateprovince>
208
                                            <county>$county</county>
209
                                            <stateprovince>$stateProvince</stateprovince>
210 210
                                        </place>
211 211
                                    </matched_place_id>
212
                                    <stateprovince>$upper</stateprovince>
212
                                    <stateprovince>$stateProvince</stateprovince>
213 213
                                </place>
214 214
                            </place_id>
215 215
                        </locationplace>

Also available in: Unified diff