Changeset 1282

Timestamp:

11/03/06 16:25:43 (18 years ago)

Author:

mar637

Message:

added filter to only list files with proper project codes

File:

• tags/Release2.1.1b/monitor/cgi-bin/filelist.py (modified) (3 diffs)

tags/Release2.1.1b/monitor/cgi-bin/filelist.py

@@ -1 +1 @@
 #!/usr/bin/python
 import os
+import sre
 from obsconfig import observatory
 
 class FileList:
 
-    def __init__(self, loc=None):
+    def __init__(self, loc=None, projectcode=None):
         self.message ="""Content-Type: text/xml
 
 <?xml version="1.0" encoding="ISO-8859-1"?>"""
-
         self.error = None
         if loc is None:
@@ -21 +21 @@
                 loc = observatory['rpfpath'][loc]
         if os.path.exists(loc) and os.path.isdir(loc):
-            self.files = filter(lambda x: x.lower().endswith("rpf"), os.listdir(loc))
+            rx = sre.compile("\d{4}-\d{2}-d{2}_\d{4}-M\d{3}.rpf.*")
+            self.files = [ f for f in os.listdir(loc) if sre.match(rx, f) ]
+            if projectcode is not None:
+                self.files = [ f for f in self.files if sre.match(projectcode,
+                                                                  f) ]
             if len(self.files) == 0:
                 self.error = "No rpfits files found"
@@ -42 +46 @@
     import cgi
     form = cgi.FieldStorage()
+    pfilter = None
+    if form.has_key('project'):
+        pfilter = form.getfirst("project", None)
     if form.has_key('path'):
         pathindex = form.getfirst("path",0)
-        print FileList(pathindex)
+        print FileList(pathindex, pfilter)
     else:
         print FileList()