- db_sql_query(ua->db, query, file_delete_handler, (void *)&del);
-
- for (i=0; i < del.num_ids; i++) {
- Mmsg(query, del_File, edit_int64(del.JobId[i], ed1));
- Dmsg1(050, "Delete JobId=%s\n", ed1);
- db_sql_query(ua->db, query, NULL, (void *)NULL);
- /*
- * Now mark Job as having files purged. This is necessary to
- * avoid having too many Jobs to process in future prunings. If
- * we don't do this, the number of JobId's in our in memory list
- * could grow very large.
- */
- Mmsg(query, upd_Purged, edit_int64(del.JobId[i], ed1));
- db_sql_query(ua->db, query, NULL, (void *)NULL);
- Dmsg1(050, "Del sql=%s\n", query);
- }
- edit_uint64_with_commas(del.num_ids, ed1);
- bsendmsg(ua, _("Pruned Files from %s Jobs for client %s from catalog.\n"),
- ed1, client->hdr.name);
+ Mmsg(query, select_job, edit_int64(now - period, ed1),
+ edit_int64(cr.ClientId, ed2));
+ db_sql_query(ua->db, query.c_str(), file_delete_handler, (void *)&del);
+
+ purge_files_from_job_list(ua, del);
+
+ edit_uint64_with_commas(del.num_del, ed1);
+ ua->info_msg(_("Pruned Files from %s Jobs for client %s from catalog.\n"),
+ ed1, client->name());