diff --git a/forecasts/models.py b/forecasts/models.py index 42b2a96cab7beb4e6fcfe80be392babbc3adf05b..e62bb8fd71a84c0189b18fe35dfdf795dddb561b 100755 --- a/forecasts/models.py +++ b/forecasts/models.py @@ -230,24 +230,34 @@ class ForecastConfiguration: for crop_organism_id in crop_organism_ids: crop_organism_id_paramstring += "&cropOrganismId=%s" % crop_organism_id - print "%s://%s/rest/organizationforecastconfigurations/%s?from=%s-01-01&to=%s-12-31%s" % ( - settings.VIPSLOGIC_PROTOCOL, - settings.VIPSLOGIC_SERVER_NAME, - settings.VIPS_ORGANIZATION_ID, - season, - season, - crop_organism_id_paramstring - ) - - request_result = requests.get("%s://%s/rest/organizationforecastconfigurations/%s?from=%s-01-01&to=%s-12-31%s" % ( - settings.VIPSLOGIC_PROTOCOL, - settings.VIPSLOGIC_SERVER_NAME, - settings.VIPS_ORGANIZATION_ID, - season, - season, - crop_organism_id_paramstring - ) - ) + request_result = None + if settings.INCLUDE_ORGANIZATION_IDS == None: + print "%s://%s/rest/organizationforecastconfigurations/%s?from=%s-01-01&to=%s-12-31%s" % ( + settings.VIPSLOGIC_PROTOCOL, + settings.VIPSLOGIC_SERVER_NAME, + settings.VIPS_ORGANIZATION_ID, + season, + season, + crop_organism_id_paramstring + ) + + request_result = requests.get("%s://%s/rest/organizationforecastconfigurations/%s?from=%s-01-01&to=%s-12-31%s" % ( + settings.VIPSLOGIC_PROTOCOL, + settings.VIPSLOGIC_SERVER_NAME, + settings.VIPS_ORGANIZATION_ID, + season, + season, + crop_organism_id_paramstring + ) + ) + else: + request_result = requests.get("%s://%s/rest/forecastconfigurationsincludeorgs/%s?includeOrganizationIds=%s" % ( + settings.VIPSLOGIC_PROTOCOL, + settings.VIPSLOGIC_SERVER_NAME, + settings.VIPS_ORGANIZATION_ID, + settings.INCLUDE_ORGANIZATION_IDS + ) + ) return request_result @staticmethod