Skip to content

Missed builtin, should be last one #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 5, 2018
Merged

Missed builtin, should be last one #138

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 34 additions & 29 deletions odm2api/ODM2/services/readService.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,66 +229,71 @@ def getAnnotations(self, annottype=None, codes=None, ids=None, **kwargs):
return None

# CV
def getCVs(self, type):
def getCVs(self, cvtype, **kwargs):
"""
getCVs(self, type):
* Pass CVType - return a list of all objects of the given type

"""
CV = CVActionType
if type == 'actiontype':
self._check_kwargs(['type'], kwargs)
if 'type' in kwargs:
warnings.warn('The parameter \'type\' is deprecated. Please use the cvtype parameter instead.',
DeprecationWarning, stacklevel=2)
cvtype = kwargs['type']

if cvtype == 'actiontype':
CV = CVActionType
elif type == 'aggregationstatistic':
elif cvtype == 'aggregationstatistic':
CV = CVAggregationStatistic
elif type == 'annotationtype':
elif cvtype == 'annotationtype':
CV = CVAnnotationType
elif type == 'censorcode':
elif cvtype == 'censorcode':
CV = CVCensorCode
elif type == 'dataqualitytype':
elif cvtype == 'dataqualitytype':
CV = CVDataQualityType
elif type == 'dataset type':
elif cvtype == 'dataset type':
CV = CVDataSetType
elif type == 'Directive Type':
elif cvtype == 'Directive Type':
CV = CVDirectiveType
elif type == 'Elevation Datum':
elif cvtype == 'Elevation Datum':
CV = CVElevationDatum
elif type == 'Equipment Type':
elif cvtype == 'Equipment Type':
CV = CVEquipmentType
elif type == 'Medium':
elif cvtype == 'Medium':
CV = CVMediumType
elif type == 'Method Type':
elif cvtype == 'Method Type':
CV = CVMethodType
elif type == 'Organization Type':
elif cvtype == 'Organization Type':
CV = CVOrganizationType
elif type == 'Property Data Type':
elif cvtype == 'Property Data Type':
CV = CVPropertyDataType
elif type == 'Quality Code':
elif cvtype == 'Quality Code':
CV = CVQualityCode
elif type == 'Relationship Type':
elif cvtype == 'Relationship Type':
CV = CVRelationshipType
elif type == 'Result Type':
elif cvtype == 'Result Type':
CV = CVResultType
elif type == 'Sampling Feature Geo-type':
elif cvtype == 'Sampling Feature Geo-type':
CV = CVSamplingFeatureGeoType
elif type == 'Sampling Feature Type':
elif cvtype == 'Sampling Feature Type':
CV = CVSamplingFeatureType
elif type == 'Site Type':
elif cvtype == 'Site Type':
CV = CVSiteType
elif type == 'Spatial Offset Type':
elif cvtype == 'Spatial Offset Type':
CV = CVSpatialOffsetType
elif type == 'Speciation':
elif cvtype == 'Speciation':
CV = CVSpeciation
elif type == 'Specimen Type':
elif cvtype == 'Specimen Type':
CV = CVSpecimenType
elif type == 'Status':
elif cvtype == 'Status':
CV = CVStatus
elif type == 'Taxonomic Classifier Type':
elif cvtype == 'Taxonomic Classifier Type':
CV = CVTaxonomicClassifierType
elif type == 'Units Type':
elif cvtype == 'Units Type':
CV = CVUnitsType
elif type == 'Variable Name':
elif cvtype == 'Variable Name':
CV = CVVariableName
elif type == 'Variable Type':
elif cvtype == 'Variable Type':
CV = CVVariableType
else:
return None
Expand Down