Emergency Closing Handler Should reference the Default Hold shelf expire interval

The Emergency Closing Handler does not take into account the default hold shelf expire interval when updating the hold shelf expire date. Actually, I think this pertains to closed days in general. If the number of days closed is greater than the Default Hold shelf expire Interval, the shelf expire time is set to the first opening day, regardless of how long the hold has been on the shelf.

It would be nice if the handler took into account the number of days items have already been on the shelf, and the default expire interval and added the number of days appropriately to the first opening date.