Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
GeoInt_SIDT
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Mario Chirinos Colunga
GeoInt_SIDT
Commits
5c1733a4
Commit
5c1733a4
authored
May 10, 2019
by
Irving David
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cambiada la forma de ejecutar el proceso L2ACSL_AreaProcessing.sh
parent
c1c0a098
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
2 deletions
+8
-2
views.py
catalog/views.py
+7
-0
Reports.html
reports/templates/Reports.html
+1
-1
views.py
reports/views.py
+0
-1
No files found.
catalog/views.py
View file @
5c1733a4
...
...
@@ -17,6 +17,7 @@ from geosentinel import APISentinel, polygonToBox
from
mail.views
import
wsMail
,
wsMail2
,
wsMail3
from
django.contrib
import
messages
import
base64
import
subprocess
dirname
=
os
.
path
.
dirname
(
__file__
)
configfile
=
os
.
path
.
join
(
dirname
,
'../config/config.json'
)
...
...
@@ -33,6 +34,8 @@ API_SENTINEL_PASS = config['API_SENTINEL']['SENTINEL_PASS']
sys
.
path
.
append
(
SENTINEL_PATH
)
sentinel
=
APISentinel
.
APISentinel
(
API_SENTINEL_USER
,
API_SENTINEL_PASS
)
os
.
environ
[
"PATH"
]
+=
os
.
pathsep
+
"/home/agei/REPSAT/GeoSentinel/tools"
os
.
environ
[
"PATH"
]
+=
os
.
pathsep
+
"/home/agei/REPSAT/GeoSentinel/geosentinel"
# Create your views here.
...
...
@@ -590,6 +593,10 @@ def Pay(request):
fidProductsFile
.
close
()
os
.
system
(
SENTINEL_PATH
+
"/tools/L2ASCL_AreaProcessing.sh "
+
purchase_dir
+
"/ 0 > "
+
purchase_dir
+
"/L2ASCL_AreaProcessing.log"
)
###ejecuta el proceso
#print(SENTINEL_PATH + "/tools/L2ASCL_AreaProcessing.sh " + purchase_dir + "/ 0 > " + purchase_dir + "/L2ASCL_AreaProcessing.log")
#f.open(purchase_dir + "/L2ASCL_AreaProcessing.log","w")
#subprocess.call("L2ASCL_AreaProcessing.sh " + purchase_dir + "/ 0 > " + purchase_dir + "/L2ASCL_AreaProcessing.log",shell=True)
subprocess
.
Popen
(
"L2ASCL_AreaProcessing.sh "
+
purchase_dir
+
"/ 0 > "
+
purchase_dir
+
"/L2ASCL_AreaProcessing.log"
,
shell
=
True
)
...
...
reports/templates/Reports.html
View file @
5c1733a4
...
...
@@ -220,7 +220,7 @@
aria-valuemin=
"0"
aria-valuemax=
"100"
style=
"width:{{ product.progress }}%"
>
<p
id=
"textprogress{{ product.purchase_id }}"
style=
"color: #0a0a0a"
>
Download
ing...
Process
ing...
</p>
</div>
</div>
...
...
reports/views.py
View file @
5c1733a4
...
...
@@ -210,7 +210,6 @@ def Reports(request):
# ------------------------------------------------------------------------
def
wsProcessProgress
(
request
):
print
(
request
);
if
request
.
is_ajax
():
progress
=
0
productList2
=
[]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment