X-Git-Url: https://git.donarmstrong.com/?p=org-ref.git;a=blobdiff_plain;f=doi-utils.org;h=7a22e75452ba174a164791592dfa1987ff7d98f9;hp=b6c54334efd2ba98cd856f7bbc79acbadfcc69c6;hb=f401452f60e5a8458d70b1fc5bd5e920ff599356;hpb=80a423fd2eee1220ad52a76ce9f3ad5580c7944c

diff --git a/doi-utils.org b/doi-utils.org
index b6c5433..7a22e75 100644
--- a/doi-utils.org
+++ b/doi-utils.org
@@ -904,6 +904,7 @@ error."
 
 
 * Adding a bibtex entry from a crossref query
+The idea here is to perform a query on Crossref, get a helm buffer of candidates, and select the entry(ies) you want to add to your bibtex file. You can select a region, e.g. a free form citation, or set of words, or you can type the query in by hand.
 
 #+BEGIN_SRC emacs-lisp :tangle doi-utils.el
 (defun doi-utils-add-entry-from-crossref-query (query bibtex-file)
@@ -948,7 +949,7 @@ error."
 		     ;; just return the candidate
 		     (action . (("Insert bibtex entry" . (lambda (doi)
 							   (doi-utils-add-bibtex-entry-from-doi
-							    (replace-regexp-in-string "^http://dx.doi.org/" "" doi))))
+							    (replace-regexp-in-string "^http://dx.doi.org/" "" doi) ,bibtex-file)))
 				("Open url" . (lambda (doi)
 						(browse-url doi))))))))
       (helm :sources '(source)))))
@@ -1267,15 +1268,16 @@ http://xisbn.worldcat.org/xisbnadmin/doc/api.htm#getmetadata
 #+BEGIN_SRC emacs-lisp :tangle doi-utils.el
 (defun isbn-to-bibtex (isbn bibfile)
   "Get bibtex entry for ISBN and insert it into BIBFILE unless an
-entry with the generated key already exists in the file. "
+entry with the generated key already exists in the file."
   (interactive
    (list
     (read-input
      "ISBN: "
      ;; now set initial input
      (cond
-      ;; If region is active assume we want it
-      ((region-active-p)
+      ;; If region is active and it starts with a number, we use it
+      ((and  (region-active-p)
+	     (s-match "^[0-9]" (buffer-substring (region-beginning) (region-end))))
        (buffer-substring (region-beginning) (region-end)))
       ;; if first entry in kill ring starts with a number assume it is an isbn
       ;; and use it as the guess
@@ -1301,9 +1303,12 @@ entry with the generated key already exists in the file. "
 	 (new-entry)
 	 (new-key))
 
+    ;; check if we got something
     (unless (string= "ok" status)
       (error "Status is %s" status))
 
+    ;; construct an alphabetically sorted bibtex entry. I assume ISBN numbers go
+    ;; with book entries.
     (setq new-entry
 	  (concat "\n@book{,\n"
 		  (mapconcat
@@ -1314,7 +1319,7 @@ entry with the generated key already exists in the file. "
 		   "\n")
 		  "\n}\n"))
 
-    ;; build entry in temp buffer to get the key
+    ;; build entry in temp buffer to get the key so we can check for duplicates
     (setq new-entry (with-temp-buffer
 		      (insert new-entry)
 		      (org-ref-clean-bibtex-entry)
@@ -1329,16 +1334,19 @@ entry with the generated key already exists in the file. "
 		     new-key)))
     (goto-char (point-max))
     (insert new-entry)
-    ;; set key
+    ;; set key. It is simplest to just replace it, even if it is the same.
     (bibtex-beginning-of-entry)
     (re-search-forward bibtex-entry-maybe-empty-head)
     (if (match-beginning bibtex-key-in-head)
 	(delete-region (match-beginning bibtex-key-in-head)
 		       (match-end bibtex-key-in-head)))
     (insert new-key)
-    (bibtex-fill-entry)))
+    (bibtex-fill-entry)
+    (save-buffer)))
 #+END_SRC
 
+
+
 * end of file
 #+BEGIN_SRC emacs-lisp :tangle doi-utils.el
 (provide 'doi-utils)