mappings/VegCore-VegBIEN.csv: locationID/locationName + subplot -> location.sourceaccessioncode mapping: Fixed bug where subplot was incorrectly being mapped to this field even when there was no location*. (This field can only be populated if both location* and subplot are specified.) Also only map locationID for this, to avoid inconsistencies where one table supplies locationID+subplot, while another table supplies locationName+subplot, but they both get mapped to the same field, preventing plots from being matched up with their observations when creating the analytical_stem.

xml_func.py: Simplifying functions: Logic: _and(), _or(): Evaluate an expression of only constant values

lists.py: Added and_(), or_()

xml_func.py: is_scalar(): Fixed bug where need to check if value is a string before calling is_var_name()

inputs/NVS/StemObservation/map.csv: Remapped Verbatim Code to authorTaxonCode, because as it's used this is actually an identifier for the taxon, not the stem, despite Nick Spencer's revised mapping

schemas/vegbien.ERD.mwb: Regenerated exports

README.TXT: Schema changes: Update graphical ERD exports: Added step to commit changes

inputs/NVS/*/map.csv: Remapped with Nick Spencer's suggested changes

xml_func.py: _first(): Fixed bug where need to choose the first non-empty param, by first pruning empty child nodes

mappings/VegCore-VegBIEN.csv: authortaxoncode mappings: Only using authorTaxonCode if there is no plant ID: Added individualID, stemID to the terms that cause authorTaxonCode not to be mapped to VegBIEN authortaxoncode