Changeset 32897 for trunk/ippdor/src

Timestamp:

Dec 8, 2011, 11:31:08 AM (15 years ago)

Author:

Serge CHASTEL

Message:

Localization

Location:

trunk/ippdor/src

Files:

• executables/ippdor_chip_to_warp.py (modified) (3 diffs)
• ipp/Gpc1Manager.py (modified) (2 diffs)
• ipp/constants/Globals.py (modified) (4 diffs)

trunk/ippdor/src/executables/ippdor_chip_to_warp.py

@@ -44 +44 @@
     def __init__(self,
                  label,
-                 recipient,
-                 host='ippdb01.ifa.hawaii.edu', 
-                 user='ipp', 
-                 passwd='ipp'):
+                 recipient):
         """
         The constructor:
@@ -54 +51 @@
         - creates a local directory
         """
-        Gpc1Manager.__init__(self, recipient=recipient, host=host, user=user, passwd=passwd)
+        Gpc1Manager.__init__(self, recipient=recipient)
         self.label = label
         if self.is_label_used():
@@ -231 +228 @@
         print 'Aborting'
         sys.exit(4)
-    if os.getenv('USER') == 'ippdor':
-        BUILDER = ChipWarpBuilder(LABEL, RECIPIENT)
-    else:
-        BUILDER = ChipWarpBuilder(LABEL, RECIPIENT, host='ipp0012.ifa.hawaii.edu')
+    BUILDER = ChipWarpBuilder(LABEL, RECIPIENT)
     # Check exposures        
     EXPOSURES_IDS = dict()

trunk/ippdor/src/ipp/Gpc1Manager.py

@@ -5 +5 @@
 import sys
 import MySQLdb
+from ipp.IppSite import Gpc1
 
 #################################################################
@@ -12 +13 @@
     """
     def __init__(self,
-                 recipient = 'schastel@ifa.hawaii.edu',
-                 host = 'ippdb01.ifa.hawaii.edu', 
-                 user = 'ipp', 
-                 passwd = 'ipp'):
+                 recipient = 'schastel@ifa.hawaii.edu'):
         """Create a connector to the gpc1 database
         """
         self.recipient = recipient
-        self.connector = MySQLdb.connect(host, user, passwd, db = 'gpc1')
+        self.connector = MySQLdb.connect(Gpc1.HOST, 
+                                         Gpc1.USER, 
+                                         Gpc1.PASSWORD, 
+                                         db = Gpc1.NAME)
         self.label = None # Set by derived classes
 

trunk/ippdor/src/ipp/constants/Globals.py

@@ -17 +17 @@
 from ipp.helpers import hostname
 from ipp.exceptions.UninstantiableIppException import UninstantiableIppException
+from ipp.IppSite import IppSite
 
 class Globals:
@@ -27 +28 @@
         raise UninstantiableIppException()
 
-    if hostname().startswith('ipp'): # Production cluster
-        IPPDOR_BINARY_PATH = '/home/panstarrs/ippdor/local/bin'
-        LOCAL_TMP_DIR    = '/export/%s.0/ippdor/processing' % hostname()
-        NFS_TMP_DIR    = '/home/panstarrs/ippdor/processing'
-        IPP_BIN_PATH = '/home/panstarrs/ippdor/psconfig/20110920/current.lin64/bin'
-    else: # Development
-        IPPDOR_BINARY_PATH = '~/local/bin'
-        LOCAL_TMP_DIR    = '/tmp/ippdor_processing'
-        NFS_TMP_DIR    = '~/ippdor_processing'
-        IPP_BIN_PATH = '~/ipp/default.linux'
+    IPPDOR_BINARY_PATH = IppSite.TARGET_BINARY_DIRECTORY
+    LOCAL_TMP_DIR = IppSite.LOCAL_TMP_DIR
+    NFS_TMP_DIR = IppSite.NFS_TMP_DIR
+    IPP_BIN_PATH = IppSite.IPP_BIN_PATH
 
     # Global requirements
@@ -42 +37 @@
 
     # Condor scripts
-    GENERATE_EXPOSURE_DAG = '%s/generate_exposure_dag.py %s %s %s' % (IPPDOR_BINARY_PATH, '%s', '%s', '%s')
+    GENERATE_EXPOSURE_DAG = '%s/generate_exposure_dag.py %s %s %s' % (IPPDOR_BINARY_PATH, 
+                                                                      '%s', '%s', '%s')
 
     ###################
@@ -67 +63 @@
     # Stack stage
     STACKTOOL = '%s/stacktool' % IPP_BIN_PATH
-