Project

General

Profile

« Previous | Next » 

Revision 1842

Added by Aaron Marcuse-Kubitza about 12 years ago

bin/map: When determining if outer elements are types, look for /*s/ anywhere in the string instead of just at the beginning, because there might be root attrs (namespaces), etc. before it

View differences:

inputs/SALVIAS-CSV/test/VegX.organisms.xml.ref
1 1 
<?xml version="1.0" ?>
2 2 
<VegX xmlns:tcs="http://www.tdwg.org/schemas/tcs/1.01">
3 
    <individualOrganismObservations id="0">
4 
        <individualOrganismObservation>
3 
    <individualOrganismObservations>
4 
        <individualOrganismObservation id="0">
5 5 
            <individualOrganismID>0</individualOrganismID>
6 6 
            <plotObservationID>0</plotObservationID>
7 7 
            <diameterBaseDistance>
......
25 25 
                <value>607771</value>
26 26 
            </simpleUserdefined>
27 27 
        </individualOrganismObservation>
28 
        <individualOrganismObservation id="1">
29 
            <individualOrganismID>1</individualOrganismID>
30 
            <plotObservationID>2</plotObservationID>
31 
            <diameterBaseDistance>
32 
                <baseDistance><value>1.37</value></baseDistance>
33 
                <diameter>215</diameter>
34 
            </diameterBaseDistance>
35 
            <simpleUserdefined>
36 
                <name>authorPlantCode</name>
37 
                <value>100</value>
38 
            </simpleUserdefined>
39 
            <simpleUserdefined>
40 
                <name>censusNo</name>
41 
                <value>1</value>
42 
            </simpleUserdefined>
43 
            <simpleUserdefined>
44 
                <name>growthForm</name>
45 
                <value>tree</value>
46 
            </simpleUserdefined>
47 
            <simpleUserdefined>
48 
                <name>sourceAccessionCode</name>
49 
                <value>607722</value>
50 
            </simpleUserdefined>
51 
        </individualOrganismObservation>
28 52 
    </individualOrganismObservations>
29 53 
    <individualOrganisms>
30 54 
        <individualOrganism id="0">
......
198 222 
        </plot>
199 223 
        <plot id="3"><plotName>4</plotName></plot>
200 224 
    </plots>
201 
    <individualOrganismObservations id="1">
202 
        <individualOrganismObservation>
203 
            <individualOrganismID>1</individualOrganismID>
204 
            <plotObservationID>2</plotObservationID>
205 
            <diameterBaseDistance>
206 
                <baseDistance><value>1.37</value></baseDistance>
207 
                <diameter>215</diameter>
208 
            </diameterBaseDistance>
209 
            <simpleUserdefined>
210 
                <name>authorPlantCode</name>
211 
                <value>100</value>
212 
            </simpleUserdefined>
213 
            <simpleUserdefined>
214 
                <name>censusNo</name>
215 
                <value>1</value>
216 
            </simpleUserdefined>
217 
            <simpleUserdefined>
218 
                <name>growthForm</name>
219 
                <value>tree</value>
220 
            </simpleUserdefined>
221 
            <simpleUserdefined>
222 
                <name>sourceAccessionCode</name>
223 
                <value>607722</value>
224 
            </simpleUserdefined>
225 
        </individualOrganismObservation>
226 
    </individualOrganismObservations>
227 225 
</VegX>
inputs/CTFS/test/VegX.organisms.xml.ref
1 1 
<?xml version="1.0" ?>
2 2 
<VegX xmlns:tcs="http://www.tdwg.org/schemas/tcs/1.01">
3 
    <individualOrganismObservations id="0">
4 
        <individualOrganismObservation>
3 
    <individualOrganismObservations>
4 
        <individualOrganismObservation id="0">
5 5 
            <individualOrganismID>0</individualOrganismID>
6 6 
            <plotObservationID>0</plotObservationID>
7 7 
            <relativePlotPosition>
......
13 13 
                <value>1</value>
14 14 
            </simpleUserdefined>
15 15 
        </individualOrganismObservation>
16 
        <individualOrganismObservation id="1">
17 
            <individualOrganismID>1</individualOrganismID>
18 
            <plotObservationID>1</plotObservationID>
19 
            <relativePlotPosition>
20 
                <relativeX>-79.84848</relativeX>
21 
                <relativeY>9.151523</relativeY>
22 
            </relativePlotPosition>
23 
            <simpleUserdefined>
24 
                <name>censusNo</name>
25 
                <value>1</value>
26 
            </simpleUserdefined>
27 
        </individualOrganismObservation>
16 28 
    </individualOrganismObservations>
17 29 
    <individualOrganisms>
18 30 
        <individualOrganism id="0"><taxonNameUsageConceptID>0</taxonNameUsageConceptID></individualOrganism>
......
92 104 
            <plotUniqueIdentifier>2733</plotUniqueIdentifier>
93 105 
        </plot>
94 106 
    </plots>
95 
    <individualOrganismObservations id="1">
96 
        <individualOrganismObservation>
97 
            <individualOrganismID>1</individualOrganismID>
98 
            <plotObservationID>1</plotObservationID>
99 
            <relativePlotPosition>
100 
                <relativeX>-79.84848</relativeX>
101 
                <relativeY>9.151523</relativeY>
102 
            </relativePlotPosition>
103 
            <simpleUserdefined>
104 
                <name>censusNo</name>
105 
                <value>1</value>
106 
            </simpleUserdefined>
107 
        </individualOrganismObservation>
108 
    </individualOrganismObservations>
109 107 
</VegX>
inputs/SALVIAS/test/VegX.organisms.xml.ref
1 1 
<?xml version="1.0" ?>
2 2 
<VegX xmlns:tcs="http://www.tdwg.org/schemas/tcs/1.01">
3 
    <individualOrganismObservations id="0">
4 
        <individualOrganismObservation>
3 
    <individualOrganismObservations>
4 
        <individualOrganismObservation id="0">
5 5 
            <individualOrganismID>0</individualOrganismID>
6 6 
            <plotObservationID>0</plotObservationID>
7 7 
            <simpleUserdefined>
......
21 21 
                <value>1</value>
22 22 
            </simpleUserdefined>
23 23 
        </individualOrganismObservation>
24 
        <individualOrganismObservation id="1">
25 
            <individualOrganismID>1</individualOrganismID>
26 
            <plotObservationID>2</plotObservationID>
27 
            <simpleUserdefined>
28 
                <name>authorPlantCode</name>
29 
                <value>2</value>
30 
            </simpleUserdefined>
31 
            <simpleUserdefined>
32 
                <name>censusNo</name>
33 
                <value>1</value>
34 
            </simpleUserdefined>
35 
            <simpleUserdefined>
36 
                <name>growthForm</name>
37 
                <value>tree</value>
38 
            </simpleUserdefined>
39 
            <simpleUserdefined>
40 
                <name>sourceAccessionCode</name>
41 
                <value>2</value>
42 
            </simpleUserdefined>
43 
        </individualOrganismObservation>
24 44 
    </individualOrganismObservations>
25 45 
    <individualOrganisms>
26 46 
        <individualOrganism id="0"><taxonNameUsageConceptID>0</taxonNameUsageConceptID></individualOrganism>
......
188 208 
        </plot>
189 209 
        <plot id="3"><plotName>1</plotName></plot>
190 210 
    </plots>
191 
    <individualOrganismObservations id="1">
192 
        <individualOrganismObservation>
193 
            <individualOrganismID>1</individualOrganismID>
194 
            <plotObservationID>2</plotObservationID>
195 
            <simpleUserdefined>
196 
                <name>authorPlantCode</name>
197 
                <value>2</value>
198 
            </simpleUserdefined>
199 
            <simpleUserdefined>
200 
                <name>censusNo</name>
201 
                <value>1</value>
202 
            </simpleUserdefined>
203 
            <simpleUserdefined>
204 
                <name>growthForm</name>
205 
                <value>tree</value>
206 
            </simpleUserdefined>
207 
            <simpleUserdefined>
208 
                <name>sourceAccessionCode</name>
209 
                <value>2</value>
210 
            </simpleUserdefined>
211 
        </individualOrganismObservation>
212 
    </individualOrganismObservations>
213 211 
</VegX>

Also available in: Unified diff