Changeset 4965

Timestamp:

Jan 22, 2008, 6:10:50 PM (17 years ago)

Author:

ole

Message:

A little work on IP tracking

File:

• anuga_core/source/anuga/utilities/data_audit.py (modified) (3 diffs)

anuga_core/source/anuga/utilities/data_audit.py

@@ -17 +17 @@
 audit_exceptions = (NotPublishable, FilenameMismatch, CRCMismatch, Invalid, WrongTags)
 
-def IP_verified(directory):
+def IP_verified(directory, verbose=False):
     """Find and audit potential data files that might violate IP
 
@@ -30 +30 @@
         # Proceed boldly with confidence
         
+    verbose controls standard output.
+    If verbose is False, only diagnostics about failed audits will appear.
+    All files that check OK will pass silently.
+    
 
     """
@@ -46 +50 @@
     all_files_accounted_for = True
     for dirpath, datafile in identify_datafiles(directory):
+        
         filename = join(dirpath, datafile)
-        
-        print filename + ' (Checksum=%s): ' %str(compute_checksum(filename)),
-
         basename, ext = splitext(datafile)
 
         # Look for a XML license file with the .lic
+        status = 'OK'
         try:
             fid = open(join(dirpath, basename + '.lic'))
         except IOError:
-            print 'NO LICENSE FILE'
+            status = 'NO LICENSE FILE'
             all_files_accounted_for = False
         else:
             try:
-                license_file_is_valid(fid, dirpath, verbose=False)
+                license_file_is_valid(fid, dirpath, verbose=verbose)
             except audit_exceptions, e:
                 all_files_accounted_for = False                                
-                print 'LICENSE FILE NOT VALID'
-                print 'REASON:', e
+                status = 'LICENSE FILE NOT VALID'
+                status += 'REASON: %s' %e
 
                 #doc = parse(fid)
                 #pretty_print_tree(doc)
                 fid.seek(0)
-                print fid.read()
-
-            else:        
-                print 'OK'
+                status += fid.read()
+
+            #else:        
+            #    if verbose: print 'OK'
 
             fid.close()
+            
+        if status != 'OK' or verbose is True:
+            print filename + ' (Checksum=%s): '\
+                  %str(compute_checksum(filename)), status
+
+
 
     # Return result