Changeset 1078

Timestamp:

Oct 18, 2013, 6:45:06 PM (11 years ago)

Author:

aslmd

Message:

UTIL PYTHON MCD online. Forgot error message about dust storm scenario.

File:

• trunk/UTIL/PYTHON/mcd/proto/cgi-bin/mcdcgi.py (modified) (4 diffs)

trunk/UTIL/PYTHON/mcd/proto/cgi-bin/mcdcgi.py

@@ -94 +94 @@
 if minxz < 0.1: minxz=0.1 # otherwise bug with values smaller than 0.1m
 
-
-
 try: query.datekey = int(form.getvalue("datekeyhtml"))
 except: query.datekey = float(1)
@@ -106 +104 @@
     except: query.xdate = float(1)
     query.loct = 0.
+try: query.dust = int(form.getvalue("dust"))
+except: query.dust  = int(1)
 
 # Prevent the user from doing bad
@@ -148 +148 @@
 if badrange: 
     errormess = errormess+"<li>One or several coordinate intervals are not... intervals. Set either a real range or an unique value."
+stormls = ( (query.dust in [4,5,6]) and (query.datekey == 1 and query.xdate < 180.))
+if stormls:
+    errormess = errormess+"<li>When a dust storm scenario is selected, available dates must be within the dust storm season (180 < Ls < 360)."
 if query.xdate == 666.:
     errormess = "<li>CONGRATULATIONS! <br><img src='../surprise.jpg'><br> You reached secret mode.<br> You can <a href='http://www.youtube.com/watch?v=fTpQOZcNASw'>watch a nice video</a>."
@@ -158 +161 @@
 try: query.hrkey = int(form.getvalue("hrkey"))
 except: query.hrkey = int(1)
-try: query.dust = int(form.getvalue("dust"))
-except: query.dust  = int(1)
 #        self.perturkey = 0  #integer perturkey ! perturbation type (0: none)
 #        self.seedin    = 1  #random number generator seed (unused if perturkey=0)