Ignore:
Timestamp:
23/12/06 14:04:16 (13 years ago)
Author:
lawrence
Message:

Improvements to wsgi browse, part 1: code

Location:
TI07-MOLES/trunk/PythonCode/wsgi
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • TI07-MOLES/trunk/PythonCode/wsgi/discovery.log

    r1925 r1927  
    1001002006-12-22 15:48:45,979 INFO Document Load [n=3] took [0.166875123978s] 
    1011012006-12-22 15:48:45,979 INFO Document Load [n=3] took [0.166875123978s] 
     1022006-12-23 13:34:19,779 INFO Search Request [badc] took [0.927436828613s] 
     1032006-12-23 13:34:19,779 INFO Search Request [badc] took [0.927436828613s] 
     1042006-12-23 13:34:19,779 INFO Search Request [badc] took [0.927436828613s] 
     1052006-12-23 13:34:19,779 INFO Search Request [badc] took [0.927436828613s] 
     1062006-12-23 13:34:19,779 INFO Search Request [badc] took [0.927436828613s] 
     1072006-12-23 13:34:22,043 INFO Document Load [n=3] took [2.24507212639s] 
     1082006-12-23 13:34:22,043 INFO Document Load [n=3] took [2.24507212639s] 
     1092006-12-23 13:34:22,043 INFO Document Load [n=3] took [2.24507212639s] 
     1102006-12-23 13:34:22,043 INFO Document Load [n=3] took [2.24507212639s] 
     1112006-12-23 13:34:22,043 INFO Document Load [n=3] took [2.24507212639s] 
     1122006-12-23 13:37:00,840 INFO Search Request [badc] took [1.12302708626s] 
     1132006-12-23 13:37:00,840 INFO Search Request [badc] took [1.12302708626s] 
     1142006-12-23 13:37:00,840 INFO Search Request [badc] took [1.12302708626s] 
     1152006-12-23 13:37:00,840 INFO Search Request [badc] took [1.12302708626s] 
     1162006-12-23 13:37:00,840 INFO Search Request [badc] took [1.12302708626s] 
     1172006-12-23 13:37:02,847 INFO Document Load [n=3] took [2.00624489784s] 
     1182006-12-23 13:37:02,847 INFO Document Load [n=3] took [2.00624489784s] 
     1192006-12-23 13:37:02,847 INFO Document Load [n=3] took [2.00624489784s] 
     1202006-12-23 13:37:02,847 INFO Document Load [n=3] took [2.00624489784s] 
     1212006-12-23 13:37:02,847 INFO Document Load [n=3] took [2.00624489784s] 
     1222006-12-23 13:38:04,761 INFO Search Request [badc] took [0.241904973984s] 
     1232006-12-23 13:38:04,761 INFO Search Request [badc] took [0.241904973984s] 
     1242006-12-23 13:38:04,761 INFO Search Request [badc] took [0.241904973984s] 
     1252006-12-23 13:38:04,761 INFO Search Request [badc] took [0.241904973984s] 
     1262006-12-23 13:38:04,761 INFO Search Request [badc] took [0.241904973984s] 
     1272006-12-23 13:38:07,785 INFO Document Load [n=3] took [3.02255296707s] 
     1282006-12-23 13:38:07,785 INFO Document Load [n=3] took [3.02255296707s] 
     1292006-12-23 13:38:07,785 INFO Document Load [n=3] took [3.02255296707s] 
     1302006-12-23 13:38:07,785 INFO Document Load [n=3] took [3.02255296707s] 
     1312006-12-23 13:38:07,785 INFO Document Load [n=3] took [3.02255296707s] 
     1322006-12-23 13:44:58,956 INFO Search Request [badc] took [0.215494155884s] 
     1332006-12-23 13:44:58,956 INFO Search Request [badc] took [0.215494155884s] 
     1342006-12-23 13:44:58,956 INFO Search Request [badc] took [0.215494155884s] 
     1352006-12-23 13:44:58,956 INFO Search Request [badc] took [0.215494155884s] 
     1362006-12-23 13:44:58,956 INFO Search Request [badc] took [0.215494155884s] 
     1372006-12-23 13:44:59,749 INFO Document Load [n=3] took [0.792335033417s] 
     1382006-12-23 13:44:59,749 INFO Document Load [n=3] took [0.792335033417s] 
     1392006-12-23 13:44:59,749 INFO Document Load [n=3] took [0.792335033417s] 
     1402006-12-23 13:44:59,749 INFO Document Load [n=3] took [0.792335033417s] 
     1412006-12-23 13:44:59,749 INFO Document Load [n=3] took [0.792335033417s] 
  • TI07-MOLES/trunk/PythonCode/wsgi/ndgDiscovery.config

    r1925 r1927  
    1111layoutdir:      /home/bnl/sandboxes/ndg/TI07-MOLES/trunk/PythonCode/browse/portal/cgi/layout/ 
    1212layout:         /layout/ 
     13repository:       gepidae.esc.rl.ac.uk 
    1314 
    1415[SEARCH] 
     
    4950 
    5051[NDG_B_SERVICE] 
    51 badc.nerc.ac.uk: %(server)s/browse.py 
     52badc.nerc.ac.uk: %(server)s/retrieve 
    5253icon: %(layout)s/B.gif 
    5354icon_alt: B Service 
    5455icon_title: Links to a METADATA BROWSE view of this dataset 
    5556service_name: B 
    56 instance: uri 
     57instance: repository=%(repository)s&format=NDG-B1&type=html&uri 
    5758 
    5859[RELATED] 
     
    6970badc.nerc.ac.uk: %(server)s/retrieve 
    7071default: %(server)s/retrieve 
    71 instance: repository=gepidae.esc.rl.ac.uk&format=DC&type=html&uri 
     72instance: repository=%(repository)s&format=DC&type=html&uri 
    7273icon_title: Links to the DISCOVERY RECORD for this dataset 
  • TI07-MOLES/trunk/PythonCode/wsgi/renderEntity.py

    r1925 r1927  
    4747        body=contentHTML+relatedHTML+serviceHTML 
    4848        html=''' 
    49                 <DIV id="EntityContent"> 
     49                <DIV id=""> 
    5050                <p></p> 
    5151                <h5>%s</h5> 
     
    6666                <tr><td class="lineHead" colspan="3"> 
    6767                <span class="headingO">Links and Services</span></td></tr>''' 
    68         xicon=hyperlink(image(self.config.get('layout','Xicon'),'[X]'),entity.binding.url+'&xml=1') 
     68        xicon=hyperlink(image(self.config.get('layout','Xicon'),'[X]'),entity.binding.url+'&type=xml') 
    6969        html+='<tr><td>%s</td><td> This record rendered in XML </td></tr>'%xicon 
    70         picon=hyperlink(image(self.config.get('layout','printer'),'[Print]'),entity.binding.url+'&text=1') 
     70        picon=hyperlink(image(self.config.get('layout','printer'),'[Print]'),entity.binding.url+'&type=print') 
    7171        html+='<tr><td>%s</td><td> Printable version of XML content</td></tr>'%picon 
    7272        for item in entity.services: 
     
    9696        try: 
    9797        #currently all entities are parsed for these ...  
    98             for item in entity.parameters: 
    99                 html+=''' 
    100                         <tr><td class="line"><b>Parameter</b><br/></td> 
    101                         <td class="line">%s</td></tr>'''%item 
    102          
     98             
     99            if len(entity.parameters)==1:  
     100                html+='''<tr><td class="line">%s</td><td>'''%span('Parameter','keywords') 
     101            else: 
     102                html+='''<tr><td class="line">%s</td><td>'''%span('Parameters','keywords') 
     103            html+=entity.parameters[0] 
     104            for item in entity.parameters[1:]: 
     105                i=item.replace(' ','&nbsp;') 
     106                html+=',&nbsp;&nbsp; %s'%i 
     107            html+='</td></tr>' 
    103108            html+=''' 
    104109                <tr><td class="line"><b>Spatial Coverage</b><br/></td> 
Note: See TracChangeset for help on using the changeset viewer.