Commit 59af888a authored by Irving David's avatar Irving David

Corregida llamada al proceso L2ASCL_AreaProcessing.sh. catalog/views.py

parent 628e3fbe
...@@ -495,23 +495,23 @@ def Pay(request): ...@@ -495,23 +495,23 @@ def Pay(request):
# ---------------test process---------------------- # ---------------test process----------------------
print("PAGAR!!!!") print("PAGAR!!!!")
user = User.objects.get(id=request.user.id) user = User.objects.get(id=request.user.id)
query = [] product_list = []
query = Purchase.objects.values('id', 'search__area', 'user', 'user__username', 'user__email', 'search_id', product_list = Purchase.objects.values('id', 'search__area', 'user', 'user__username', 'user__email', 'search_id',
'search__clouds', 'search__startDate', 'search__endDate').filter(user=user, 'search__clouds', 'search__startDate', 'search__endDate').filter(user=user,
purchased=0) purchased=0)
for values in query: for product in product_list:
# print(values['user__username']) # print(product['user__username'])
# print(values['user__email']) # print(product['user__email'])
# print(values['search_id']) # print(product['search_id'])
# print(str(values['search__startDate'].date()).replace("-", "")) # print(str(product['search__startDate'].date()).replace("-", ""))
# print(str(values['search__endDate'].date()).replace("-", "")) # print(str(product['search__endDate'].date()).replace("-", ""))
# print(values['search__clouds']) # print(product['search__clouds'])
# print(values['search__area']) # print(product['search__area'])
print(values['id']) print(product['id'])
username = values['user__username'] username = product['user__username']
useremail = values['user__email'] useremail = product['user__email']
# userdir = NAS_PATH + "repsat_test_dev/"+useremail ##crea el directorio del usuario # userdir = NAS_PATH + "repsat_test_dev/"+useremail ##crea el directorio del usuario
userdir = USERS_PATH + useremail userdir = USERS_PATH + useremail
...@@ -519,21 +519,21 @@ def Pay(request): ...@@ -519,21 +519,21 @@ def Pay(request):
if not os.path.exists(userdir): if not os.path.exists(userdir):
os.makedirs(userdir) os.makedirs(userdir)
search_dir = userdir + "/" + str(values['id']) purchase_dir = userdir + "/" + str(product['id'])
if not os.path.exists(search_dir): if not os.path.exists(purchase_dir):
os.makedirs(search_dir) os.makedirs(purchase_dir)
products_dir = NAS_PATH + "sentinelImages/L2A/" products_dir = NAS_PATH + "sentinelImages/L2A/"
linksDir = search_dir + "/L2A/" linksDir = purchase_dir + "/L2A/"
# obtiene los datos para el json # obtiene los datos para el json
data = {} data = {}
data['wkt'] = values['search__area'] data['wkt'] = product['search__area']
data['platform'] = 'Sentinel-2' data['platform'] = 'Sentinel-2'
data['productLevel'] = 'L2A' data['productLevel'] = 'L2A'
data['startDate'] = str(values['search__startDate'].date()).replace("-", "") # quita los guiones de la fecha data['startDate'] = str(product['search__startDate'].date()).replace("-", "") # quita los guiones de la fecha
data['endDate'] = str(values['search__endDate'].date()).replace("-", "") # quita los guiones de la fecha data['endDate'] = str(product['search__endDate'].date()).replace("-", "") # quita los guiones de la fecha
data['clouds'] = values['search__clouds'] data['clouds'] = product['search__clouds']
data['productsDir'] = products_dir data['productsDir'] = products_dir
data['linksDir'] = linksDir data['linksDir'] = linksDir
data['username'] = API_SENTINEL_USER data['username'] = API_SENTINEL_USER
...@@ -544,12 +544,11 @@ def Pay(request): ...@@ -544,12 +544,11 @@ def Pay(request):
json_data = json.dumps(data, indent=4) json_data = json.dumps(data, indent=4)
# print(json_data) # print(json_data)
# escribe el json en el archivo # escribe el json en el archivo
fidProductsFile = open(search_dir + "/findProducts.json", "w") fidProductsFile = open(purchase_dir + "/findProducts.json", "w")
fidProductsFile.write(json_data) fidProductsFile.write(json_data)
fidProductsFile.close() fidProductsFile.close()
os.system( os.system(SENTINEL_PATH+"/tools/L2ASCL_AreaProcessing.sh " + purchase_dir + "/ 1 &> " + purchase_dir + "/L2ASCL_AreaProcessing.log") ###ejecuta el proceso
"L2ASCL_AreaProcessing.sh " + search_dir + "/ 1 > " + search_dir + "/L2ASCL_AreaProcessing.log") ###ejecuta el proceso
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment