Changeset 1774 for TI03-DataExtractor


Ignore:
Timestamp:
28/11/06 11:28:47 (13 years ago)
Author:
spascoe
Message:

Changed all references to serverConfig to point to ndg.utils.config.

Location:
TI03-DataExtractor/branches/repackaging/server/lib/ndg/dx/server
Files:
1 deleted
20 edited

Legend:

Unmodified
Added
Removed
  • TI03-DataExtractor/branches/repackaging/server/lib/ndg/dx/server/CDMSDataHandler.py

    r1758 r1774  
    2121 
    2222# Import global variables 
    23 from serverConfig import * 
    2423from common import * 
    2524from DXDMLHandler import DXDMLHandler 
    2625from DXErrors import * 
    2726 
     27# Import configuration 
     28from ndg.utils.config import config 
     29configSection = 'ndg.dx.server' 
     30CF_METADATA_GLOBAL_ATTRIBUTE_KEYS = config.get(configSection, 'CF_METADATA_GLOBAL_ATTRIBUTE_KEYS') 
    2831 
    2932class CDMSDataHandler: 
  • TI03-DataExtractor/branches/repackaging/server/lib/ndg/dx/server/CreditManager.py

    r1758 r1774  
    1919 
    2020# Import local modules 
    21 from serverConfig import UNRESTRICTED_CREDIT 
     21from ndg.utils.config import config 
     22configSection = 'ndg.dx.server' 
     23UNRESTRICTED_CREDIT = config.getint(configSection, 'UNRESTRICTED_CREDIT') 
    2224 
    2325class CreditManager: 
  • TI03-DataExtractor/branches/repackaging/server/lib/ndg/dx/server/DXController.py

    r1758 r1774  
    1717 
    1818# Bring package into local scope 
    19 from serverConfig import BASEDIR, RUNNING_DIR 
    20 sys.path.insert(0, os.path.split(BASEDIR)[0]) 
    21 sys.path.insert(0, "..") 
    22 from pydxs import * 
    23  
    24 # Update local pythonpath for local imports  
    25 for path in LOCAL_PYTHONPATH: 
    26     sys.path.insert(0, path) 
     19from ndg.dx.server import * 
     20 
     21# import configuration 
     22from ndg.utils.config import config 
     23configSection = 'ndg.dx.server' 
     24SECURITY_MODEL = config.get(configSection, 'SECURITY_MODEL') 
     25RESTRICTED_DATA = config.getboolean(configSection, 'RESTRICTED_DATA') 
     26RUNNING_DIR = config.get(configSection, 'RUNNING_DIR') 
     27REQUEST_SIZE_LIMIT = config.getint(configSection, 'REQUEST_SIZE_LIMIT') 
     28ADMIN_MAIL_ADDRESS = config.get(configSection, 'ADMIN_MAIL_ADDRESS') 
    2729 
    2830# Get local security 
  • TI03-DataExtractor/branches/repackaging/server/lib/ndg/dx/server/DXDMLHandler.py

    r1758 r1774  
    1919 
    2020# Import local modules 
    21 from serverConfig import INPUT_DATASETS_FILE 
    2221from common import deUnicodeObject,sortUnique 
    2322from DXErrors import * 
     23 
     24# Import configuration 
     25from ndg.utils.config import config 
     26configSection = 'ndg.dx.server' 
     27INPUT_DATASETS_FILE = config.get(configSection, 'INPUT_DATASETS_FILE') 
     28 
    2429 
    2530class DXDMLHandler: 
  • TI03-DataExtractor/branches/repackaging/server/lib/ndg/dx/server/ECMWFGRIB1NoSubsetDataHandler.py

    r1758 r1774  
    2222 
    2323# Import global variables 
    24 from serverConfig import * 
    2524from common import * 
    2625from DXDMLHandler import DXDMLHandler 
  • TI03-DataExtractor/branches/repackaging/server/lib/ndg/dx/server/InputDatasetManager.py

    r1758 r1774  
    1919 
    2020# import package modules including global variables 
    21 from serverConfig import * 
    2221from common import * 
    2322from DXErrors import * 
    2423 
     24# Import configuration 
     25from ndg.utils.config import config 
     26configSection = 'ndg.dx.server' 
     27INPUT_DATASETS_FILE = config.get(configSection, 'INPUT_DATASETS_FILE') 
    2528 
    2629def deleteExcessWhiteSpace(xmlString): 
  • TI03-DataExtractor/branches/repackaging/server/lib/ndg/dx/server/LogManager.py

    r1758 r1774  
    3131import logging 
    3232 
    33 # Import package modules 
    34 from serverConfig import * 
     33# Import configuration 
     34from ndg.utils.config import config 
     35configSection = 'ndg.dx.server' 
     36ERROR_LOG = config.get(configSection, 'ERROR_LOG') 
     37REQUEST_LOG = config.get(configSection, 'REQUEST_LOG') 
    3538 
    3639class LogManager: 
  • TI03-DataExtractor/branches/repackaging/server/lib/ndg/dx/server/MIDASDataHandler.py

    r1758 r1774  
    2121 
    2222# Import global variables 
    23 from serverConfig import * 
    2423from common import * 
    2524from DXDMLHandler import DXDMLHandler 
     
    3534    pass 
    3635 
     36 
     37# Import configuration 
     38from ndg.utils.config import config 
     39configSection = 'ndg.dx.server' 
     40CF_METADATA_GLOBAL_ATTRIBUTE_KEYS = config.get(configSection, 'CF_METADATA_GLOBAL_ATTRIBUTE_KEYS') 
    3741 
    3842class MIDASDataHandler: 
  • TI03-DataExtractor/branches/repackaging/server/lib/ndg/dx/server/MailManager.py

    r1758 r1774  
    1717 
    1818# import local modules 
    19 from serverConfig import * 
    2019from common import * 
     20 
     21# import configuration 
     22from ndg.utils.config import config 
     23configSection = 'ndg.dx.server' 
     24LOCAL_MAIL_HOST = config.get(configSection, 'LOCAL_MAIL_HOST') 
     25MAIL_SENDER = config.get(configSection, 'MAIL_SENDER') 
     26PACKAGE_NAME = config.get(configSection, 'PACKAGE_NAME') 
    2127 
    2228def sendMail(recipients, subject, msg, autoline="on"): 
  • TI03-DataExtractor/branches/repackaging/server/lib/ndg/dx/server/NumericalOperations.py

    r1758 r1774  
    7171 
    7272# Import package modules 
    73 from serverConfig import * 
    7473from common import * 
    7574from DXErrors import * 
  • TI03-DataExtractor/branches/repackaging/server/lib/ndg/dx/server/OptionHandler.py

    r1758 r1774  
    1919# Import package modules including global variables 
    2020from common import * 
    21 from serverConfig import * 
    2221from CDMSDataHandler import * 
    2322from CSMLDataHandler import * 
     
    2625from DXErrors import * 
    2726from DatasetFormatDecider import * 
     27 
     28# Import options 
     29from ndg.utils.config import config 
     30configSection = 'ndg.dx.server' 
     31RESTRICTED_DATA = config.getboolean(configSection, 'RESTRICTED_DATA') 
    2832 
    2933class OptionHandler: 
  • TI03-DataExtractor/branches/repackaging/server/lib/ndg/dx/server/OutputManager.py

    r1758 r1774  
    2222# Import package modules including global variables 
    2323from common import * 
    24 from serverConfig import * 
    2524from localRules import * 
    2625from NumericalOperations import * 
     
    3837from DXErrors import * 
    3938import dxvv 
     39 
     40# Import configuration 
     41from ndg.utils.config import config 
     42configSection = 'ndg.dx.server' 
     43TIMING_SCALE_FACTOR = config.get(configSection, 'TIMING_SCALE_FACTOR') 
     44MAX_NUM_DATASETS = config.get(configSection, 'MAX_NUM_DATASETS') 
     45REQUEST_SIZE_LIMIT = config.get(configSection, 'REQUEST_SIZE_LIMIT') 
     46ONE_FILE_PER_TIMESTEP = config.get(configSection, 'ONE_FILE_PER_TIMESTEP') 
     47MAX_FILE_SIZE = config.get(configSection, 'MAX_FILE_SIZE') 
    4048 
    4149# Make sure CDMS automatic bounds generation is set to OFF 
  • TI03-DataExtractor/branches/repackaging/server/lib/ndg/dx/server/ProcessList.py

    r1758 r1774  
    1818import os, sys, time, commands, shelve 
    1919 
    20 # Import local modules 
    21 from serverConfig import PROCESS_LIST_DIR 
     20# Import configuration 
     21from ndg.utils.config import config 
     22configSection = 'ndg.dx.server' 
     23PROCESS_LIST_DIR = config.get(configSection, 'PROCESS_LIST_DIR') 
    2224 
    2325def convertETimeToSeconds(etime): 
  • TI03-DataExtractor/branches/repackaging/server/lib/ndg/dx/server/RequestDict.py

    r1758 r1774  
    1818# import package modules including global variables 
    1919from common import * 
    20 from serverConfig import * 
    2120 
    2221class RequestDict: 
  • TI03-DataExtractor/branches/repackaging/server/lib/ndg/dx/server/SecurityManager.py

    r1758 r1774  
    1818import sys, os, string, time 
    1919 
    20 # Import local modules 
    21 from serverConfig import TOKEN_VALID_LIFETIME 
     20# Import configuration 
     21from ndg.utils.config import config 
     22configSection = 'ndg.dx.server' 
     23TOKEN_VALID_LIFETIME = config.get(configSection, 'TOKEN_VALID_LIFETIME') 
    2224 
    2325class SecurityManager: 
  • TI03-DataExtractor/branches/repackaging/server/lib/ndg/dx/server/SessionObject.py

    r1758 r1774  
    2121 
    2222# import package modules including global variables 
    23 from serverConfig import * 
    2423from common import * 
     24 
     25# import configuration 
     26from ndg.utils.config import config 
     27configSection = 'ndg.dx.server' 
     28SESSION_OBJECT_DIR = config.get(configSection, 'SESSION_OBJECT_DIR') 
    2529 
    2630class SessionObject: 
  • TI03-DataExtractor/branches/repackaging/server/lib/ndg/dx/server/VariableLooper.py

    r1758 r1774  
    2727# Import package modules including global variables 
    2828from common import * 
    29 from serverConfig import * 
    3029from localRules import * 
    3130from NumericalOperations import * 
     
    3736from DXErrors import * 
    3837 
     38# Import configuration 
     39from ndg.utils.config import config 
     40configSection = 'ndg.dx.server' 
     41MAX_FILE_SIZE = config.get(configSection, 'MAX_FILE_SIZE') 
     42ONE_FILE_PER_TIMESTEP = config.get(configSection, 'ONE_FILE_PER_TIMESTEP') 
    3943 
    4044class VariableLooper: 
  • TI03-DataExtractor/branches/repackaging/server/lib/ndg/dx/server/__init__.py

    r1758 r1774  
    1313 
    1414""" 
    15  
    16 # serverConfig.py - holds all the user-related configuration details 
    17 from serverConfig import * 
    18  
    19 # Set python path for CDAT packages 
    20 #import sys 
    21 #for d in LOCAL_PYTHONPATH: 
    22 #    sys.path.insert(0, d) 
    2315 
    2416# SecurityManager is the class used to implement security 
  • TI03-DataExtractor/branches/repackaging/server/lib/ndg/dx/server/common.py

    r1758 r1774  
    1414import os, re 
    1515 
    16 # Import package modules 
    17 from serverConfig import * 
     16# Import configuration 
     17from ndg.utils.config import config 
     18configSection = 'ndg.dx.server' 
     19MAX_NUM_DATASETS = config.getint(configSection, 'MAX_NUM_DATASETS') 
     20OUTPUT_DIR = config.get(configSection, 'OUTPUT_DIR') 
     21OUTPUT_DIR_URL = config.get(configSection, 'OUTPUT_DIR_URL') 
     22OUTPUT_DIR_PERMISSION = config.getint(configSection, 'OUTPUT_DIR_PERMISSION') 
     23OUTPUT_FILE_USER = config.get(configSection, 'OUTPUT_FILE_USER') 
     24OUTPUT_FILE_GROUP = config.get(configSection, 'OUTPUT_FILE_GROUP') 
     25OUTPUT_FILE_PERMISSION = config.get(configSection, 'OUTPUT_FILE_PERMISSION') 
    1826 
    1927# Set up commmon variables. These are CAPITALISED to 
  • TI03-DataExtractor/branches/repackaging/server/lib/ndg/dx/server/mailUser.py

    r1758 r1774  
    1515import smtplib 
    1616 
    17 # Import package module global variables 
    18 from serverConfig import LOCAL_MAIL_HOST, ADMIN_MAIL_ADDRESS, PACKAGE_NAME 
     17# import configuration 
     18from ndg.utils.config import config 
     19configSection = 'ndg.dx.server' 
     20LOCAL_MAIL_HOST = config.get(configSection, 'LOCAL_MAIL_HOST') 
     21ADMIN_MAIL_ADDRESS = config.get(configSection, 'ADMIN_MAIL_ADDRESS') 
     22PACKAGE_NAME = config.get(configSection, 'PACKAGE_NAME') 
    1923 
    2024class MailUser: 
Note: See TracChangeset for help on using the changeset viewer.