From 07302d25bf47c7f645b5cb5382c39b259f21e7d2 Mon Sep 17 00:00:00 2001 From: vitaly Date: Thu, 26 Mar 2009 14:19:39 +0100 Subject: [PATCH] Use modb-standard-entity-filename instead of hardcoded name That's it: use standard thing. --- elmo/modb-standard.el | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/elmo/modb-standard.el b/elmo/modb-standard.el index 43c3562..f268c3a 100644 --- a/elmo/modb-standard.el +++ b/elmo/modb-standard.el @@ -249,17 +249,20 @@ (defun modb-standard-cleanup-stale-entities (modb path) (message "Removing stale entities...") - (let ((entities (elmo-uniq-list - (mapcar - #'(lambda (x) (/ x modb-standard-divide-number)) - (modb-standard-number-list-internal modb)))) - (files (mapcar #'(lambda(x) - (when (string-match "^entity-\\([0-9]+\\)" x) - (string-to-int (match-string 1 x)))) - (directory-files path nil "^entity-")))) + (let* ((entity-regex + (concat "^" modb-standard-entity-filename "-\\([0-9]+\\)")) + (entities (elmo-uniq-list + (mapcar + #'(lambda (x) (/ x modb-standard-divide-number)) + (modb-standard-number-list-internal modb)))) + (files (mapcar #'(lambda(x) + (when (string-match entity-regex x) + (string-to-int (match-string 1 x)))) + (directory-files path nil entity-regex)))) (dolist (entity (car (elmo-list-diff-nonsortable files entities))) - (ignore-errors (delete-file (expand-file-name - (modb-standard-entity-filename entity) path)))))) + (ignore-errors (delete-file + (expand-file-name + (modb-standard-entity-filename entity) path)))))) (defun modb-standard-save-entity (modb path) (let ((modified (modb-generic-message-modified-internal modb))) -- 2.11.4.GIT