make_album organises images into HTML "albums", with thumbnails and

different sized images.  It supports reading the EXIF data out of the
original image and presenting that information.  An example
configuration can be found at:
	http://www.burren.cx/david/files/example_album.tar.gz

3 files changed, 123 insertions, 0 deletions

diff --git a/www/make_album/PLIST b/www/make_album/PLIST
new file mode 100644
index 00000000000..b320e3b02e2
--- /dev/null
+++ b/www/make_album/PLIST
@@ -0,0 +1,11 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2001/12/26 07:51:11 lukem Exp $
+bin/index_albums
+bin/ingest
+bin/make_album
+bin/newimagedir
+bin/populate_master
+lib/cameras.txt
+share/doc/make_album/CHANGES
+share/doc/make_album/README
+share/doc/make_album/TODO
+@dirrm share/doc/make_album
diff --git a/www/make_album/distinfo b/www/make_album/distinfo
new file mode 100644
index 00000000000..001c97ee047
--- /dev/null
+++ b/www/make_album/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1.1.1 2001/12/26 08:01:12 lukem Exp $
+
+SHA1 (make_album_1_6.tar.gz) = 90eae5af7ee5fd3a5e2172e03e131893bb67256d
+Size (make_album_1_6.tar.gz) = 25983 bytes
+SHA1 (patch-aa) = 59e3f3b84be0715ae0250f60615db63686ebf675
diff --git a/www/make_album/patches/patch-aa b/www/make_album/patches/patch-aa
new file mode 100644
index 00000000000..1f95d557851
--- /dev/null
+++ b/www/make_album/patches/patch-aa
@@ -0,0 +1,107 @@
+$NetBSD: patch-aa,v 1.1.1.1 2001/12/26 08:00:58 lukem Exp $
+
+--- make_album.orig	Fri Sep 15 07:43:30 2000
++++ make_album	Wed Dec 26 19:00:26 2001
+@@ -1221,10 +1221,14 @@
+ #
+ sub read_cameras {
+ 	my ($model, $camfile);
++	my (@camfiles) = (
++		$ENV{"CAMERAS_TXT"},
++		$ENV{"HOME"} . "/lib/cameras.txt",
++		$0 . "/../../lib/cameras.txt",
++	);
+ 
+-	if (!defined ($camfile = $ENV{"CAMERAS_TXT"})) {
+-		$camfile = $ENV{"HOME"}."/lib/cameras.txt";
+-	}
++    foreach $camfile (@camfiles) {
++	next if ($camfile eq "");
+ 	if (open(CAMERAS, "<$camfile")) {
+ 		$model = "";
+ 		@camera_models = ();
+@@ -1253,7 +1257,9 @@
+ 			}
+ 		}
+ 		close(CAMERAS);
++		return;
+ 	}
++    }
+ }
+ 
+ # Get EXIF/other info about the image "$tag"
+@@ -1440,7 +1446,7 @@
+ 	print FILE "<img src=\"$tag.jpg\" height=\"$y\" width=\"$x\" />";
+ 	print FILE "</TD>";
+ 	print FILE "</TR><TR><TD>";
+-	print FILE "This img:\n";
++	print FILE "This image:\n";
+ 	foreach $t (@tours) {
+ 		if ($tour{$t}{"dir"} eq ".") {
+ 			$d2 = "";
+@@ -1454,20 +1460,8 @@
+ 		print FILE "</strong>" if ($t eq $tour);
+ 		print FILE "</a>";
+ 	}
+-	print FILE "<hr />Indices:";
+-	foreach $t (@tours) {
+-		if ($tour{$t}{"dir"} eq ".") {
+-			$d2 = "";
+-		} else {
+-			$d2 = $tour{$t}{"dir"}."/";
+-		}
+-		print FILE "<br /><a href=\"";
+-		print FILE $home.$d2."index.htm#$tag\">";
+-		print FILE "<strong>" if ($t eq $tour);
+-		print FILE $t;
+-		print FILE "</strong>" if ($t eq $tour);
+-		print FILE "</a>";
+-	}
++	print FILE "<hr /><a href=\"index.htm#$tag\">Index</a>";
++	print FILE "<hr /><a href=\"".($dir ne "." ? "../" : "")."../index.htm\">Parent directory</a>";
+ 	print FILE "</TD></TR>\n";
+ 	print FILE "<TR><TD>";
+ 	if ($next) {
+@@ -1478,7 +1472,7 @@
+ 	print FILE "</TD></TR>\n";
+ 	print FILE "<TR><TD COLSPAN=2>";
+ 	if ($notes{$tag} ne "") {
+-		print FILE $notes{$tag};
++		print FILE "<CENTER>$notes{$tag}</CENTER>";
+ 	}
+ 	print FILE "<br /><font size=\"-1\">".$x."x".$y." (best";
+ 	if ($x != $image{"master/$tag.tiff"}{"x"} || $y != $image{"master/$tag.tiff"}{"y"}) {
+@@ -1858,9 +1852,9 @@
+ 
+ %image = {};
+ foreach $tag (@tags) {
+-	if (open(IDENTIFY, "identify -cache $im_cache -ping web/thumbs/$tag.jpg|")) {
++	if (open(IDENTIFY, "identify -cache $im_cache web/thumbs/$tag.jpg|")) {
+ 		while (<IDENTIFY>) {
+-			if (/^\S+\s+(\d+)x(\d+)/) {
++			if (/JPEG\s+(\d+)x(\d+)/) {
+ 				$image{"thumbs/$tag.jpg"}{"x"} = $1;
+ 				$image{"thumbs/$tag.jpg"}{"y"} = $2;
+ 			}
+@@ -1890,9 +1884,10 @@
+ 		if ((! -f $file) && -f $file.".gz") {
+ 			$file = $file.".gz";
+ 		}
+-		if (open(IDENTIFY, "identify -ping $file|")) {
++		print "\t$file\n";
++		if (open(IDENTIFY, "identify $file|")) {
+ 			while (<IDENTIFY>) {
+-				if (/^\S+\s+(\d+)x(\d+)/) {
++				if (/TIFF\s+(\d+)x(\d+)/) {
+ 					$image{"master/$tag.tiff"}{"x"} = $1;
+ 					$image{"master/$tag.tiff"}{"y"} = $2;
+ 					$got_size = 1;
+@@ -1961,7 +1956,7 @@
+ 		print INDEX "</td></tr>";
+ 	}
+ 	print INDEX "</table>";
+-	print INDEX "<a href=\"".($dir ne "." ? "../" : "")."../index.htm\">Parent</a>";
++	print INDEX "<br><a href=\"".($dir ne "." ? "../" : "")."../index.htm\">Parent directory</a>";
+ 
+ 	foreach $section (sort {$a <=> $b} keys %section) {
+ 		print INDEX "<hr /><h2>".$section{$section}{"name"}."</h2>\n";