From: Brett Parker <arch@sommitrealweird.co.uk>
Date: Mon, 14 May 2007 00:28:15 +0000 (+0000)
Subject: Fix caption generation code
X-Git-Tag: release-1.1.1~1
X-Git-Url: https://git.sommitrealweird.co.uk/bpgallery.git/commitdiff_plain/f232d33389ed4f6591337cf05516533040d6018f?ds=inline

Fix caption generation code

* Fixes captions
* Removes silly logging

git-archimport-id: arch@sommitrealweird.co.uk--2005-desktop/bpgallery--mainline--1.1--patch-8
---

diff --git a/bpgallery.sh b/bpgallery.sh
index 247e5a5..50c3b72 100755
--- a/bpgallery.sh
+++ b/bpgallery.sh
@@ -17,7 +17,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-set -e
 set -f
 
 VERSION="1.1.0"
@@ -486,7 +485,6 @@ function generate_pages() {
 			nextpage=${nextimage}.html
 		fi
 		filename=${extradir}${currentimage}
-		echo "'$previouspage' '$currentpage' '$nextpage' '$addlink'" >> /tmp/bpgallery-tmp.log
 		if [ "x$currentpage" != "x" ]; then
 			generate_general_page "$previouspage" "$currentpage" "$nextpage" $addlink
 		fi
@@ -525,8 +523,6 @@ function generate_medium_pages() {
 
 function generate_general_page() {
 
-	echo 'Generating the page...' >> /tmp/bpgallery-tmp.log
-
 	if [[ -z $1 ]]; then
 		previouspage=""
 	fi
@@ -545,7 +541,8 @@ function generate_general_page() {
 	fi
 
 	if [ -r captions.txt ]; then
-		caption=$($GREPCOMMAND -E "^${filename}   " captions.txt); caption=${caption#*    }
+		imagefilename=${filename##*/}
+		caption=$($GREPCOMMAND -E "^${imagefilename}	" captions.txt); caption=${caption#*	}
 	else
 		caption=""
 	fi