Changeset 7018 for cows_wps


Ignore:
Timestamp:
14/06/10 12:40:08 (9 years ago)
Author:
astephen
Message:

more fixes for zipping up.

Location:
cows_wps/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • cows_wps/trunk/cows_wps/process_handler/fileset.py

    r5615 r7018  
    112112    return fileSet 
    113113 
    114 def zipFileSet(fileSet, context, maxFileVolume, keep=False): 
     114def zipFileSet(fileSet, context, maxFileVolume, keep = False): 
    115115    """ 
    116116    Zip up the contents of a FileSet into zipfiles of maximum size  
     
    120120     
    121121    """ 
    122      
    123122    i = 1 
    124     #!TODO: zipfile size doesn't account for zip headers. 
    125123    size = 0 
    126124    zipFileSets = [] 
     
    183181    return fileSet 
    184182 
     183 
    185184def _getFileSize(fullFileName): 
    186185    fileStats = os.stat(fullFileName) 
  • cows_wps/trunk/cows_wps/public/js/ui/jobviewer_utils.js

    r6909 r7018  
    6868    }); 
    6969 
    70 // ProcessStarted percentCompleted="$percent" 
     70    // ProcessStarted percentCompleted="$percent" 
    7171    var pc; 
    7272    $(xml).find("ProcessStarted").each(function() 
  • cows_wps/trunk/process_modules/get_weather_stations.py

    r7014 r7018  
    4545 
    4646        # Always need a FileSet, even if empty 
    47         fileSet = context.outputs['FileSet'] = FileSet() 
     47        self.fileSet = context.outputs['FileSet'] = FileSet() 
    4848 
    4949        # Make path to output file 
     
    6262        filesize = os.stat(MyFilePath)[stat.ST_SIZE] 
    6363 
    64         fileSet = context.outputs['FileSet'] = FileSet() 
    6564        fileSet.contents.append(FileSet(FLAG.DATA, WFile, filesize, 'Weather Stations File')) 
    6665 
    67         context.setStatus(STATUS.COMPLETED, 'The End', 100) 
    68          
    69         completionTime = time.time() 
    70         process_support.updateJobDetailsAfterCompletion(context, startTime, completionTime) 
     66#        context.setStatus(STATUS.COMPLETED, 'The End', 100) 
     67#        completionTime = time.time() 
     68#        process_support.updateJobDetailsAfterCompletion(context, startTime, completionTime) 
     69 
     70        # Set keep = True so that weather station files are accessible to downstream process 
     71        # without unzipping. This is fine as files are small. 
     72        process_support.finishProcess(context, self.fileSet, startTime, keep = True) 
    7173 
    7274 
Note: See TracChangeset for help on using the changeset viewer.