Changeset 7010 for cows_wps


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

fixing delimiter

Location:
cows_wps/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • cows_wps/trunk/cows_wps/templates/ui_template.html

    r6955 r7010  
    9292                <a href="/ui/technical">Technical</a>&nbsp;&nbsp; 
    9393 
    94 <?python from cows_wps.lib.user_manager import UserManager ?> 
     94<?python from cows_wps.lib.user_manager import UserManager 
    9595 
    96 <?python  
    9796try: 
    9897    logged_in = UserManager() 
     
    102101 
    103102        <py:if test="logged_in"> 
    104                 <a href="/logout">Logout</a> 
     103                <?python username = logged_in.getUserName() ?> 
     104                <a href="/logout">Logout</a>  
     105                (logged in as: ${username}) 
    105106        </py:if> 
    106107        <py:if test="logged_in == False"> 
     
    110111        </div> 
    111112</div> 
    112  
    113113<div id="main"> 
    114114 
  • cows_wps/trunk/process_configs/ExtractUKStationData.ini

    r7003 r7010  
    11[wps_interface] 
    22process_callable = process_modules.extract_uk_station_data#ExtractUKStationData 
    3 process_type = async_s 
     3process_type = async_l 
    44dry_run_enabled = False 
    55internal = False 
  • cows_wps/trunk/process_modules/extract_uk_station_data.py

    r7003 r7010  
    110110        process_tmp_dir = context.processDir + '/tmp' 
    111111 
    112         output_file_paths = exuk_utils.extractStationDataByTimeChunk([ObsTableName], StartDateTime, EndDateTime, 
    113                        StationIDs, TimeChunk, df_path_base, ext, process_tmp_dir) 
     112        output_file_paths = exuk_utils.extractStationDataByTimeChunk([ObsTableName], StartDateTime,  
     113                       EndDateTime, StationIDs, TimeChunk, df_path_base, delimiter, 
     114                       ext, process_tmp_dir) 
    114115        
    115116        for df_path in output_file_paths:  
  • cows_wps/trunk/process_modules/lib_extract_uk_station_data/utils.py

    r7003 r7010  
    1919 
    2020def extractStationDataByTimeChunk(obs_tables, startTime, endTime, src_ids, time_chunk,  
    21                     output_file_base, ext, tempDir): 
     21                    output_file_base, delimiter, ext, tempDir): 
    2222    """ 
    2323    Loops through time chunks extracting data to files in required time chunks. 
     
    5555        # Call subsetter to extract and write the data     
    5656        midasSubsetter.MIDASSubsetter(obs_tables, output_file_path, startTime = start, 
    57                        endTime = end, src_ids = src_ids, tempDir = tempDir) 
     57                       endTime = end, src_ids = src_ids, delimiter = delimiter, tempDir = tempDir) 
    5858         
    5959    return output_file_paths 
Note: See TracChangeset for help on using the changeset viewer.