From mboxrd@z Thu Jan  1 00:00:00 1970
From: Carsten Dominik <cdominik@newartisans.com>
Subject: [Accepted] Always add sitemap file to project files if sitemap is
 requested
Date: Wed, 26 Jan 2011 11:03:33 +0100 (CET)
Message-ID: <20110126100333.ECE09953DE6@u016822.science.uva.nl>
References: <87fwt4keyp.wl%jan.seeger@thenybble.de>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from [140.186.70.92] (port=32947 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Pi2Dv-0004kP-Sp
	for emacs-orgmode@gnu.org; Wed, 26 Jan 2011 05:03:37 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <cdominik@newartisans.com>) id 1Pi2Du-0003cb-MB
	for emacs-orgmode@gnu.org; Wed, 26 Jan 2011 05:03:35 -0500
Received: from u016822.science.uva.nl ([146.50.39.34]:49425)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <cdominik@newartisans.com>) id 1Pi2Du-0003cW-CU
	for emacs-orgmode@gnu.org; Wed, 26 Jan 2011 05:03:34 -0500
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: emacs-orgmode@gnu.org

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?
>