Fix issues for merge into master

ThomasMaxwell · ThomasMaxwell · commit b75c665cab5d · 2015-05-14T16:36:16.000-04:00
diff --git a/SETUP.txt b/SETUP.txt
@@ -1,14 +1,13 @@
   WPCDAS:  Web Processing Climate Data Analysis Services
 
 WPS API leveraging UVCDAT for server-side climate data analytics with clients for web, python, etc.
-The inital version of the WPS server was based on code developed by Charles Doutriaux, LLNL.
 
 Package installation:
 
   >> sudo mkdir /usr/local/web
   >> sudo chown <username> /usr/local/web
-  >> cd /usr/local/web
-  >> git checkout git@github.com:ThomasMaxwell/CDS-WPS-AaaS.git WPCDAS
+  >> cd /usr/local/web 
+  >> git clone git@github.com:ESGF/wps_cwt.git WPCDAS
   >> chmod -R a+rX WPCDAS
   >> chmod -R a+w WPCDAS/server/logs
   >> cd WPCDAS
@@ -20,9 +19,10 @@ WPS Server Requirements:
 
     Once UVCDAT is installed the following packages should be installed using UVCDAT's python:
 
-    lxml:    http://lxml.de/
-    Django:  https://www.djangoproject.com/
-    django-corsheaders:  https://github.com/OttoYiu/django-cors-headers
+    PyWPS:   http://pywps.wald.intevation.org/documentation/installation.html
+    lxml:    http://lxml.de/    ( pip install lxml )
+    Django:  https://www.djangoproject.com/   ( pip install Django==1.8.1 )
+    django-corsheaders:  https://github.com/OttoYiu/django-cors-headers   ( pip install django-cors-headers )
 
 
 Client Requirements:
diff --git a/clients/web/htdocs/cdas/index.html b/clients/web/htdocs/cdas/index.html
@@ -14,8 +14,8 @@
     <script type="text/javascript" src="TimeseriesPlot/rickshaw.js"></script>
     <script type="text/javascript" src="WPSResponseManager.js"></script>
     <script type="text/javascript" src="jquery-2.1.3.js"></script>
-   	<script src="CDS.js"></script> 
-   	<script src="./TimeseriesPlot/timeseries.js"></script> 
+   	<script src="CDS.js"></script>
+   	<script src="./TimeseriesPlot/timeseries.js"></script>
     </head>
     <body>
       <div class="row-fluid">
@@ -35,22 +35,21 @@
         var variable_index = 0;
         var embedded = true;
         var wms = new OpenLayers.Layer.WMS( "OpenLayers WMS", "http://vmap0.tiles.osgeo.org/wms/vmap0", {layers: 'basic'} );
-        map.addLayer(wms);  
-        OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, {                
+        OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, {
                 defaultHandlerOptions: { 'single': true, 'double': false, 'pixelTolerance': 0, 'stopSingle': false, 'stopDouble': false },
                 initialize: function(options) {
                     this.handlerOptions = OpenLayers.Util.extend( {}, this.defaultHandlerOptions );
-                    OpenLayers.Control.prototype.initialize.apply(  this, arguments  ); 
+                    OpenLayers.Control.prototype.initialize.apply(  this, arguments  );
                     this.handler = new OpenLayers.Handler.Click( this, {  'click': this.trigger }, this.handlerOptions );
-                }, 
+                },
                 trigger: function(e) {
                     var lonlat = map.getLonLatFromPixel(e.xy);
                     var domain_json   = JSON.stringify( { longitude: lonlat.lon, latitude: lonlat.lat }, json_replacer );
                     var variable_json = JSON.stringify( variables[ variable_index ], json_replacer );
-                               
-                    if ( debug ) { 
+
+                    if ( debug ) {
                     	console.log( " @@@ Execute\nDomain:\n " + domain_json );
-                    	console.log( " Variable:\n " + variable_json ); 
+                    	console.log( " Variable:\n " + variable_json );
                     	console.time("WPS Execute");
                     }
 					CDS.wps.execute({
@@ -61,19 +60,21 @@
 					            variable: variable_json,
                                 embedded: embedded
 					        },
-					        success: function(output) { 
-					        	wpsResponseManager.process( output.responseText, embedded, 
+					        success: function(output) {
+					        	wpsResponseManager.process( output.responseText, embedded,
 					        		function( responseJson ) {
 					        			timeseries.plot( "timeseries-elem", responseJson );
 					        		} );
 					        }
 					    });
                 }
             });
+        map.addLayer(wms);
         var click = new OpenLayers.Control.Click();
         map.addControl(click);
         map.zoomToMaxExtent();
         click.activate();
+
       </script>
 
 </body>
diff --git a/clients/web/logs/README.txt b/clients/web/logs/README.txt
@@ -0,0 +1 @@
+The web server must be able to create and write to files in this directory.
diff --git a/server/analysis/timeseries_analysis.py b/server/analysis/timeseries_analysis.py
@@ -94,6 +94,7 @@ def applyOperation( self, input_variable, operation ):
                 type = operation.get('type','').lower()
                 bounds = operation.get('bounds','').lower()
                 op_start_time = time.clock() # time.time()
+                wpsLog.debug( "applyOperation: %s " % str( [operation, type, bounds ] ) )
                 if not bounds:
                     if type == 'departures':
                         ave = cdutil.averager( input_variable, axis='t', weights='equal' )
diff --git a/server/logs/README.txt b/server/logs/README.txt
@@ -0,0 +1 @@
+The django server must be able to create and write to files in this directory.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+The web server must be able to create and write to files in this directory.`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+The django server must be able to create and write to files in this directory.`