Changeset 1277

Timestamp:

Jun 2, 2014, 10:34:55 AM (11 years ago)

Author:

aslmd

Message:

MCD web interface. forgot to include a file in the previous commit.

File:

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

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

@@ -18 +18 @@
 import numpy as np
 from modules import *
-from modules import mcd
 
 import cStringIO
@@ -27 +26 @@
 def gethtmlcoord(userinput,defmin,defmax):
    import string
+   # remove leading and trailing space in order to use space as separator
+   userinput = userinput.strip()
    # accepted separators. the symbol - should always be last.
-   separators = [":",";",",","/","_"] 
+   separators = [":",";",",","/","_"," "] 
    # initial values
    val = -9999. ; vals = None ; vale = None ; foundinterv = False
@@ -71 +72 @@
 
 # create a MCD object
-query=mcd.mcd() 
+# -- use in-code import to choose 
+# --  between official and dev versions 
+try:    dev = form.getvalue("dev")
+except: dev = "off"
+if dev == "on":
+  from modules import mcd_dev
+  query=mcd_dev.mcd()
+else:
+  from modules import mcd
+  query=mcd.mcd()
 
 # set MCD version changes if needed
@@ -110 +120 @@
 badinterv = (islatfree == -1) or (islonfree == -1) or (isloctfree == -1) or (isaltfree == -1)
 if badinterv: 
-    errormess = errormess+"<li>Bad syntax. Write a value (or) a range val1;val2 (or) 'all'. Separator shall be either ; : , / _ "
+    errormess = errormess+"<li>Bad syntax. Write a value (or) a range val1 val2 (or) 'all'. Separator shall be either ; : , / _ space"
 badls = (query.datekey == 1 and (query.xdate < 0. or query.xdate > 360.))
 if badls: 
@@ -215 +225 @@
  try: reference = query.getnameset()+str(var1)+str(var2)+str(var3)+str(var4)+str(iswind)+str(isfixedlt)+str(iszonmean)+query.colorm+str(query.min2d)+str(query.max2d)+str(query.dpi)+str(islog)
  except: reference = "test"
+ if dev == "on": reference = 'dev_'+reference
  if yeaheps:  figname = '../img/'+reference+'.eps'
  else:        figname = '../img/'+reference+'.png'