Changeset 794

Timestamp:

Sep 21, 2012, 5:15:28 PM (12 years ago)

Author:

aslmd

Message:

UTIL PYTHON. Oops. Wrong version of mcdcgi.py, now corrected.

File:

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

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

@@ -38 +38 @@
 getlat = form.getvalue("latitude")
 if getlat == None: getlat = 1
-
 if getlat == "all":  islatfree = 1 ; query.lat = -9999.
 else:                islatfree = 0 ; query.lat = float(getlat)
+
 getlon = form.getvalue("longitude")
 if getlon == None: getlon = 1
@@ -47 +47 @@
 
 getloct = form.getvalue("localtime")
-
 if getloct == None: getloct = 1
 if getloct == "all": isloctfree = 1 ; query.loct = -9999.
@@ -81 +80 @@
 # fg: init var as with form values
 if var1 == None: var1="t"
-if var2 == None: var2="p"
+#if var2 == None: var2="p"
 
 vartoplot = []
 if var1 != "none": vartoplot = np.append(vartoplot,var1)
-if var2 != "none": vartoplot = np.append(vartoplot,var2)
+if var2 != "none" and var2 != None: vartoplot = np.append(vartoplot,var2)
 if var3 != "none" and var3 != None: vartoplot = np.append(vartoplot,var3)
 if var4 != "none" and var4 != None: vartoplot = np.append(vartoplot,var4)
@@ -128 +127 @@
 
     ### figure    
-    query.map2d(vartoplot,incwind=iswindlog,fixedlt=input_fixedlt) 
-    mpl.savefig("img/temp.png",dpi=110,bbox_inches='tight',pad_inches=0.4)
-    Image.open("img/temp.png").save(figname,'JPEG') ##lighter images   
-    ## http://www.pythonware.com/library/pil/handbook/introduction.htm
+    query.htmlmap2d(vartoplot,incwind=iswindlog,fixedlt=input_fixedlt,figname=figname) 
+    #mpl.savefig("img/temp.png",dpi=110,bbox_inches='tight',pad_inches=0.4)
+    #Image.open("img/temp.png").save(figname,'JPEG') ##lighter images   
+    ### http://www.pythonware.com/library/pil/handbook/introduction.htm
 
 ## This is quite common
@@ -147 +146 @@
 ## Now the part which differs
 if sumfree == 0:        query.update() ; query.htmlprinttabextvar(vartoplot)  #query.printmeanvar()
-elif sumfree >= 1:      print "<img src='"+figname+"'><br />"
+elif sumfree >= 1:      print "<a href='../index.html'>Click here to start a new query</a><br /><img src='"+figname+"'><br />"
 else:                   print "<h1>ERROR : sumfree is not or badly defined ...</h1></body></html>"
 
@@ -153 +152 @@
 ## This is quite common
 bottom = "<hr><a href='../index.html'>Click here to start a new query</a>.<hr></body></html>"
-print bottom
+#print bottom
 
 ##write to file object