Changeset 793 for trunk/UTIL/PYTHON/mcd/proto/cgi-bin

Timestamp:

Sep 21, 2012, 5:11:37 PM (12 years ago)

Author:

aslmd

Message:

UTIL PYTHON : a working version of MCD python on an Apache server thanks to F. Guyon and L. Fairhead. plus added specific functions in mcd.py to make plots without using GUI, it was necessary to rewrite some stuff to avoid calling to matplotlib.pyplot.

File:

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

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

@@ -1 @@
-#!/home/aymeric/Software/epd-7.0-2-rh5-x86/bin/python
+#!/usr/bin/python
+###!/home/aymeric/Software/epd-7.0-2-rh5-x86/bin/python
+####!/home/marshttp/EPD/epd-7.0-2-rh5-x86_64/bin/python
 ### here the version used to f2py the MCD Fortran routines
 
@@ -9 +11 @@
 ### (see mcdtest.py for examples of use)       ###
 ##################################################
+### ajouts et corrections par Franck Guyon 09/2012
 
 import cgi, cgitb 
 import numpy as np
-from mcd import mcd
+#from mcd import mcd
+from modules import *
+from modules import mcd
+
 import cStringIO
 import os as daos
 import matplotlib.pyplot as mpl
-import Image
+from PIL import Image
 
 # for debugging in web browser
@@ -25 +31 @@
 
 # create a MCD object
-query = mcd()
+#query = mcd()
+query=mcd.mcd() #FG: import from module mcd
 
 # Get data from user-defined fields and define free dimensions
+# FG: add tests if var==None to have values in local without forms ones
 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
 if getlon == "all":  islonfree = 1 ; query.lon = -9999.
 else:                islonfree = 0 ; query.lon = float(getlon)
+
 getloct = form.getvalue("localtime")
+
+if getloct == None: getloct = 1
 if getloct == "all": isloctfree = 1 ; query.loct = -9999.
 else:                isloctfree = 0 ; query.loct = float(getloct)
+
 getalt = form.getvalue("altitude")
+if getalt == None: getalt = 1
 if getalt == "all":  isaltfree = 1 ; query.xz = -9999.
 else:                isaltfree = 0 ; query.xz = float(getalt)
+
 sumfree = islatfree + islonfree + isloctfree + isaltfree 
 if sumfree > 2: exit() ## only 1D or 2D plots for the moment
-query.xdate = float(form.getvalue("ls"))
-query.hrkey = int(form.getvalue("hrkey"))
-query.dust = int(form.getvalue("dust"))
+
+try: query.xdate = float(form.getvalue("ls"))
+except: query.xdate = float(1)
+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.zkey      = 3  # specify that xz is the altitude above surface (m)
 #        self.perturkey = 0  #integer perturkey ! perturbation type (0: none)
@@ -55 +76 @@
 var3 = form.getvalue("var3")
 var4 = form.getvalue("var4")
-vartoplot = [var1]
+
+# fg: vartoplot is not None without form values
+# vartoplot = [var1]
+# fg: init var as with form values
+if var1 == None: var1="t"
+if var2 == None: var2="p"
+
+vartoplot = []
+if var1 != "none": vartoplot = np.append(vartoplot,var1)
 if var2 != "none": vartoplot = np.append(vartoplot,var2)
-if var3 != "none": vartoplot = np.append(vartoplot,var3)
-if var4 != "none": vartoplot = np.append(vartoplot,var4)
+if var3 != "none" and var3 != None: vartoplot = np.append(vartoplot,var3)
+if var4 != "none" and var4 != None: vartoplot = np.append(vartoplot,var4)
+
 iswind = form.getvalue("iswind")
 if iswind == "on": iswindlog = True
@@ -68 +98 @@
 # reference name (to test which figures are already in the database)
 reference = str(islatfree)+str(islonfree)+str(isloctfree)+str(isaltfree)+query.getnameset()+str(var1)+str(var2)+str(var3)+str(var4)+str(iswind)+str(isfixedlt)
-figname = 'img/'+reference+'.jpg'
+figname = '../img/'+reference+'.png'
+
 testexist = daos.path.isfile(figname)
 
@@ -85 +116 @@
 
     ### generic building of figure
-    #query.plot1d(["t","p","u","v"],vertplot=isaltfree)
-    query.plot1d(vartoplot,vertplot=isaltfree)
-    mpl.savefig("img/temp.png",dpi=85,bbox_inches='tight',pad_inches=0.25)
-    Image.open("img/temp.png").save(figname,'JPEG')
+    query.htmlplot1d(vartoplot,vertplot=isaltfree,figname=figname)
+    #mpl.savefig("img/temp.png",dpi=85,bbox_inches='tight',pad_inches=0.25)
+    #Image.open("../img/temp.png").save(figname,'JPEG')
 
   ### 2D plots
@@ -104 +134 @@
 
 ## This is quite common
-print "Content-type:text/html\r\n\r\n"
-print "<html>"
-print "<head>"
-print "<title>MCD. Simple Python interface</title>"
-print "</head>"
-print "<body>"
+print "Content-type:text/html\n"
+print "  "  #Apache needs a space after content-type
+
+#entete="""<?xml version="1.0" encoding="UTF-8"?> 
+#<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN" "http://www.w3.org/Math/DTD/mathml2/xhtml-math11-f.dtd">
+#<html xmlns="http://www.w3.org/1999/xhtml"> """
+
+header="""<html><head><title>Mars Climate Database: The Web Interface</title></head><body>"""
+
+print header
 
 ## Now the part which differs
 if sumfree == 0:        query.update() ; query.htmlprinttabextvar(vartoplot)  #query.printmeanvar()
-elif sumfree >= 1:      print "<img src='../"+figname+"'><br />"
-else:                   exit()
+elif sumfree >= 1:      print "<img src='"+figname+"'><br />"
+else:                   print "<h1>ERROR : sumfree is not or badly defined ...</h1></body></html>"
+
 
 ## This is quite common
-#print "Based on the <a href='http://www-mars.lmd.jussieu.fr'>Mars Climate Database</a> (c) LMD/OU/IAA/ESA/CNES.<br />"
-print "<hr>"
-print "<a href='../index.html'>Click here to start a new query</a>."
-#query.printset()
-print "<hr>"
-print "</body>"
-print "</html>"
+bottom = "<hr><a href='../index.html'>Click here to start a new query</a>.<hr></body></html>"
+print bottom
 
 ##write to file object