Changeset 5028

Timestamp:

Feb 13, 2008, 9:59:59 AM (17 years ago)

Author:

ole

Message:

Nicer data_audit API

Files:

• anuga_core/source/anuga/utilities/data_audit.py (modified) (5 diffs)
• create_distribution.py (modified) (1 diff)

anuga_core/source/anuga/utilities/data_audit.py

@@ -73 +73 @@
         all_files += 1
         
-        filename = join(dirpath, datafile)
+        data_filename = join(dirpath, datafile)
         basename, ext = splitext(datafile)
+        license_filename = join(dirpath, basename + '.lic')
 
         # Look for a XML license file with the .lic
         status = 'OK'
         try:
-            fid = open(join(dirpath, basename + '.lic'))
+            fid = open(license_filename)
         except IOError:
             status = 'NO LICENSE FILE'
             all_files_accounted_for = False
         else:
+            fid.close()
+            
             try:
-                license_file_is_valid(fid, datafile, dirpath,
+                license_file_is_valid(license_filename,
+                                      data_filename,
+                                      dirpath,
                                       verbose=False)
             except audit_exceptions, e:
@@ -93 +98 @@
 
                 try:
-                    doc = xml2object(fid)
+                    doc = xml2object(license_filename)
                 except:
-                    status += 'XML file could not be read:'
-                    fid.seek(0)
-                    status += fid.read()                    
+                    status += 'XML file %s could not be read:' %license_filename
+                    fid = open(license_filename)
+                    status += fid.read()
+                    fid.close()
                 else:    
                     status += str(doc)
 
-            fid.close()
+
 
         if status == 'OK':
@@ -114 +120 @@
                 first_time = False
 
-            print filename + ' (Checksum=%s): '\
-                  %str(compute_checksum(filename)), status
+            print data_filename + ' (Checksum=%s): '\
+                  %str(compute_checksum(data_filename)), status
 
 
@@ -165 +171 @@
 
 
-def license_file_is_valid(fid, filename_to_verify,
+def license_file_is_valid(license_filename, filename_to_verify,
                           dirpath='.', verbose=False):
     """Check that XML license file for given filename_to_verify is valid.
 
     Input:
-        fid: Open file object for XML license file
+        license_filename: XML license file
         file_name_to_verify: The data filename that is being audited
         dir_path: Where the files live
@@ -188 +194 @@
     """
 
-    license_filename = fid.name
-
-    doc = xml2object(fid)
+
+
+    doc = xml2object(license_filename)
     #print doc
 

create_distribution.py

@@ -123 +123 @@
 #---------------------------
 print 'Verifying data IP'
-if not IP_verified(distro_dir):
+if not IP_verified(distro_dir, verbose=True):
     msg = 'Files have not been verified for IP.\n'
     msg += 'Each data file must have a license file with it.'