Changeset 8059


Ignore:
Timestamp:
11/01/12 17:06:55 (8 years ago)
Author:
mnagni
Message:

settings.py paths are now relative
deployment correctly fill the ResponsiblePartyInfo? (But still not mapped in the DB. Waiting for an updated library)
add a logerror to wsgi.conf

Location:
mauRepo/MolesManager/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • mauRepo/MolesManager/trunk/resources/MolesManager_wsgi.conf

    r8057 r8059  
    66        LogLevel warn 
    77 
     8        ErrorLog /var/log/apache2/PROJECT_NAME_PARError.log 
    89    CustomLog /var/log/apache2/PROJECT_NAME_PAR.log combined 
    910 
  • mauRepo/MolesManager/trunk/src/MolesManager/settings.py

    r8057 r8059  
    11# Django settings for MolesManager project. 
    22import os 
     3 
     4def decodeRelativePath(relPath): 
     5    return os.path.join(os.path.dirname(__file__), relPath).replace('\\', '/')     
     6     
     7DJANGO_PROJECT = os.path.dirname(decodeRelativePath('')) 
     8SRC = os.path.dirname(DJANGO_PROJECT) 
     9PROJECT = os.path.dirname(SRC) 
    310 
    411 
     
    107114 
    108115TEMPLATE_DIRS = ( 
    109     os.path.join(os.path.dirname(__file__), 'static/templates').replace('\\', '/')                   
     116    decodeRelativePath('static/templates')                   
    110117    # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". 
    111118    # Always use forward slashes, even on Windows. 
     
    128135) 
    129136 
    130 SITE_ROOT = os.path.dirname(os.path.realpath(__file__)) 
     137SITE_ROOT = DJANGO_PROJECT 
    131138 
    132139# A sample logging configuration. The only tangible logging 
     
    156163MOLES3 = 'moles3' 
    157164MOLES3_DB_CONNECTION = 'postgresql://badc:rotyn217m@neptune.badc.rl.ac.uk:5432/Moles3' 
    158 MOLES3_DB_SCRIPT = '/misc/frigid3/humid1/mnagni/workspaces/moles3/MolesManager/src/sqlTables.py' 
     165MOLES3_DB_SCRIPT = SRC + '/sqlTables.py' 
    159166 
    160167 
     
    162169MIGRATION = 'migration' 
    163170MIGRATION_DB_CONNECTION = 'postgresql://badc:rotyn217m@neptune.badc.rl.ac.uk:5432/Moles3' 
    164 MIGRATION_DB_SCRIPT = '/misc/frigid3/humid1/mnagni/workspaces/moles3/MolesManager/src/libs/migration/db/migrationTables.py' 
     171MIGRATION_DB_SCRIPT = SRC + '/libs/migration/db/migrationTables.py' 
    165172  
  • mauRepo/MolesManager/trunk/src/libs/migration/processor/deployment.py

    r8054 r8059  
    7878 
    7979    def _addResponsiblePartyInfo(self, oldResponsiblePartyInfos, newResponsiblePartyInfo): 
     80        opi = None 
    8081        for oldPartyInfo in oldResponsiblePartyInfos: 
    8182            if oldPartyInfo.role == newResponsiblePartyInfo.role: 
    82                 oldPartyInfo.party.append(newResponsiblePartyInfo.party) 
     83                opi = oldPartyInfo 
     84        if len(oldResponsiblePartyInfos) == 0: 
     85            oldResponsiblePartyInfos.append(newResponsiblePartyInfo) 
     86         
     87        if opi is not None:  
     88            opi.party.append(newResponsiblePartyInfo.party) 
     89         
    8390 
    8491 
Note: See TracChangeset for help on using the changeset viewer.