--- scripts/pgallery/src/pgallery.sh	2012/08/29 12:30:35	1.12
+++ scripts/pgallery/src/pgallery.sh	2012/08/29 14:44:04	1.17
@@ -5,7 +5,7 @@
 # can do whatever you want with this stuff. If we meet some day, and you think
 # this stuff is worth it, you can buy me a beer in return Aron Schlesinger
 #
-# $Paefchen: scripts/pgallery/src/pgallery.sh,v 1.11 2012/08/29 11:21:41 as Exp $
+# $Paefchen: scripts/pgallery/src/pgallery.sh,v 1.16 2012/08/29 14:15:50 as Exp $
 #
 
 ARG_TITLE="PGallery"
@@ -33,7 +33,7 @@ BIN_EXIFTRAN="/usr/local/bin/exiftran"
 BIN_EXIF="/usr/local/bin/exif"
 
 MKAKEFILE=".htmakefile"
-VERSION="pgallery-1.2"
+VERSION="pgallery-1.3"
 
 #
 # usage()
@@ -94,14 +94,15 @@ get_my_path()
 html_header()
 {
 	cat <<HTML
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 	<title>$ARG_TITLE</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-		<style type="text/css">
-		<!--
+	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+	<style type="text/css">
+	<!--
 body {
 	background-color: #464646;
 	background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFgAAABYB\
@@ -360,13 +361,13 @@ html_img()
 
 	if [ "$linkb" != "" ]
 	then
-		hlinkb="<a href='$linkb'>back</a>"
+		hlinkb="<a href='$linkb'>prev</a>"
 		olinkb="<a class='left' style='height:${height}px' href='$linkb'></a>"
 	fi
 
 	if [ "$linkn" != "" ]
 	then
-		hlinkn="<a href="$linkn">forward</a>"
+		hlinkn="<a href="$linkn">next</a>"
 		olinkn="<a class='right' style='height:${height}px' href='$linkn'></a>"
 	fi
 
@@ -374,7 +375,7 @@ html_img()
 <div class="box">
 	<div class="nav">
 		<div class="top">
-			<a href="$link">Index</a>&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href="$orig">original</a>&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;$num/$all
+			<a href="$link">index</a>&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href="$orig">original</a>&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;$num/$all
 		</div>
 		<div class="left">$hlinkb</div>
 		<div class="right">$hlinkn</div>
@@ -429,7 +430,7 @@ MAIL
 get_exif_desc()
 {
 	img=$1
-	$BIN_EXIF --ifd=0 --tag=0x010e -m $img 2> /dev/null | iconv -t ISO-8859-1 -f UTF-8 | while read line
+	$BIN_EXIF --ifd=0 --tag=0x010e -m $img 2> /dev/null | while read line
 	do
 		echo "$line<br />"
 	done
@@ -442,7 +443,11 @@ get_exif_ts()
 {
 	img=$1
 	date=$($BIN_EXIF --ifd=EXIF --tag=0x9003 -m $img 2> /dev/null)
-	test "$date" = "" && return 1
+	if [ "$date" = "" ]
+	then
+		echo "-1"
+		return 1
+	fi
 	date -j -f "%Y:%m:%d %T" "$date" "+%s"
 }
 
@@ -484,7 +489,7 @@ get_exif_info()
 			exifinfo="$exifinfo$exif "
 		fi
 	done
-	echo $exifinfo | sed -E -e 's/ mm /mm /' -e 's/ sec./s/' -e 's/ ISO / ISO/' -e 's/ ISO(\/| )/ \1/'
+	echo $exifinfo | sed -E -e 's/ mm /mm /' -e 's/ se(c|k)./s/' -e 's/ ISO / ISO/' -e 's/ ISO(\/| )/ \1/'
 }
 
 #
@@ -562,6 +567,10 @@ do
 	esac
 done
 
+# go to gallery directory
+MY=$(get_my_path)
+cd "$ARG_DIR" || exit 1
+
 # parese info file
 if [ "$ARG_INFOFILE" != "" ]
 then
@@ -575,9 +584,12 @@ then
 	done	
 fi
 
-# go to gallery directory
-MY=$(get_my_path)
-cd "$ARG_DIR" || exit 1
+# paras from iso to utf-8
+for n in $(set | awk -F= '{print $1}')
+do
+	echo "$n" | grep -q '^ARG_' || continue
+	eval "$n=\"\$(echo \"\$$n\" | iconv -f ISO-8859-1 -t UTF-8)\""
+done
 
 # fix url
 if [ "$ARG_URL" != "" ]
@@ -610,6 +622,16 @@ echo 
 
 test $(echo $FLIST | wc -w) -eq 0 && err "error: no image found in \`\`$ARG_DIR''"
 
+# use exif createtime to order images
+FLIST=$(
+	(
+		for file in $FLIST
+		do
+			echo "$(get_exif_ts $file) $file"
+		done
+	) | sort -n | awk '{print $2}'
+)
+
 # find new and to update images
 FLIST_NEW=
 FLIST_UPDATE=
@@ -678,7 +700,7 @@ MAKE
 done
 echo "tns: $targets" >> $MKAKEFILE
 
-#make -f $MKAKEFILE
+make -f $MKAKEFILE
 rm $MKAKEFILE
 
 # create html index
@@ -733,6 +755,14 @@ do
 	) > $imglink
 done
 echo
+
+# .htaccess
+if [ -f .htaccess ]
+then
+	grep -q 'AddCharset UTF-8 .html' < .htaccess || echo "AddCharset UTF-8 .html" >> .htaccess
+else
+	echo "AddCharset UTF-8 .html" > .htaccess
+fi
 
 test "$ARG_MAILTO" = "" && exit 0
 
