Changeset 1286 for TI07-MOLES

Timestamp:

06/07/06 17:02:48 (14 years ago)

Author:

lawrence

Message:

Improving the history box in browse, and better
configuration for importing passwords.

Location:

TI07-MOLES/trunk/PythonCode/browse/portal/cgi/browse

Files:

• Utilities.py (modified) (3 diffs)
• browse.config (modified) (2 diffs)
• browseCGI.py (modified) (3 diffs)
• insecure.py (modified) (2 diffs)

TI07-MOLES/trunk/PythonCode/browse/portal/cgi/browse/Utilities.py

@@ -62 +62 @@
 def wrapGetText(element,xpathExpression,multiple=0):
         ''' Wraps a call to ET to get a text object in an error handler '''
+        def none2txt(i):
+            if i is None: return ''
+            return i
         if multiple:
                 r=element.findall(xpathExpression)
@@ -70 +73 @@
         except:
                 rr=['',]
+        rr=map(none2txt,rr) 
         if multiple: 
                 return rr
@@ -99 +103 @@
         return ET.fromstring(r)
 
+def EnumerateString(string):
+    ''' Takes a string, and if it's got a number on the end, increments it,
+    otherwise adds a number on the end, used to differentiate strings which
+    would otherwise be identical '''
+    def addNum(matchObj):
+        s=matchObj.group()
+        return str(int(s)+1)
+    r=re.sub('\d+$',addNum,string)
+    if r==string: r=r+'1'
+    return r
 if __name__=="__main__":
-    x='''<test attr='something'>some content with <a href="target"> display</a> url</test>'''
-    import ElementTree as ET
-    y=ET.fromstring(x)
-    print PrettyPrintHTML(y,['content',])
-    print PrettyPrint(y)
+    s,t='abc12','def'
+    print s,EnumerateString(s),t,EnumerateString(t)
     

TI07-MOLES/trunk/PythonCode/browse/portal/cgi/browse/browse.config

@@ -9 +9 @@
 jarLoc:          returnstubb.jar
 javaBinary:      java
-searchWSDL:     http://superglue.badc.rl.ac.uk/exist/services/Discovery?WSDL
+searchWSDL:      http://superglue.badc.rl.ac.uk/exist/services/Discovery?WSDL
 
 [db]
-#exist:         superglue.badc.rl.ac.uk
+#exist:          superglue.badc.rl.ac.uk
 exist:          glue.badc.rl.ac.uk
 #exist:          gepidae.esc.rl.ac.uk
@@ -25 +25 @@
 Xicon:          /layout/X.gif
 printer:        /layout/printer.gif
-
 ndgLink:        http://ndg.nerc.ac.uk/
 ndgImage:       /layout/ndg_logo.gif
 ndgAlt:         visit ndg
-
 pageLogo:       /layout/browse_header4.gif
 
 [security]
-
-libraryLoc:     /home/bnl/sandboxes/ndg/MOLES/browse/portal/cgi/NDG/
 localAA:        http://glue.badc.rl.ac.uk/attAuthority.wsdl
 localSM:        http://glue.badc.rl.ac.uk/sessionMgr.wsdl
+passwords:      /home/bnl/sandboxes/ndg/TI07-MOLES/passwords.txt
 
 

TI07-MOLES/trunk/PythonCode/browse/portal/cgi/browse/browseCGI.py

@@ -38 +38 @@
                 self.history=RingBuffer(10)
                 self.selected=RingBuffer(5)
-              
+                self.historyNames=RingBuffer(10)
                 self.__load()
                         
@@ -66 +66 @@
             d={'bh':self.history,'sh':self.selected}
             current=d[tag].tolist()
-            if (uri,name) not in current or ignore:
+            # key the uri's by name ... so we can deal with
+            # duplicate abbreviations.
+            names={}
+            for i in current: names[i[1]]=i[0]
+            if ignore: 
                 d[tag].append((uri,name))
+            else:
+                if name in names.keys(): # we might already have it
+                    if names[name]!=uri:
+                        #it's a duplicate name, but not a duplicate uri
+                        d[tag].append((uri,EnumerateString(name)))
+                else: #it's new ...
+                    d[tag].append((uri,name))
                         
         def addToHistory(self,uri,name,ignore=False):
@@ -220 +231 @@
                 jar=self.config.get('services','jarLoc')
                 javabin=self.config.get('services','javaBinary')
-                xml=insecureGetDoc(self.uri,db=db,format=format,jar=jar,javaBin=javabin)
+                passwordFile=self.config.get('security','passwords','passwords.txt')
+                xml=insecureGetDoc(self.uri,db=db,format=format,jar=jar,javaBin=javabin,
+                                   passwordFile=passwordFile)
                 
                 #create document instance

TI07-MOLES/trunk/PythonCode/browse/portal/cgi/browse/insecure.py

@@ -24 +24 @@
 
 def insecureGetDoc(uri,db='glue.badc.rl.ac.uk',format='NDG-B0',
-        jar='./returnstubb.jar',javaBin='java'):
+        jar='./returnstubb.jar',javaBin='java',passwordFile='passwords.txt'):
         ''' Use Kevin's code to get the document from exist '''
         #we assume the URI is of the form repository/localid
@@ -43 +43 @@
         #this file should exist (for the moment) in the cgi directory ...
         #I know that's not very tidy, but it doesn't matter for the moment ...
-        f=file('passwords.txt','r')
+        f=file(passwordFile,'r')
         pw={}
         for host in f.readlines():