From 64c1b0e561012de1842f21bcbac32b0b097acf05 Mon Sep 17 00:00:00 2001 From: hjp Date: Wed, 26 Aug 1998 10:35:16 +0000 Subject: [PATCH] Old changes (forgot to commit): Read names and positions of gif images from stdin. Doesn't create HTML file any more. New change: Send stderr to /tmp/fotoindex.$$.debug --- fotoindex/GNUmakefile | 13 ++++ fotoindex/fotoindex | 159 ++++++++++-------------------------------- 2 files changed, 51 insertions(+), 121 deletions(-) create mode 100644 fotoindex/GNUmakefile diff --git a/fotoindex/GNUmakefile b/fotoindex/GNUmakefile new file mode 100644 index 0000000..775aaf1 --- /dev/null +++ b/fotoindex/GNUmakefile @@ -0,0 +1,13 @@ +include GNUmakevars +include GNUmakerules + +fotoindex: + +install: /usr/local/bin/fotoindex + + +/usr/local/man/man8/%.8: %.man + $(INSTALL) $< $@ + +clean: + rm -f *.gif *.jpg core foo bar baz diff --git a/fotoindex/fotoindex b/fotoindex/fotoindex index dcc35d8..e68c9a7 100755 --- a/fotoindex/fotoindex +++ b/fotoindex/fotoindex @@ -1,140 +1,57 @@ #!/usr/local/bin/perl +# +# Combine several images into an index image (e.g., for use as an imagemap). +# +# Usage: fotoindex [-o outputfile] [templatefile] +# +# The first three lines give the width and height of the thumbnails and +# the number of thumbnails per row. The remaining lines are file names +# of the images to be combined. -sub splitfields { - my ($line) = @_; - my @result = (); - my $field; - - $off = 0; - $field =~ s/\r?\n//; - - for (;;) { - if (substr($line, $off, 1) eq '"') { - $noff = index($line, '"', $off+1); - if (!$noff) { - print STDERR "$0: splitfields: unterminated field at line $.\n"; - exit(1); - } - $field = substr($line, $off+1, $noff - $off - 1); - push (@result, $field); - #print "splitfields: found field = $field\n"; - $off = $noff + 1; - } else { - if ($noff = index($line, ';', $off)) { - $field = substr($line, $off, $noff - $off); - $off = $noff; - } else { - $field = substr($line, $off); - $off = length($line); - } - push (@result, $field); - #print "splitfields: found field = $field\n"; - } - if (substr($line, $off, 1) ne ';') { return @result } - $off++; - } - - return @result; - -} - -$telreg = "/usr/local/www/offline/wifo/skel/telreg.txt"; -$fotodir = "/usr/local/www/wifo/fotos"; +open(STDERR, ">/tmp/fotoindex.$$.debug"); $giftopnm = "/usr/local/bin/giftopnm"; -$pnmcat = "/usr/local/bin/pnmcat"; -$pnmfile = "/usr/local/bin/pnmfile"; $pnmscale = "/usr/local/bin/pnmscale"; -$ppmquant = "/usr/local/bin/ppmquant"; -$ppmtogif = "/usr/local/bin/ppmtogif"; +$pbmmake = "/usr/local/bin/pbmmake"; +$pnmpaste = "/usr/local/bin/pnmpaste"; $cjpeg = "/usr/local/bin/cjpeg"; -chdir($fotodir) or die "cannot cd to $fotodir: $!"; +if ($ARGV[0] eq "-o") { + shift; + $outputredirect = ">" . shift; +} -open (TELREG, $telreg) or die "cannot open $telreg: $!"; +@file = (<>); +chomp(@file); -$fields = ; -@fields = splitfields($fields); - -for ($i = 0; $i <= $#fields; $i++) { - if ($fields[$i] eq "Familienname") { - $sni = $i; - } elsif ($fields[$i] eq "Vorname") { - $fni = $i; - } elsif ($fields[$i] eq "login") { - $lni = $i; +# Remove empty and comment lines +for ($i = 0; $i <= $#file;) { + if ($file[$i] =~ m/^(\#|\s*$)/ ) { + splice(@file, $i, 1); + } else { + $i++; } } -while () { - @fields = splitfields($_); +$tnw = shift(@file); +$tnh = shift(@file); +$fw = shift(@file); +$fh = int(($#file + 1 + ($fw - 1)) / $fw); - $login = $fields[$lni]; - #print "$login"; - if (-f "$login.gif") { - #print " exists"; - $surname{$login} = $fields[$sni]; - $firstname{$login} = $fields[$fni]; - } - #print "\n"; -} - -@sortedlogins = sort { "${surname{$a}} ${firstname{$a}}" cmp "${surname{$b}} ${firstname{$b}}" } keys(%surname); - -$fw = 9; -$fh = int(($#sortedlogins + 1 + ($fw - 1)) / $fw); +system ("$pbmmake " . $fw * $tnw . " " . $fh * $tnh . "> /tmp/fotoindex.$$.1.pnm"); -$protogif = $sortedlogins[0] . ".gif"; - -open (PNMFILE, "$giftopnm $protogif | $pnmfile |") - or die "cannot get size of $protogif: $!"; - -$pnmfileout = ; -close($pnmfile); - -if ($pnmfileout =~ m/P[PGB]M raw, (\d+) by (\d+) maxval/) { - $gifw = int ($1 / 2); - $gifh = int ($2 / 2); -} else { - printf STDERR "$0: cannot size from pnmfile output $pnmfileout\n"; - exit(1); -} - -open(HTML, ">map.html") or die "cannot open map.html for writing: $!"; - -print HTML "Wifo: Photo Gallery\n"; -print HTML "\n"; -print HTML qq| \n|; -print HTML qq|\n|; - - -@col = (); -for ($i = 0; $i <= $#sortedlogins / $fw; $i ++) { - @row = (); +for ($i = 0; $i < $fh; $i ++) { for ($j = 0; $j < $fw; $j++) { - $login = $sortedlogins[$i * $fw + $j]; - if ($login ne "") { - $sn = $surname{$login}; - $fn = $firstname{$login}; - system ("$giftopnm $login.gif | $pnmscale 0.5 > $login.pnm"); - push (@row, "$login.pnm"); - print HTML qq|$fn $sn\n}; + $pic = $file[$i * $fw + $j]; + if (-f $pic) { + $cmnd = "$giftopnm $pic | $pnmscale -xysize $tnw $tnh > $pic.$$.pnm"; + system ($cmnd); + system ("$pnmpaste $pic.$$.pnm " . $j * $tnw . " " . $i * $tnh . " /tmp/fotoindex.$$.1.pnm > /tmp/fotoindex.$$.2.pnm"); + rename ("/tmp/fotoindex.$$.2.pnm", "/tmp/fotoindex.$$.1.pnm"); + unlink ("$pic.$$.pnm"); } } - system("$pnmcat -leftright " . join(" ", @row) . "> $i.pnm"); - push (@col, "$i.pnm"); - unlink (@row); - } -print HTML "\n"; -print HTML "\n"; -print HTML "\n"; -if (!close (HTML)) { - print "$0: error closing map.html: $!\n"; -} -system("$pnmcat -topbottom -jleft -white " . join(" ", @col) . "| $cjpeg -progressive > map.jpg"); +system("$cjpeg -progressive /tmp/fotoindex.$$.1.pnm $outputredirect"); +unlink ("/tmp/fotoindex.$$.1.pnm");