Changeset 772

Timestamp:

07/04/06 17:13:21 (14 years ago)

Author:

lawrence

Message:

This version calls documents from exist, loads and transforms them
using xalan.
To-do:

(1) results are not yet acceptable,
(2) need to get and parse the security metadata
(3) need to connect to Phil's security code.

Location:

TI07-MOLES/trunk/StubB/XSLT/browse/portal/cgi

Files:

• browseCGI.py (modified) (2 diffs)
• insecure.py (modified) (2 diffs)

TI07-MOLES/trunk/StubB/XSLT/browse/portal/cgi/browseCGI.py

@@ -33 +33 @@
                 #try:
                 self.xml=insecureGetDoc(uri)
+                #self.xml=uri
                 #except:
                 #       raise 'NotFound'
@@ -49 +50 @@
         
         def toHTML(self):
-                return doXSLT(self.xml,self.xsltMethod)
-                
+                x=doXSLT(self.xml,xsltMethod=self.xsltMethod)
+                #return '<p>%s</p>'%x
+                return x
+        
 class CGIcontroller:
         ''' Currently holds the cgi environment and controls '''

TI07-MOLES/trunk/StubB/XSLT/browse/portal/cgi/insecure.py

@@ -8 +8 @@
 #
 
-import os, os.path, tmpfile
+import os
+import os.path
+import tempfile
 
 def jarLoc(jar):
         #don't want the jar in the cgi directory ... not quite sure why, but 
-        #it seems wrong ...
+        #it seems wrong ... having made that decision, we have to bugger
+        #around with relative paths depending on whether this is test code 
+        #(outside the cgi environment) or in the cgi environment
         cwd=os.getcwd()
         return os.path.normpath(os.path.join(cwd,jar))
 
-def insecureGetDoc(uri):
+def osCommand(cmd):
+        stdin,stdout,stderr=os.popen3(cmd)
+        error=stderr.readlines()
+        if error !=[]:
+                return 1,error
+        else:
+                s=''
+                for i in stdout.readlines():s+=i
+                return 0,s
+
+def insecureGetDoc(uri,jar='./returnmoles.jar'):
         ''' Use Kevin's code to get the document from exist '''
         #we assume the URI is of the form repository/localid
@@ -25 +39 @@
                 return 'Invalid URI'
         else:
-                returnMolesJar=jarLoc('./returnmoles.jar')
+                returnMolesJar=jarLoc(jar)
                 cmd='java -jar %s %s %s xmldb:exist://glue.badc.rl.ac.uk:8080/exist/xmlrpc'%(
                 returnMolesJar,repPath,localID)
-                try:
-                        stdin,stdout,stderr=os.popen3(cmd)
-                except:
-                        return 'Unable to Obtain Document'
-                error=stderr.readlines()
-                if error!=[]:
-                        #return returnMolesJar
-                        return error
-                else:
-                        return stdout.readlines()
+                status,result=osCommand(cmd)
+                return result
         
-def doXSLT (document,xsltMethod):
+def doXSLT (document,jar='./xalan-j_2_7_0/xalan.jar',xsltMethod=None):
         ''' Handle a possibly external transformation to produce an html page '''
-        
         #use temporary files for the moment, ugly, but it will work.
         # consider using pyana or some other way of doing this later ...
         #try:
-        fn=tmpfile('ndg-xml')
+        #return 'done'
+        fn=tempfile.mktemp('.ndg-xml')
         f=file(fn,'wb')
         f.write(document)
         f.close()
-        on=tmpfile('ndg-xml')
-        xalanjar=jarLoc('./xalan=j_2_7_0/xalan.jar')
-        xslt=jarLoc('./xslt')
-        cmd='java -cp %s -IN %s -XSL %s -OUT %s'%(xalanjar,fn,xslt,on)
-        
+        on=tempfile.mktemp('.ndg-xml')
+        xalanjar=jarLoc(jar)
+        xslt=jarLoc('./xslt/stubb_2_browse.xsl')
+        cmd='java -cp %s org.apache.xalan.xslt.Process -IN %s -XSL %s -OUT %s'%(xalanjar,fn,xslt,on)
+        status,result=osCommand(cmd)
+        if status:
+                return result
+        else:
+                f=file(on,'r')
+                result=''
+                for i in f.readlines(): result+=i
+                f.close()
+                r=os.remove(fn)
+                r=os.remove(on)
+                return result
         
 if __name__=="__main__":
-        print insecureGetDoc('badc.nerc.ac.uk/dataent13')
+        d= insecureGetDoc('badc.nerc.ac.uk/dataent13',jar='../returnmoles.jar')
+        #print d
+        dd=doXSLT(d,jar='../xalan-j_2_7_0/xalan.jar')
+        print dd