From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matt Lundin Subject: [PATCH 2/4] Warn if duplicate ID is created Date: Sun, 1 May 2011 16:55:29 -0400 Message-ID: <87liyqnnab.fsf@fastmail.fm> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([140.186.70.92]:56953) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QGdqh-0003Gp-8C for emacs-orgmode@gnu.org; Sun, 01 May 2011 17:06:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QGdqg-0006Sd-9f for emacs-orgmode@gnu.org; Sun, 01 May 2011 17:06:39 -0400 Received: from out2.smtp.messagingengine.com ([66.111.4.26]:46987) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QGdqg-0006SY-6Y for emacs-orgmode@gnu.org; Sun, 01 May 2011 17:06:38 -0400 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Org Mode * lisp/org-bibtex.el (org-bibtex-key-property): When storing key in ID, warn if a duplicate ID is generated. --- lisp/org-bibtex.el | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/lisp/org-bibtex.el b/lisp/org-bibtex.el index f54a6bf..cf7fc49 100644 --- a/lisp/org-bibtex.el +++ b/lisp/org-bibtex.el @@ -239,7 +239,6 @@ not placed in the exported bibtex entry." :group 'org-bibtex :type 'boolean) -;; TODO if ID, test to make sure ID is unique (defcustom org-bibtex-key-property "CUSTOM_ID" "Property that holds the bibtex key. By default, this is CUSTOM_ID, which enables easy linking to @@ -364,10 +363,19 @@ This variable is relevant only if `org-bibtex-export-tags-as-keywords` is t." "Generate an autokey for the current headline" (org-bibtex-put org-bibtex-key-property (if org-bibtex-autogen-keys - (let ((entry (org-bibtex-headline))) - (with-temp-buffer - (insert entry) - (bibtex-generate-autokey))) + (let* ((entry (org-bibtex-headline)) + (key + (with-temp-buffer + (insert entry) + (bibtex-generate-autokey)))) + ;; test for duplicate IDs if using global ID + (when (and + (equal org-bibtex-key-property "ID") + (featurep 'org-id) + (hash-table-p org-id-locations) + (gethash key org-id-locations)) + (warn "Another entry has the same ID")) + key) (read-from-minibuffer "id: ")))) (defun org-bibtex-fleshout (type &optional optional) -- 1.7.5