[PATCH] Always add sitemap file to project files if sitemap is requested

[PATCH] Always add sitemap file to project files if sitemap is requested

[Jan Seeger]

[-- Attachment #1: Type: text/plain, Size: 407 bytes --]

Greetings!

I noticed some wonkiness in getting my sitemap created on my webserver
when pushing my website, and the problem seems to lie in
org-publish-get-base-files only returning existing files, and not
picking up on the soon to be generated sitemap. My patch always adds
the sitemap file to the list of returned files if a sitemap is
requested, regardless of if it exists or not.

Regards, Jan Seeger



[-- Attachment #2: org-publish.patch --]
[-- Type: text/plain, Size: 908 bytes --]

diff --git a/lisp/org-publish.el b/lisp/org-publish.el
index f29b402..baf282a 100644
--- a/lisp/org-publish.el
+++ b/lisp/org-publish.el
@@ -434,6 +434,9 @@ matching filenames."
 	 ;; org-publish-compare-directory-files:
 	 (sitemap-requested
 	  (plist-get project-plist :auto-sitemap))
+	 (sitemap-filename
+	  (or (plist-get project-plist :sitemap-filename)
+	      "sitemap.org"))
 	 (sitemap-sort-folders
 	  (if (plist-member project-plist :sitemap-sort-folders)
 	      (plist-get project-plist :sitemap-sort-folders)
@@ -454,6 +457,9 @@ matching filenames."
       (setq sitemap-sort-folders nil))
 
     (setq org-publish-temp-files nil)
+    (if sitemap-requested
+	(pushnew (expand-file-name (concat base-dir sitemap-filename))
+		  org-publish-temp-files))
     (org-publish-get-base-files-1 base-dir recurse match
 				  ;; FIXME distinguish exclude regexp
 				  ;; for skip-file and skip-dir?

[-- Attachment #3: Type: text/plain, Size: 1 bytes --]



[-- Attachment #4: Type: text/plain, Size: 201 bytes --]

_______________________________________________
Emacs-orgmode mailing list
Please use `Reply All' to send replies to the list.
Emacs-orgmode@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-orgmode

[Accepted] Always add sitemap file to project files if sitemap is requested

[Carsten Dominik]

Patch 523 (http://patchwork.newartisans.com/patch/523/) is now "Accepted".

Maintainer comment: none

This relates to the following submission:

http://mid.gmane.org/%3C87fwt4keyp.wl%25jan.seeger%40thenybble.de%3E

Here is the original message containing the patch:

> Content-Type: text/plain; charset="utf-8"
> MIME-Version: 1.0
> Content-Transfer-Encoding: 7bit
> Subject: [Orgmode] Always add sitemap file to project files if sitemap is
> 	requested
> Date: Fri, 07 Jan 2011 18:42:22 -0000
> From: Jan Seeger <jan.seeger@thenybble.de>
> X-Patchwork-Id: 523
> Message-Id: <87fwt4keyp.wl%jan.seeger@thenybble.de>
> To: emacs-orgmode@gnu.org
> 
> Greetings!
> 
> I noticed some wonkiness in getting my sitemap created on my webserver
> when pushing my website, and the problem seems to lie in
> org-publish-get-base-files only returning existing files, and not
> picking up on the soon to be generated sitemap. My patch always adds
> the sitemap file to the list of returned files if a sitemap is
> requested, regardless of if it exists or not.
> 
> Regards, Jan Seeger
> 
> 
> diff --git a/lisp/org-publish.el b/lisp/org-publish.el
> index f29b402..baf282a 100644
> --- a/lisp/org-publish.el
> +++ b/lisp/org-publish.el
> @@ -434,6 +434,9 @@ matching filenames."
>  	 ;; org-publish-compare-directory-files:
>  	 (sitemap-requested
>  	  (plist-get project-plist :auto-sitemap))
> +	 (sitemap-filename
> +	  (or (plist-get project-plist :sitemap-filename)
> +	      "sitemap.org"))
>  	 (sitemap-sort-folders
>  	  (if (plist-member project-plist :sitemap-sort-folders)
>  	      (plist-get project-plist :sitemap-sort-folders)
> @@ -454,6 +457,9 @@ matching filenames."
>        (setq sitemap-sort-folders nil))
>  
>      (setq org-publish-temp-files nil)
> +    (if sitemap-requested
> +	(pushnew (expand-file-name (concat base-dir sitemap-filename))
> +		  org-publish-temp-files))
>      (org-publish-get-base-files-1 base-dir recurse match
>  				  ;; FIXME distinguish exclude regexp
>  				  ;; for skip-file and skip-dir?
>