Skip to content

Commit 16b6794

Browse files
Removed commented old code.
1 parent 8a0deb4 commit 16b6794

File tree

1 file changed

+2
-13
lines changed

1 file changed

+2
-13
lines changed

odm2api/ODM2/services/readService.py

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -946,7 +946,7 @@ def getSamplingFeatureDatasets(self, ids=None, codes=None, uuids=None, dstype=No
946946
sf_query = sf_query.filter(SamplingFeatures.SamplingFeatureCode.in_(codes))
947947
if uuids:
948948
sf_query = sf_query.filter(SamplingFeatures.SamplingFeatureUUID.in_(uuids))
949-
949+
w
950950
sf_list = []
951951
for sf in sf_query.all():
952952
sf_list.append(sf)
@@ -955,25 +955,14 @@ def getSamplingFeatureDatasets(self, ids=None, codes=None, uuids=None, dstype=No
955955
sfds=[]
956956
for sf in sf_list:
957957

958-
# q = self._session.query(DataSetsResults)\
959-
# .options(subqueryload(DataSetsResults.ResultObj)\
960-
# .subqueryload(Results.FeatureActionObj)\
961-
# .load_only(FeatureActions.SamplingFeatureID))\
962-
# .filter(FeatureActions.SamplingFeatureID == sf.SamplingFeatureID)
963-
958+
#Eager loading the data.
964959
q = self._session.query(DataSetsResults) \
965960
.join(DataSetsResults.ResultObj)\
966961
.join(Results.FeatureActionObj)\
967962
.filter(FeatureActions.SamplingFeatureID == sf.SamplingFeatureID)\
968963
.options(contains_eager(DataSetsResults.ResultObj).contains_eager(Results.FeatureActionObj)\
969964
.load_only(FeatureActions.SamplingFeatureID))
970965

971-
# q = self._session.query(DataSetsResults)\
972-
# .join(Results)\
973-
# .join(FeatureActions)\
974-
# .filter(FeatureActions.SamplingFeatureID == sf.SamplingFeatureID)
975-
976-
977966
if dstype:
978967
q = q.filter_by(DatasetTypeCV=dstype)
979968

0 commit comments

Comments
 (0)