ODM2 / WOFpy

A server-side implementation of CUAHSI's Water One Flow service stack in Python.
http://odm2.github.io/WOFpy/
9 stars 9 forks source link

Vocabulary handling overhaul to support ODM2 DAO needs #177

Closed emiliom closed 7 years ago

emiliom commented 7 years ago

Starts addressing https://github.com/ODM2/WOFpy/issues/160; more work is needed, but @lsetiawan is working on that

lsetiawan commented 7 years ago

I have confirmed this works.

Before

<variable>
<variableCode default="true" vocabulary="postgresqlodm2timeseries" variableID="11">Decagon_CTD-10_EC</variableCode>
<variableName>Electrical conductivity</variableName>
<valueType>Unknown</valueType>
<dataType>Average</dataType>
<generalCategory>Unknown</generalCategory>
<sampleMedium>Unknown</sampleMedium>
<unit>
<unitName>Microsiemen per Centimeter</unitName>
<unitType>Dimensionless</unitType>
<unitAbbreviation>uS/cm</unitAbbreviation>
<unitCode>373</unitCode>
</unit>

After

<variable>
<variableCode default="true" vocabulary="postgresqlodm2timeseries" variableID="11">Decagon_CTD-10_EC</variableCode>
<variableName>Electrical conductivity</variableName>
<valueType>ASSIGN ME</valueType>
<dataType>Average</dataType>
<generalCategory>Water quality</generalCategory>
<sampleMedium>Unknown</sampleMedium>
<unit>
<unitName>Microsiemen per Centimeter</unitName>
<unitType>Electrical conductivity</unitType>
<unitAbbreviation>uS/cm</unitAbbreviation>
<unitCode>373</unitCode>
</unit>
lsetiawan commented 7 years ago

@ocefpaf Help! Failure is in test_cli.py https://travis-ci.org/ODM2/WOFpy/jobs/270167418#L1113

ocefpaf commented 7 years ago

It seems unrelated to your changes here. It should also be harmless, I am guessing something is different in the new Travis-CI image and/or how the UUID is reported changed.

See that 104556608 != 104556608 is not different actually :smile: it must be an int and a str or something like that (Yay for Python polymorphism!).

I'll fix it soon, feel free to merge this whenever you are ready.

lsetiawan commented 7 years ago

PER @ocefpaf Merging this PR. Thanks!