Changeset 1925

Timestamp:

22/12/06 16:58:57 (14 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:

• DC.py (added)
• DocumentRetrieve.py (added)
• discovery.log (modified) (1 diff)
• eXistInterface.py (added)
• ndg.ini (modified) (3 diffs)
• ndgDiscovery.config (modified) (1 diff)
• ndgRetrieve.py (added)
• ndg_xqueries.py (added)
• renderEntity.py (modified) (1 diff)
• stubB.py (added)
• xmlHandler.py (added)

TI07-MOLES/trunk/PythonCode/wsgi/discovery.log

@@ -44 +44 @@
 2006-12-21 10:18:42,040 INFO Document Load [n=1] took [0.87822508812s]
 2006-12-21 10:18:42,040 INFO Document Load [n=1] took [0.87822508812s]
+2006-12-21 13:21:19,169 INFO Search Request [temperature] took [0.230398893356s]
+2006-12-21 13:21:19,169 INFO Search Request [temperature] took [0.230398893356s]
+2006-12-21 13:21:19,169 INFO Search Request [temperature] took [0.230398893356s]
+2006-12-21 13:21:19,387 INFO Document Load [n=1] took [0.182200908661s]
+2006-12-21 13:21:19,387 INFO Document Load [n=1] took [0.182200908661s]
+2006-12-21 13:21:19,387 INFO Document Load [n=1] took [0.182200908661s]
+2006-12-22 13:26:15,921 INFO Search Request [badc] took [0.10944890976s]
+2006-12-22 13:26:15,921 INFO Search Request [badc] took [0.10944890976s]
+2006-12-22 13:26:15,921 INFO Search Request [badc] took [0.10944890976s]
+2006-12-22 13:26:15,921 INFO Search Request [badc] took [0.10944890976s]
+2006-12-22 13:26:15,921 INFO Search Request [badc] took [0.10944890976s]
+2006-12-22 13:26:16,132 INFO Document Load [n=3] took [0.208212852478s]
+2006-12-22 13:26:16,132 INFO Document Load [n=3] took [0.208212852478s]
+2006-12-22 13:26:16,132 INFO Document Load [n=3] took [0.208212852478s]
+2006-12-22 13:26:16,132 INFO Document Load [n=3] took [0.208212852478s]
+2006-12-22 13:26:16,132 INFO Document Load [n=3] took [0.208212852478s]
+2006-12-22 13:26:26,416 INFO Search Request [badc] took [0.0608999729156s]
+2006-12-22 13:26:26,416 INFO Search Request [badc] took [0.0608999729156s]
+2006-12-22 13:26:26,416 INFO Search Request [badc] took [0.0608999729156s]
+2006-12-22 13:26:26,416 INFO Search Request [badc] took [0.0608999729156s]
+2006-12-22 13:26:26,416 INFO Search Request [badc] took [0.0608999729156s]
+2006-12-22 13:26:26,682 INFO Document Load [n=3] took [0.265089035034s]
+2006-12-22 13:26:26,682 INFO Document Load [n=3] took [0.265089035034s]
+2006-12-22 13:26:26,682 INFO Document Load [n=3] took [0.265089035034s]
+2006-12-22 13:26:26,682 INFO Document Load [n=3] took [0.265089035034s]
+2006-12-22 13:26:26,682 INFO Document Load [n=3] took [0.265089035034s]
+2006-12-22 13:40:02,658 INFO Search Request [badc] took [0.0591449737549s]
+2006-12-22 13:40:02,658 INFO Search Request [badc] took [0.0591449737549s]
+2006-12-22 13:40:02,658 INFO Search Request [badc] took [0.0591449737549s]
+2006-12-22 13:40:02,658 INFO Search Request [badc] took [0.0591449737549s]
+2006-12-22 13:40:02,658 INFO Search Request [badc] took [0.0591449737549s]
+2006-12-22 13:40:02,885 INFO Document Load [n=3] took [0.225775957108s]
+2006-12-22 13:40:02,885 INFO Document Load [n=3] took [0.225775957108s]
+2006-12-22 13:40:02,885 INFO Document Load [n=3] took [0.225775957108s]
+2006-12-22 13:40:02,885 INFO Document Load [n=3] took [0.225775957108s]
+2006-12-22 13:40:02,885 INFO Document Load [n=3] took [0.225775957108s]
+2006-12-22 13:41:19,662 INFO Search Request [badc] took [0.0942490100861s]
+2006-12-22 13:41:19,662 INFO Search Request [badc] took [0.0942490100861s]
+2006-12-22 13:41:19,662 INFO Search Request [badc] took [0.0942490100861s]
+2006-12-22 13:41:19,662 INFO Search Request [badc] took [0.0942490100861s]
+2006-12-22 13:41:19,662 INFO Search Request [badc] took [0.0942490100861s]
+2006-12-22 13:41:19,821 INFO Document Load [n=3] took [0.158368110657s]
+2006-12-22 13:41:19,821 INFO Document Load [n=3] took [0.158368110657s]
+2006-12-22 13:41:19,821 INFO Document Load [n=3] took [0.158368110657s]
+2006-12-22 13:41:19,821 INFO Document Load [n=3] took [0.158368110657s]
+2006-12-22 13:41:19,821 INFO Document Load [n=3] took [0.158368110657s]
+2006-12-22 15:48:45,811 INFO Search Request [badc] took [0.0980000495911s]
+2006-12-22 15:48:45,811 INFO Search Request [badc] took [0.0980000495911s]
+2006-12-22 15:48:45,811 INFO Search Request [badc] took [0.0980000495911s]
+2006-12-22 15:48:45,811 INFO Search Request [badc] took [0.0980000495911s]
+2006-12-22 15:48:45,811 INFO Search Request [badc] took [0.0980000495911s]
+2006-12-22 15:48:45,979 INFO Document Load [n=3] took [0.166875123978s]
+2006-12-22 15:48:45,979 INFO Document Load [n=3] took [0.166875123978s]
+2006-12-22 15:48:45,979 INFO Document Load [n=3] took [0.166875123978s]
+2006-12-22 15:48:45,979 INFO Document Load [n=3] took [0.166875123978s]
+2006-12-22 15:48:45,979 INFO Document Load [n=3] took [0.166875123978s]

TI07-MOLES/trunk/PythonCode/wsgi/ndg.ini

@@ -19 +19 @@
 /cookie=cookieEG
 /layout=layout
+/retrieve=ndgWrapRetrieve
 
 [app:layout]
@@ -27 +28 @@
 use = DiscoveryFrame
 next = ndgDiscovery
+
+[filter-app:ndgWrapRetrieve]
+use = DiscoveryFrame
+next = retrieve
 
 [filter:DiscoveryFrame]
@@ -39 +44 @@
 [app:cookieEG]
 paste.app_factory = cookieEG:cookieFactory
+
+[app:retrieve]
+paste.app_factory = ndgRetrieve:retrieveFactory

TI07-MOLES/trunk/PythonCode/wsgi/ndgDiscovery.config

@@ -67 +67 @@
 icon_alt: Catalogue
 service_name: Catalogue
-badc.nerc.ac.uk: %(server)s/browse.py
-default: %(server)s/browse.py
-instance: D=1&uri
+badc.nerc.ac.uk: %(server)s/retrieve
+default: %(server)s/retrieve
+instance: repository=gepidae.esc.rl.ac.uk&format=DC&type=html&uri
 icon_title: Links to the DISCOVERY RECORD for this dataset

TI07-MOLES/trunk/PythonCode/wsgi/renderEntity.py

@@ -22 +22 @@
         #except:
         #       contentHTML=''
+        
+        if entity.metadataType is 'DC':
+            return entity.toHTML()
+        
         
         if entity.metadataType is 'stubB':