[Pywps-commits] r1119 - in trunk: pywps/Templates/1_0_0 pywps/Templates/1_0_0/inc pywps/Wps/Execute tests/Templates/1_0_0/inc

[scm-commit@wald.intevation.org]

Author: jesus
Date: 2011-02-08 16:23:17 +0100 (Tue, 08 Feb 2011)
New Revision: 1119

Modified:
   trunk/pywps/Templates/1_0_0/Execute.tmpl
   trunk/pywps/Templates/1_0_0/inc/Execute_Data_Outputs.tmpl
   trunk/pywps/Wps/Execute/__init__.py
   trunk/tests/Templates/1_0_0/inc/Execute_Data_Outputs.tmpl
Log:
code cleaning, correct use of variable mimetype in template/code

Modified: trunk/pywps/Templates/1_0_0/Execute.tmpl
===================================================================
--- trunk/pywps/Templates/1_0_0/Execute.tmpl	2011-02-08 15:17:10 UTC (rev 1118)
+++ trunk/pywps/Templates/1_0_0/Execute.tmpl	2011-02-08 15:23:17 UTC (rev 1119)
@@ -55,7 +55,7 @@
             </ows:Abstract>
             </TMPL_IF>
             <TMPL_IF reference>
-            <wps:Reference xlink:href="<TMPL_VAR reference>" method="<TMPL_VAR method>" mimeType="<TMPL_VAR mimeType>" encoding="<TMPL_VAR encoding>" schema="<TMPL_VAR schema>"/>
+            <wps:Reference xlink:href="<TMPL_VAR reference>" method="<TMPL_VAR method>" mimeType="<TMPL_VAR mimetype>" encoding="<TMPL_VAR encoding>" schema="<TMPL_VAR schema>"/>
                 <TMPL_IF header>
                 <wps:Header key="<TMPL_VAR key>" value="<TMPL_VAR value>" />
                 </TMPL_IF>

Modified: trunk/pywps/Templates/1_0_0/inc/Execute_Data_Outputs.tmpl
===================================================================
--- trunk/pywps/Templates/1_0_0/inc/Execute_Data_Outputs.tmpl	2011-02-08 15:17:10 UTC (rev 1118)
+++ trunk/pywps/Templates/1_0_0/inc/Execute_Data_Outputs.tmpl	2011-02-08 15:23:17 UTC (rev 1119)
@@ -1,9 +1,9 @@
             <TMPL_IF reference>
-            <wps:Reference mimeType="<TMPL_VAR mimeType>" encoding="<TMPL_VAR encoding>" schema="<TMPL_VAR schema>" href="<TMPL_VAR href>">
+            <wps:Reference mimeType="<TMPL_VAR mimetype>" encoding="<TMPL_VAR encoding>" schema="<TMPL_VAR schema>" href="<TMPL_VAR href>">
             <TMPL_ELSE>
             <wps:Data>
                 <TMPL_IF complexdata>
-                <wps:ComplexData mimeType="<TMPL_VAR mimeType>" schema="<TMPL_VAR schema>" encoding="<TMPL_VAR encoding>">
+                <wps:ComplexData mimeType="<TMPL_VAR mimetype>" schema="<TMPL_VAR schema>" encoding="<TMPL_VAR encoding>">
                     <TMPL_IF cdata>
                     <![CDATA[<TMPL_VAR complexdata>]]>
                     <TMPL_ELSE>

Modified: trunk/pywps/Wps/Execute/__init__.py
===================================================================
--- trunk/pywps/Wps/Execute/__init__.py	2011-02-08 15:17:10 UTC (rev 1118)
+++ trunk/pywps/Wps/Execute/__init__.py	2011-02-08 15:23:17 UTC (rev 1119)
@@ -787,7 +787,7 @@
         if wpsInput.has_key("method"):
             method = wpsInput["method"]
         complexInput["method"] = method
-        complexInput["mimeType"] = processInput.format["mimetype"]
+        complexInput["mimetype"] = processInput.format["mimetype"]
         complexInput["encoding"] = processInput.format["encoding"]
         if wpsInput.has_key("header") and wpsInput["header"]:
             complexInput["header"] = 1
@@ -853,7 +853,7 @@
         
          #Checks for the correct output and logs 
         self.checkMimeTypeOutput(output)
-        complexOutput["mimeType"] = output.format["mimetype"]
+        complexOutput["mimetype"] = output.format["mimetype"]
         complexOutput["encoding"] = output.format["encoding"]
         complexOutput["schema"] = output.format["schema"]
         
@@ -942,7 +942,7 @@
         #Checks for the correct output and logs 
         self.checkMimeTypeOutput(output)
         #In complexOutput the variable is mimeType
-        complexOutput["mimeType"] = output.format["mimetype"]
+        complexOutput["mimetype"] = output.format["mimetype"]
         complexOutput["encoding"] = output.format["encoding"]
         complexOutput["schema"] = output.format["schema"]
        
@@ -1021,7 +1021,7 @@
                     templateOutput["reference"] = escape(owsreference)
 
             
-            templateOutput["mimeType"] = output.format["mimetype"]
+            templateOutput["mimetype"] = output.format["mimetype"]
             templateOutput["schema"] = output.format["schema"]
             templateOutput["encoding"]=output.format["encoding"]
           
@@ -1049,7 +1049,6 @@
         
         try: # problem with exceptions ?! 
             mimeType=output.ms.file(output.value).split(';')[0]
-    
             if (output.format["mimetype"] is None) or (output.format["mimetype"]==""):
                 output.format["mimetype"]=mimeType
                 logging.debug("Since there is absolutely no mimeType information for %s, using libmagic mimeType %s " % (output.identifier,mimeType))

Modified: trunk/tests/Templates/1_0_0/inc/Execute_Data_Outputs.tmpl
===================================================================
--- trunk/tests/Templates/1_0_0/inc/Execute_Data_Outputs.tmpl	2011-02-08 15:17:10 UTC (rev 1118)
+++ trunk/tests/Templates/1_0_0/inc/Execute_Data_Outputs.tmpl	2011-02-08 15:23:17 UTC (rev 1119)
@@ -1,9 +1,9 @@
             <TMPL_IF reference>
-            <wps:Reference mimeType="<TMPL_VAR mimeType>" encoding="<TMPL_VAR encoding>" schema="<TMPL_VAR schema>" href="<TMPL_VAR href>">
+            <wps:Reference mimeType="<TMPL_VAR mimetype>" encoding="<TMPL_VAR encoding>" schema="<TMPL_VAR schema>" href="<TMPL_VAR href>">
             <TMPL_ELSE>
             <wps:Data>
                 <TMPL_IF complexdata>
-                <wps:ComplexData mimeType="<TMPL_VAR mimeType>" schema="<TMPL_VAR schema>" encoding="<TMPL_VAR encoding>">
+                <wps:ComplexData mimeType="<TMPL_VAR mimetype>" schema="<TMPL_VAR schema>" encoding="<TMPL_VAR encoding>">
                     <TMPL_IF cdata>
                     <![CDATA[<TMPL_VAR complexdata>]]>
                     <TMPL_ELSE>