Project

General

Profile

« Previous | Next » 

Revision 4078

xml_func.py: simplify(): Apply pass-through optimizations for _if statements with no condition (which means false). This faciliates automated testing after an _if statement has been added, because the put template provided as part of the automated test will only change for those datasources that actually have a condition entry for the _if statement, which greatly reduces the number of tests that need to be accepted. (Note that the path before the _if will still be included as an empty path if there are no other mappings to that table, because the _if statement does not surround it.)

View differences:

import.specimens.xml.ref
26 26
                            </_merge>
27 27
                        </2>
28 28
                        <3>
29
                            <_if name="if indirect voucher">
30
                                <else>
31
                                    <_alt>
32
                                        <0>$dwc_dwcore_CatalogNumber</0>
33
                                        <1>$conceptual_darwin_2003_1_0_CatalogNumber</1>
34
                                        <2>$dwc_terms_catalogNumber</2>
35
                                    </_alt>
36
                                </else>
37
                            </_if>
29
                            <_alt>
30
                                <0>$dwc_dwcore_CatalogNumber</0>
31
                                <1>$conceptual_darwin_2003_1_0_CatalogNumber</1>
32
                                <2>$dwc_terms_catalogNumber</2>
33
                            </_alt>
38 34
                        </3>
39 35
                    </_merge>
40 36
                </4>
......
419 415
                        </definedvalue>
420 416
                        <specimenreplicate>
421 417
                            <catalognumber_dwc>
422
                                <_if name="if indirect voucher">
423
                                    <else>
424
                                        <_alt>
425
                                            <0>$dwc_dwcore_CatalogNumber</0>
426
                                            <1>$conceptual_darwin_2003_1_0_CatalogNumber</1>
427
                                            <2>$dwc_terms_catalogNumber</2>
428
                                        </_alt>
429
                                    </else>
430
                                </_if>
418
                                <_alt>
419
                                    <0>$dwc_dwcore_CatalogNumber</0>
420
                                    <1>$conceptual_darwin_2003_1_0_CatalogNumber</1>
421
                                    <2>$dwc_terms_catalogNumber</2>
422
                                </_alt>
431 423
                            </catalognumber_dwc>
432 424
                            <collectioncode_dwc>
433 425
                                <_merge>

Also available in: Unified diff