Changeset 2646

Timestamp:

25/06/07 17:07:54 (12 years ago)

Author:

lawrence

Message:

Interim check in for citation trackback support and
metadata correction from logged in ndg users.

Location:

TI05-delivery/ows_framework/trunk/ows_server/ows_server

Files:

• config/ndgDiscovery.config (modified) (1 diff)
• config/routing.py (modified) (1 diff)
• controllers/retrieve.py (modified) (2 diffs)
• controllers/trackback.py (modified) (1 diff)
• lib/mailer.py (added)
• models/Utilities.py (modified) (3 diffs)
• templates/correct.kid (added)
• templates/stubB.kid (modified) (1 diff)

TI05-delivery/ows_framework/trunk/ows_server/ows_server/config/ndgDiscovery.config

@@ -26 +26 @@
 layout:         /layout/
 #
-
+mailserver:       outbox.rl.ac.uk
+metadataMaintainer: b.n.lawrence@rl.ac.uk
 repository:       glue.badc.rl.ac.uk
 

TI05-delivery/ows_framework/trunk/ows_server/ows_server/config/routing.py

@@ -38 +38 @@
     map.connect('logout', controller='logout')
     map.connect('view/:uri', controller = 'retrieve', action='view')
+    map.connect('askCorrect/:uri', controller='retrieve', action='askCorrect')
+    map.connect('correct/:uri', controller='retrieve', action='correct')
     map.connect('retrieve/:uri', controller = 'retrieve')
 

TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/retrieve.py

@@ -4 +4 @@
 from paste.request import parse_querystring
 from ows_server.models import stubB 
+from ows_server.lib import mailer
 
 #from ows_server.models import ndgRetrieve
@@ -87 +88 @@
         return render_response(r)
     
+    def askCorrect(self,uri):
+        ''' Provide a form (ajaxaciously) so that a user can correct a metadata record'''
+        status=self.__setup(uri)
+        c.uri=self.uri
+        if status: return Response(status)
+        return render_response('correct',fragment=True)
+
     
+    def correct(self,uri):
+        ''' Receive a correction form to update a record and post it to the holder '''
+        status=self.__setup(uri)
+        if 'ndgSec' not in session:
+            return Response('Not Logged In')
+        body='Metadata Change Request for %s'%uri
+        payload='<Change><uri>%s</uri><from>%s</from><Contents>%s</Contents></Change>'%(
+            self.inputs['Identifier'],self.inputs['Submitter'],self.inputs['Comment'])
+        name='ChangeRequestFor_%s.xml'%uri
+        status,message=mailer.mailHandler([self.cf.get('DEFAULT','metadataMaintainer'),],
+                       body,body,xmlAttachments=[(payload,name),],
+                       server=self.cf.get('DEFAULT','mailserver'))
+        if status:
+            c.xml='<p>Success: Mail sent to metadata maintainer</p>'
+        else:
+            c.xml=message
+        return render_response('content')
+        
+
     def __mytb(self):
         ''' Get the trackback info for this page 

TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/trackback.py

@@ -1 +1 @@
 from ows_server.lib.base import *
+from ows_server.lib.mailer import mailHandler
 class TrackbackController(BaseController):
     ''' Provides the pylons controller for recieving trackbacks to NDG documents '''
-    def index(self):
+    def index(self,uri):
+        ''' This is the default trackback receipt method. Note we haven't implemented
+        whitelisting yet '''
+        
+        err=0
+        
         # need to receive a trackback, and mail someone ...
-        return Response('not yet implemented')
+        
+        incoming=request.environ['querystring']
+        keys=incoming.keys()
+        payload='<trackback><uri>%s</uri>'
+        
+        #make sure we have both url and title
+        if 'url' not in keys and 'title' not in keys:
+            err='Incomplete trackback, need both url and title at the every least'
+        for key in keys:
+            payload.append('<%s>%s</%s>'%(key,incoming[key],key))
+        
+        #now get server and trackback recipient.
+        self.cf=request.environ['ndgConfig']
+        
+        server=self.cf.get('DEFAULT','mailserver',None)
+        if server is None:
+            err='Server not configured for trackback (no mail server)'
+        
+        recipient=self.cf.get('DEFAULT','tbrecipient',None)
+        if recipient is None:
+            err='Server not configured for trackback (no recipient)'
+        
+        body='Citation Trackback for %s'%uri
+        name='CitationTrackbackFor_%s.xml'uri
+        
+        
+            
+        if err!=0:
+            c.message=err
+            c.err=1
+        else: 
+            status,message=mailHandler([recipient,],body,body,xmlAttachments=[(payload,name),],
+                server=server)
+            if status:
+                c.err=0
+            else:
+                c.err=1
+                c.message=message
+        
+        return render_response(trackback)

TI05-delivery/ows_framework/trunk/ows_server/ows_server/models/Utilities.py

@@ -15 +15 @@
 import urllib
 import logging
-import smtplib
+
 
 class myConfig:
@@ -162 +162 @@
     
 
-def mailError(recipients,subject,body,sender='ndg@badc.nerc.ac.uk',testing=0,server='localhost'):
-    try:
-        server=smtplib.SMTP(server)
-        server.set_debuglevel(1)
-        toaddr=recipients
-        fromaddr="From: %s\n"% sender
-        message="To: %s\n" % toaddr
-        message+=fromaddr
-        message+="Subject: %s\n" % subject
-        message+=body
-        server.sendmail(fromaddr, toaddr, message)
-        server.quit()
-    except:
-        if testing:
-            raise
-        else:
-            #no failing in real life
-            pass
+
         
 import unittest
@@ -210 +193 @@
     def testidget(self):
         self.assertEqual(idget(self.difxml),'NOCSDAT192')
-    
-    def testMailError(self):
-        target='b.n.lawrence@rl.ac.uk'
-        subject='test from Utilities'
-        body='some information'
-        mailError(target,subject,body,server='outbox.rl.ac.uk',testing=1)
+
 
 if __name__=="__main__":

TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/stubB.kid

@@ -31 +31 @@
                 </div>
             </div> <!-- Metadata Div Ends -->
+       
+            <div id="Corrections">
+            <p> Please use this 
+                <span py:if="'ndgSec' in session">
+                    ${XML(h.link_to_remote("link",dict(update="Corrections", url=h.url_for(action='askCorrect'))))}
+                </span> to enter any errors in the metadata record above.
+            </p>
+            </div>
         </div>
         <div py:replace="footer()"/>