Changeset 3119 for TI05-delivery


Ignore:
Timestamp:
06/12/07 12:10:59 (12 years ago)
Author:
lawrence
Message:

Minor dif mods and configuration options for discovery standalone service

Location:
TI05-delivery/ows_framework/trunk/ows_server
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • TI05-delivery/ows_framework/trunk/ows_server/ndgDiscovery.config

    r3056 r3119  
    3636# The following should only be needed for debugging some parts of the code when running on sandboxes behind a firewall 
    3737proxyServer:      http://wwwcache3.rl.ac.uk:8080/ 
     38disclaimer:        
    3839 
    3940[SEARCH] 
     
    181182formatDefault=DIF 
    182183icon_title: Links to the DISCOVERY RECORD for this dataset 
     184standalone: True 
    183185 
    184186[OWS_SERVER] 
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/config/ndgMiddleware.py

    r2929 r3119  
    3838        self.globals.icons_R=cf.get('RELATED','icon') 
    3939        self.globals.icons_key=cf.get('layout','key') 
     40        self.globals.standalone=cf.get('DISCOVERY','standalone') 
     41        self.globals.disclaimer=cf.get('default','disclaimer') 
    4042         
    4143        self.globals.discoveryURL=cf.get('SEARCH','discoveryURL') 
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/config/routing.py

    r2946 r3119  
    3434     
    3535    # following is the shell for the rest of the ndg  
     36    map.connect('',controller='discovery')   #remote this when we have something on the main page 
    3637    map.connect('login', controller='login') 
    3738    map.connect('getCredentials', controller='login', action='getCredentials') 
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/models/DIF.py

    r3102 r3119  
    8686        self.distribution=[] 
    8787        for e in helper.findall(self.tree,'Distribution'): 
    88             self.distribution.append(dict([(k,helper.getText(e,k)) for k in  
    89                 ('Fees','Distribution_Media','Distribution_Size','Distribution_Format')])) 
     88            d=dict([(k,helper.getText(e,k)) for k in  
     89                ('Fees','Distribution_Media','Distribution_Size','Distribution_Format')]) 
     90            addit=0 
     91            for k in d:  
     92                if d[k]!='': addit=1 
     93            if addit: self.distribution.append(d) 
    9094        #need entity.parameters, entity.bbox, entity.timeCoverage, entity.curator, entity.creators 
    9195        # nb, two ways of parameters being stored 
     96       
    9297        self.parameters=[] 
    9398        for parameter in helper.findall(self.tree,'Parameters'): 
     
    154159        self.citation=self.briefCitation 
    155160         
     161        #an empty element sends something back, we don't want that: 
    156162        self.personnel=[DIFcontact(helper,f) for f in helper.findall(self.tree,'Personnel')] 
    157          
    158163        #services 
    159164        self.services=[] 
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/ndgPage.kid

    r3088 r3119  
    138138        <center><table><tbody> 
    139139            <tr> 
    140                 <td align="center" width="60%"> 
     140                <td align="left" width="60%"> 
    141141                    <table><tbody> 
    142142                    <tr><td><span py:replace="linkimage(g.ndgLink,g.ndgImage,'NDG')"/></td> 
    143143                    <td> This portal is a product of the <a href="http://ndg.nerc.ac.uk"> NERC DataGrid</a> 
    144                     Not all functionality is completely implemented, bugs and problems are expected </td> 
     144                    ${g.disclaimer} </td> 
    145145                    </tr> 
    146146                    </tbody></table> 
    147147                </td> 
    148148                <td width="40%" align="center"> 
    149                     <div id="loginStatus"> 
     149                    <div py:if="not g.standalone" id="loginStatus"> 
    150150                        <!--! now we choose one of the next two (logged in or not) --> 
    151151                        <div py:if="'ndgSec' in session"><table><tbody><tr><td>  
     
    158158                    </div> 
    159159                </td> 
    160                 <td><span py:replace="linkimage(g.stfcLink,g.stfcImage,'Hosted by the STFC CEDA')"/></td> 
     160                <td align="right"><span py:replace="linkimage(g.stfcLink,g.stfcImage,'Hosted by the STFC CEDA')"/></td> 
    161161            </tr> 
    162162        </tbody></table></center> 
Note: See TracChangeset for help on using the changeset viewer.