Changeset 1925


Ignore:
Timestamp:
22/12/06 16:58:57 (13 years ago)
Author:
lawrence
Message:

Further modifications to wsgi discovery and browse. Discovery now links
to the Dublin Core discovery elements, and some browse functions are
beginning to emerge, but it's still rather broken (and insecure).

Location:
TI07-MOLES/trunk/PythonCode/wsgi
Files:
7 added
4 edited

Legend:

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

    r1905 r1925  
    44442006-12-21 10:18:42,040 INFO Document Load [n=1] took [0.87822508812s] 
    45452006-12-21 10:18:42,040 INFO Document Load [n=1] took [0.87822508812s] 
     462006-12-21 13:21:19,169 INFO Search Request [temperature] took [0.230398893356s] 
     472006-12-21 13:21:19,169 INFO Search Request [temperature] took [0.230398893356s] 
     482006-12-21 13:21:19,169 INFO Search Request [temperature] took [0.230398893356s] 
     492006-12-21 13:21:19,387 INFO Document Load [n=1] took [0.182200908661s] 
     502006-12-21 13:21:19,387 INFO Document Load [n=1] took [0.182200908661s] 
     512006-12-21 13:21:19,387 INFO Document Load [n=1] took [0.182200908661s] 
     522006-12-22 13:26:15,921 INFO Search Request [badc] took [0.10944890976s] 
     532006-12-22 13:26:15,921 INFO Search Request [badc] took [0.10944890976s] 
     542006-12-22 13:26:15,921 INFO Search Request [badc] took [0.10944890976s] 
     552006-12-22 13:26:15,921 INFO Search Request [badc] took [0.10944890976s] 
     562006-12-22 13:26:15,921 INFO Search Request [badc] took [0.10944890976s] 
     572006-12-22 13:26:16,132 INFO Document Load [n=3] took [0.208212852478s] 
     582006-12-22 13:26:16,132 INFO Document Load [n=3] took [0.208212852478s] 
     592006-12-22 13:26:16,132 INFO Document Load [n=3] took [0.208212852478s] 
     602006-12-22 13:26:16,132 INFO Document Load [n=3] took [0.208212852478s] 
     612006-12-22 13:26:16,132 INFO Document Load [n=3] took [0.208212852478s] 
     622006-12-22 13:26:26,416 INFO Search Request [badc] took [0.0608999729156s] 
     632006-12-22 13:26:26,416 INFO Search Request [badc] took [0.0608999729156s] 
     642006-12-22 13:26:26,416 INFO Search Request [badc] took [0.0608999729156s] 
     652006-12-22 13:26:26,416 INFO Search Request [badc] took [0.0608999729156s] 
     662006-12-22 13:26:26,416 INFO Search Request [badc] took [0.0608999729156s] 
     672006-12-22 13:26:26,682 INFO Document Load [n=3] took [0.265089035034s] 
     682006-12-22 13:26:26,682 INFO Document Load [n=3] took [0.265089035034s] 
     692006-12-22 13:26:26,682 INFO Document Load [n=3] took [0.265089035034s] 
     702006-12-22 13:26:26,682 INFO Document Load [n=3] took [0.265089035034s] 
     712006-12-22 13:26:26,682 INFO Document Load [n=3] took [0.265089035034s] 
     722006-12-22 13:40:02,658 INFO Search Request [badc] took [0.0591449737549s] 
     732006-12-22 13:40:02,658 INFO Search Request [badc] took [0.0591449737549s] 
     742006-12-22 13:40:02,658 INFO Search Request [badc] took [0.0591449737549s] 
     752006-12-22 13:40:02,658 INFO Search Request [badc] took [0.0591449737549s] 
     762006-12-22 13:40:02,658 INFO Search Request [badc] took [0.0591449737549s] 
     772006-12-22 13:40:02,885 INFO Document Load [n=3] took [0.225775957108s] 
     782006-12-22 13:40:02,885 INFO Document Load [n=3] took [0.225775957108s] 
     792006-12-22 13:40:02,885 INFO Document Load [n=3] took [0.225775957108s] 
     802006-12-22 13:40:02,885 INFO Document Load [n=3] took [0.225775957108s] 
     812006-12-22 13:40:02,885 INFO Document Load [n=3] took [0.225775957108s] 
     822006-12-22 13:41:19,662 INFO Search Request [badc] took [0.0942490100861s] 
     832006-12-22 13:41:19,662 INFO Search Request [badc] took [0.0942490100861s] 
     842006-12-22 13:41:19,662 INFO Search Request [badc] took [0.0942490100861s] 
     852006-12-22 13:41:19,662 INFO Search Request [badc] took [0.0942490100861s] 
     862006-12-22 13:41:19,662 INFO Search Request [badc] took [0.0942490100861s] 
     872006-12-22 13:41:19,821 INFO Document Load [n=3] took [0.158368110657s] 
     882006-12-22 13:41:19,821 INFO Document Load [n=3] took [0.158368110657s] 
     892006-12-22 13:41:19,821 INFO Document Load [n=3] took [0.158368110657s] 
     902006-12-22 13:41:19,821 INFO Document Load [n=3] took [0.158368110657s] 
     912006-12-22 13:41:19,821 INFO Document Load [n=3] took [0.158368110657s] 
     922006-12-22 15:48:45,811 INFO Search Request [badc] took [0.0980000495911s] 
     932006-12-22 15:48:45,811 INFO Search Request [badc] took [0.0980000495911s] 
     942006-12-22 15:48:45,811 INFO Search Request [badc] took [0.0980000495911s] 
     952006-12-22 15:48:45,811 INFO Search Request [badc] took [0.0980000495911s] 
     962006-12-22 15:48:45,811 INFO Search Request [badc] took [0.0980000495911s] 
     972006-12-22 15:48:45,979 INFO Document Load [n=3] took [0.166875123978s] 
     982006-12-22 15:48:45,979 INFO Document Load [n=3] took [0.166875123978s] 
     992006-12-22 15:48:45,979 INFO Document Load [n=3] took [0.166875123978s] 
     1002006-12-22 15:48:45,979 INFO Document Load [n=3] took [0.166875123978s] 
     1012006-12-22 15:48:45,979 INFO Document Load [n=3] took [0.166875123978s] 
  • TI07-MOLES/trunk/PythonCode/wsgi/ndg.ini

    r1905 r1925  
    1919/cookie=cookieEG 
    2020/layout=layout 
     21/retrieve=ndgWrapRetrieve 
    2122 
    2223[app:layout] 
     
    2728use = DiscoveryFrame 
    2829next = ndgDiscovery 
     30 
     31[filter-app:ndgWrapRetrieve] 
     32use = DiscoveryFrame 
     33next = retrieve 
    2934 
    3035[filter:DiscoveryFrame] 
     
    3944[app:cookieEG] 
    4045paste.app_factory = cookieEG:cookieFactory 
     46 
     47[app:retrieve] 
     48paste.app_factory = ndgRetrieve:retrieveFactory 
  • TI07-MOLES/trunk/PythonCode/wsgi/ndgDiscovery.config

    r1905 r1925  
    6767icon_alt: Catalogue 
    6868service_name: Catalogue 
    69 badc.nerc.ac.uk: %(server)s/browse.py 
    70 default: %(server)s/browse.py 
    71 instance: D=1&uri 
     69badc.nerc.ac.uk: %(server)s/retrieve 
     70default: %(server)s/retrieve 
     71instance: repository=gepidae.esc.rl.ac.uk&format=DC&type=html&uri 
    7272icon_title: Links to the DISCOVERY RECORD for this dataset 
  • TI07-MOLES/trunk/PythonCode/wsgi/renderEntity.py

    r1905 r1925  
    2222        #except: 
    2323        #       contentHTML='' 
     24         
     25        if entity.metadataType is 'DC': 
     26            return entity.toHTML() 
     27         
    2428         
    2529        if entity.metadataType is 'stubB': 
Note: See TracChangeset for help on using the changeset viewer.