Changeset 5039

Timestamp:

Feb 18, 2008, 3:26:42 PM (17 years ago)

Author:

ole

Message:

fiddled

Location:

anuga_core/source/anuga/utilities

Files:

• data_audit.py (modified) (9 diffs)
• test_data_audit.py (modified) (2 diffs)

anuga_core/source/anuga/utilities/data_audit.py

@@ -66 +66 @@
     first_time = True
     all_files_accounted_for = True
-    for dirpath, datafile in identify_datafiles(directory,
+    for dirpath, filename in identify_datafiles(directory,
                                                 extensions_to_ignore,
                                                 directories_to_ignore,
@@ -73 +73 @@
         all_files += 1
         
-        data_filename = join(dirpath, datafile)
-        basename, ext = splitext(datafile)
+        basename, ext = splitext(filename)
         license_filename = join(dirpath, basename + '.lic')
+
 
         # Look for a XML license file with the .lic
@@ -89 +89 @@
             try:
                 license_file_is_valid(license_filename,
-                                      data_filename,
+                                      filename,
                                       dirpath,
                                       verbose=False)
@@ -100 +100 @@
                     doc = xml2object(license_filename)
                 except:
-                    status += 'XML file %s could not be read:' %license_filename
+                    status += 'XML file %s could not be read:'\
+                              %license_filename
                     fid = open(license_filename)
                     status += fid.read()
@@ -116 +117 @@
                 # Print header
                 print '---------------------------------------------'
-                print 'Files that need to be assessed for IP issuses'.ljust(dirwidth), 'Status'
+                msg = 'Files that need to be assessed for IP issuses'
+                print msg.ljust(dirwidth), 'Status'
                 print '---------------------------------------------'
                 first_time = False
 
-            print data_filename + ' (Checksum=%s): '\
-                  %str(compute_checksum(data_filename)), status
+            print filename + ' (Checksum=%s): '\
+                  %str(compute_checksum(join(dirpath, filename))),\
+                  status
 
 
@@ -127 +130 @@
         print
         print 'Audit result for %s:' %dirpath
-        print 'Number of files in audited:  %d' %(all_files)
-        print 'Number of files in verified: %d' %(ok_files)        
+        print 'Number of files audited:  %d' %(all_files)
+        print 'Number of files verified: %d' %(ok_files)        
 
 
@@ -171 +174 @@
 
 
-def license_file_is_valid(license_filename, filename_to_verify,
+def license_file_is_valid(license_filename, data_filename,
                           dirpath='.', verbose=False):
     """Check that XML license file for given filename_to_verify is valid.
 
     Input:
-        license_filename: XML license file
-        file_name_to_verify: The data filename that is being audited
+        license_filename: XML license file (must be an absolute path name)
+        data_filename: The data filename that is being audited
         dir_path: Where the files live
         verbose: Optional verbosity
@@ -194 +197 @@
     """
 
-
-
     doc = xml2object(license_filename)
-    #print doc
-
     
     # Check that file is valid (e.g. all elements there)
@@ -256 +255 @@
     found = False
     for data in datafile:    
-        if data['filename'] == filename_to_verify:
+        if data['filename'] == data_filename:
             found = True
     if not found:
-        msg = 'Specified filename to verify %s ' %filename_to_verify
+        msg = 'Specified filename to verify %s ' %data_filename
         msg += 'did not appear in license file %s' %license_filename
         raise FilenameMismatch, msg                

anuga_core/source/anuga/utilities/test_data_audit.py

@@ -72 +72 @@
         licfid.close()
 
-        licfid = open(license_filename)
+        #licfid = open(license_filename)
         #print licfid.read()
-
-        try:
-            license_file_is_valid(licfid, tmp_name)
+        #licfid.close()
+
+        try:
+            license_file_is_valid(license_filename, tmp_name)
         except CRCMismatch:
             pass
@@ -84 +85 @@
                 
         # Clean up
-        licfid.close()
+        #licfid.close()
         os.remove(license_filename)
         try:
             os.remove(tmp_name)        
         except:
-            # FIXME(Ole)QThis doesn't work on Windows for some reason
+            # FIXME(Ole) This doesn't work on Windows for some reason
             pass