merging from central

This commit is contained in:
Greg Von Kuster
2008-11-10 15:30:20 -05:00
97 changed files with 6635 additions and 685 deletions
@@ -203,6 +203,12 @@ def purge_histories( h, d, m, cutoff_time, remove_from_disk ):
metadata_file.purged = True
metadata_file.flush()
print "%s" % metadata_file.file_name()
for lda in dataset.library_associations:
for metadata_file in m.filter( m.table.c.lda_id==lda.id ).all():
metadata_file.deleted = True
metadata_file.purged = True
metadata_file.flush()
print "%s" % metadata_file.file_name()
dataset_count += 1
try:
disk_space += file_size
@@ -269,6 +275,12 @@ def purge_datasets( d, m, cutoff_time, remove_from_disk ):
metadata_file.purged = True
metadata_file.flush()
print "%s" % metadata_file.file_name()
for lda in dataset.library_associations:
for metadata_file in m.filter( m.table.c.lda_id==lda.id ).all():
metadata_file.deleted = True
metadata_file.purged = True
metadata_file.flush()
print "%s" % metadata_file.file_name()
dataset_count += 1
try:
disk_space += file_size
@@ -319,6 +331,12 @@ def purge_dataset( dataset, d, m ):
metadata_file.purged = True
metadata_file.flush()
print "%s" % metadata_file.file_name()
for lda in dataset.library_associations:
for metadata_file in m.filter( m.table.c.lda_id==lda.id ).all():
metadata_file.deleted = True
metadata_file.purged = True
metadata_file.flush()
print "%s" % metadata_file.file_name()
try:
# Remove associated extra files from disk if they exist
os.unlink( dataset.extra_files_path )