--- jigl-old.pl 2004-05-08 16:10:54.197136583 -0700 +++ jigl.pl 2004-05-08 16:15:57.676081426 -0700 @@ -965,7 +965,7 @@ # are we creating a go back link? If so, prepend it to the header but # only if the gburl is not already in the header. if ($opts{gb} && ($aInfo->{header} !~ m//)) { - my $gbStr = "$opts{gbs}
" . $aInfo->{header}; + my $gbStr = "$opts{gbs}
" . $aInfo->{header}; $aInfo->{header} = $gbStr; } @@ -1228,7 +1228,7 @@ if ($opts{ft} or (!(-e $tmpThumbFile))) { # scale the image to the thumbnail size specs print "\r\(" . ($i+1) . "/" . ($#{$albumInfo->{images}}+1) . "\) Scaling $tmpThumbFile $msgPad"; - $cmd = "$scaleProg -scale x$opts{ty} -sharpen 5 \"$tmpFile\" \"$tmpThumbFile\""; + $cmd = "$scaleProg -scale x$opts{ty} -quality 90 \"$tmpFile\" \"$tmpThumbFile\""; $dieMsg = "\nCannot scale the thumbnail image $tmpThumbFile!\n"; system($cmd) == 0 or die $dieMsg; @@ -1307,7 +1307,7 @@ # only scale the slide if it's Y height is greater than # the value of the sy option. if ($albumInfo->{images}[$i]->{height} > $opts{sy}) { - $cmd = "$scaleProg -scale x$opts{sy} -sharpen 5 \"$tmpFile\" \"$tmpSlideFile\""; + $cmd = "$scaleProg -scale x$opts{sy} -quality 90 \"$tmpFile\" \"$tmpSlideFile\""; $dieMsg = "\nCannot scale the slide image!\n"; system($cmd) == 0 or die $dieMsg; } else { @@ -1403,7 +1403,7 @@ $haveComment++; } else { # there was more than one comment line - $desc = $desc . "
" . $albumInfo->{images}[$i]->{exif}->[$j]{val}; + $desc = $desc . "
" . $albumInfo->{images}[$i]->{exif}->[$j]{val}; } } } @@ -1762,10 +1762,10 @@ if ($line =~ /$key/) { if (defined $theme{$key}) { if ($key eq "INDEX-HEADER" and ($albumInfo->{header} eq "")) { - $line =~ s/$key/
/g; + $line =~ s/$key//g; $themeLine = 1; } elsif ($key eq "INDEX-FOOTER" and ($albumInfo->{footer} eq "")) { - $line =~ s/$key/
/g; + $line =~ s/$key//g; $themeLine = 1; } else { # standard theme line. Just replace the tag w/value @@ -1867,26 +1867,7 @@ if ($tmpVar =~ /THUMB-HEIGHT/) { $tmpVar =~ s/THUMB-HEIGHT/$thumbY/g; } - - $col++; # increment the col count - } - - # last column in this row. Remove the tag from the line. - $tmpVar =~ s/IMG-COLUMN//g; - - # print out the sizes and dimensions below the images - if ($opts{skb} or $opts{sxy}) { - - # add the row for the thumbnail size and dimensions - if ($tmpVar =~ /SIZE-DIMENSION-ROW/) { - $tmpVar =~ s/SIZE-DIMENSION-ROW/$theme{"SIZE-DIMENSION-ROW"}/g; - } - - # print out each size/dimension up to the width of - # the row that was just generated - $col1 = 0; - while ($col1 < $col) { - $imgIndex = ($opts{iw} * $row) + $col1; + if ($opts{skb} or $opts{sxy}) { if ($opts{gi} or $opts{gs}) { $slideX = $albumInfo->{images}[$imgIndex]->{slidex}; $slideY = $albumInfo->{images}[$imgIndex]->{slidey}; @@ -1897,13 +1878,6 @@ $slideKb = $albumInfo->{images}[$imgIndex]->{thumbkb}; } - # add a thumbnail to the row - if ($tmpVar =~ /SIZE-DIMENSION-COLUMN/) { - # add tag to the end so the next info can be added - $tmpCol = $theme{"SIZE-DIMENSION-COLUMN"} . "\nSIZE-DIMENSION-COLUMN"; - $tmpVar =~ s/SIZE-DIMENSION-COLUMN/$tmpCol/g; - } - # this slides dimensions and size $tmpDim = $slideX . "x" . "$slideY"; $tmpSize = "(" . $slideKb . ")"; @@ -1923,16 +1897,15 @@ $tmpVar =~ s/THUMB-SIZE//g; } } - $col1++; # increment the column1 count + } - # last column in this row. Remove the tag from the line. - $tmpVar =~ s/SIZE-DIMENSION-COLUMN//g; - } else { - # no size or dimension being printed. remove the tag - $tmpVar =~ s/SIZE-DIMENSION-ROW//g; + $col++; # increment the col count } + # last column in this row. Remove the tag from the line. + $tmpVar =~ s/IMG-COLUMN//g; + $row++; # increment the row count } @@ -1950,11 +1923,13 @@ } # don't link to the current page we're on if ($i == $currPage) { - $tmpVar = $tmpVar . "<$i> "; + $tmpVar = $tmpVar . "| $i "; } else { - $tmpVar = $tmpVar . "[" . $i . "]<\/a> "; + $tmpVar = $tmpVar . "| " . $i . "<\/a> "; } } + $tmpVar =~ s/\|/\[/; + $tmpVar .= "]"; &trimWS($tmpVar); # remove space from the end of the line } $line =~ s/INDEX-NAVI/$tmpVar/g; @@ -1987,79 +1962,29 @@ open(INDEXTMPL,">$gblIndexTmpl") or die "Cannot open $gblIndexTmpl: $!\n"; print INDEXTMPL < - - - - - INDEX-TITLEBAR - - - - - - - - - - - - - - - - - - -
INDEX-TITLE
- -INDEX-HEADER - - - - -
-INDEX-NAVI -

+ + + + + + INDEX-TITLEBAR + + + + +

INDEX-TITLE

+ INDEX-HEADER +
+
+ INDEX-NAVI +
+
PICTURES -
- + + INDEX-FOOTER - - - - -
- - - - -
- - - - -
Created on: TIME-STAMPCreated with jigl
- - +
Created on: TIME-STAMP with jigl
+ endoftemplate @@ -2218,9 +2143,9 @@ # check to see if we need to link the slide to the original if ($opts{lo}) { - $tmpVar = ""; + $tmpVar = "\"Slide:"; } else { - $tmpVar = ""; + $tmpVar = "\"Slide:"; } $line =~ s/SLIDE-IMAGE/$tmpVar/g; @@ -2262,81 +2187,41 @@ open(SLIDETMPL,">$gblSlideTmpl") or die "Cannot open $gblSlideTmpl: $!\n"; print SLIDETMPL < - - - - - Image: ORIG-IMAGE-NAME SLIDE-COUNT - - - - - - - - - -
- - - - - - - - - -
PREV-SLIDE-LINKINDEX-LINK   INFO-LINKNEXT-SLIDE-LINK
- - - - - - - - - -
 
- SLIDE-IMAGE -
- - - - - - - - - - - - - - - - - -
 
- - -
SLIDE-DESCRIPTION
SLIDE-COUNT
-
 
PREV-SLIDE-LINKINDEX-LINK   INFO-LINKNEXT-SLIDE-LINK
- - - -
- + + + + + + Image: ORIG-IMAGE-NAME SLIDE-COUNT + + + + +
+
+
+ + PREV-SLIDE-LINK + + NEXT-SLIDE-LINK + +
+
+ + INDEX-LINK + + SLIDE-COUNT + + INFO-LINK + +
+
+
+
SLIDE-IMAGE
+
+
+ - endoftemplate close SLIDETMPL; @@ -2537,9 +2422,9 @@ # check to see if we need to link the slide to the original if ($opts{lo}) { - $tmpVar = ""; + $tmpVar = "\"Slide:"; } else { - $tmpVar = ""; + $tmpVar = "\"Slide:"; } $line =~ s/INFO-IMAGE/$tmpVar/g; @@ -2554,43 +2439,26 @@ $line =~ s/SLIDE-COUNT/$tmpVar/g; } - if ($line =~ /EXIF-NAME-COL/) { + if ($line =~ /EXIF-COL/) { # returns all the exif names available for this image. # each name (i.e. date, apature, shutter speed, flash...), - # will have a before it, and a
after it. + # will have a before it, and a
after it. # this is really meant to be put in a column # do we have exifInfo to print if ($#{$albumInfo->{images}[$curr0Index]->{exif}} > 0) { - $tmpVar = ""; # clear out the var + $tmpVar = "\n"; # clear out the var # create the exif name column for $j (0 .. $#{$albumInfo->{images}[$curr0Index]->{exif}}) { - $tmpVar = $tmpVar . "$albumInfo->{images}[$curr0Index]->{exif}->[$j]{field}
\n"; - } - } else { - $tmpVar = "No EXIF info available
\n"; - } - $line =~ s/EXIF-NAME-COL/$tmpVar/g; - } - if ($line =~ /EXIF-VAL-COL/) { - # returns all the exif values available for this image. - # each value (corresponding to the names above) - # will have a before it, and a
after it. - # this is really meant to be put in a column - - # do we have exifInfo to print - if ($#{$albumInfo->{images}[$curr0Index]->{exif}} > 0) { - $tmpVar = ""; # clear out the var - - # create the exif value column - for $j (0 .. $#{$albumInfo->{images}[$curr0Index]->{exif}}) { - $tmpVar = $tmpVar . " : $albumInfo->{images}[$curr0Index]->{exif}->[$j]{val}
\n"; + $tmpVar = $tmpVar . " \n \n"; + $tmpVar = $tmpVar . " \n \n"; } + $tmpVar .= "
EXIF Information
$albumInfo->{images}[$curr0Index]->{exif}->[$j]{field}$albumInfo->{images}[$curr0Index]->{exif}->[$j]{val}
"; } else { - $tmpVar = " \n"; + $tmpVar = "

No EXIF Information

"; } - $line =~ s/EXIF-VAL-COL/$tmpVar/g; + $line =~ s/EXIF-COL/$tmpVar/g; } # get the next line to process @@ -2620,120 +2488,48 @@ open(INFOTMPL,">$gblInfoTmpl") or die "Cannot open $gblInfoTmpl: $!\n"; print INFOTMPL < - - - - - Info for image: ORIG-IMAGE-NAME SLIDE-COUNT - - - - - - - - - -
- - - - - - - - - - - - - - - -
PREV-SLIDE-LINKPREV-INFO-LINK NEXT-INFO-LINKNEXT-SLIDE-LINK
INDEX-LINK   THIS-SLIDE-LINK
- - - - - - - - - - - - - - - - - -
 
- - -
- INFO-IMAGE -
- 		- - - - -
- - - - - -
-EXIF-NAME-COL - -EXIF-VAL-COL -
-
- 		 
- - - - - - - - - - - - - - - - - - - - - - -
 
- - -
SLIDE-DESCRIPTION
SLIDE-COUNT
-
 
INDEX-LINK   THIS-SLIDE-LINK
PREV-SLIDE-LINKPREV-INFO-LINK NEXT-INFO-LINKNEXT-SLIDE-LINK
- - -
- + + + + + + Info for image: ORIG-IMAGE-NAME SLIDE-COUNT + + + + +
+
+
+ + PREV-SLIDE-LINK + + PREV-INFO-LINK + + NEXT-INFO-LINK + + NEXT-SLIDE-LINK + +
+
+ + INDEX-LINK + + SLIDE-COUNT + + THIS-SLIDE-LINK + +
+
+
+
+ INFO-IMAGE +
+EXIF-COL +
+
+ - endoftemplate close INFOTMPL; @@ -2893,32 +2689,12 @@ # Header area on index page - - - -

- - - - -
- INDEX-HEADER-INFO -
+

INDEX-HEADER-INFO

 # Footer area on index page - - - -

- - - - -
- INDEX-FOOTER-INFO -
+

INDEX-FOOTER-INFO

 # Table around each row of thumbnails @@ -2926,49 +2702,33 @@ # IMG-ROW and SIZE-DIMENSION-ROW # - - - - +
+
+ IMG-ROW -SIZE-DIMENSION-ROW -
-

# Row of the actual thumbnails # This tag must be present and must contain the IMG-COLUMN tag # - IMG-COLUMN - -# Row of size and dimension information under each slide -# This tag must be present and must contain the SIZE-DIMENSION-COLUMN tag. -# - - -SIZE-DIMENSION-COLUMN - - - # An individual thumbnail # This tag must be present. # - - + +

+ Image: THUMB-FILE +
+
+ THUMB-DIMENSIONS THUMB-SIZE +
+ - -# The size and dimension information for an individual thumbnail -# This tag must be present. -# - - THUMB-DIMENSIONS THUMB-SIZE - endoftheme close THEME;