Minor replay issues

[flightgear.git] / scripts / perl / web / mkindex.pl

diff --git a/scripts/perl/web/mkindex.pl b/scripts/perl/web/mkindex.pl
index 0b1cb28fcf539a2496a47b03a4ba80dc223b8bf4..1574369d8e5a26775c319c3eff6edb24f513c263 100755 (executable)
--- a/scripts/perl/web/mkindex.pl
+++ b/scripts/perl/web/mkindex.pl
@@ -35,10 +35,10 @@ $ldir = "Large";
 $sdir = "Small";
 $mdir = "Movies";
 
-$columns = 3;
+$columns = 2;
 
-$wwidth = 170;
-$sheight = 128;
+$swidth = 320;
+$sheight = 233;
 
 $lwidth = 1024;
 $lheight = 768;
@@ -78,7 +78,7 @@ sub is_newer {
 # Make images (both large and small)
 #
 
-@FILES = `ls $src/*.jpg $src/*.JPG $src/*.gif`;
+@FILES = `ls $src/*.jpg $src/*.JPG $src/*.png`;
 
 foreach $file ( @FILES ) {
     chop $file;
@@ -87,15 +87,15 @@ foreach $file ( @FILES ) {
     if ( is_newer( "$src/$file", "$ldir/$file" ) || ! -e "$ldir/$file" ) {
        print "Updating $ldir/$file\n";
        system("cp -f $src/$file $ldir");
-       system("mogrify -geometry $lwidth" . "X" .
-              "$lheight -interlace LINE -quality 80 $ldir/$file");
+       system("mogrify -geometry \'$lwidth" . "X" .
+              "$lheight>\' -interlace LINE -quality 80 $ldir/$file");
     }
 
     if ( is_newer( "$ldir/$file", "$sdir/$file" ) || ! -e "$sdir/$file" ) {
        print "Updating $sdir/$file\n";
        system("cp -f $ldir/$file $sdir");
-       system("mogrify -geometry $swidth" . "X" . 
-              "$sheight -interlace LINE -quality 80 $sdir/$file");
+       system("mogrify -geometry \'$swidth" . "X" . 
+              "$sheight>\' -interlace LINE -quality 80 $sdir/$file");
     }
 }
 
@@ -134,7 +134,7 @@ open( MASTER, "<master.idx" );
 
 while ( <MASTER> ) {
     chop;
-    if ( m/\.jpg$/ || m/\.JPG$/ || m/\.gif$/ ) {
+    if ( m/\.jpg$/ || m/\.JPG$/ || m/\.png$/ ) {
        push @imagelist, $_;
     } else {
        # just ignore everything else
@@ -190,7 +190,7 @@ while ( <MASTER> ) {
        print OUT "<P>\n";
        $j = 1;
        $in_table = 0;
-    } elsif ( m/\.jpg$/ || m/\.JPG$/ || m/\.gif$/ ) {
+    } elsif ( m/\.jpg$/ || m/\.JPG$/ || m/\.png$/ ) {
        # insert image in 3 wide tables
 
        $in_table = 1;
@@ -209,26 +209,24 @@ while ( <MASTER> ) {
            $linkname = `basename $i .jpg`;
         } elsif ( $i =~ m/\.JPG$/ ) {
            $linkname = `basename $i .JPG`;
-        } else {
-           $linkname = `basename $i .gif`;
+        } elsif ($i =~ m/\.png$/ ) {
+           $linkname = `basename $i .png`;
         }
        chop($linkname);
-       # print OUT "<TD WIDTH=220 HEIGHT=160>\n";
-       print OUT "<TD WIDTH=$swidth HEIGHT=$sheight>\n";
 
        $thumbinfo = `identify $sdir/$i`;
        ($name, $type, $geom, $junk) = split(/\s+/, $thumbinfo, 4);
        ($twidth, $theight) = split(/x/, $geom);
        $theight =~ s/\+.*$//;
 
+       # print OUT "<TD WIDTH=220 HEIGHT=160>\n";
+       print OUT "<TD WIDTH=$twidth HEIGHT=$sheight>\n";
+
        print OUT "<A HREF=\"$link/$linkname.html\">";
        print OUT "<IMG WIDTH=$twidth HEIGHT=$theight SRC=\"$sdir/$i\" ALT=\"$linkname\">";
-       print OUT "</A>\n";
+       print OUT "</A><BR>\n";
 
        if ( -f "$src/$linkname.txt" ) {
-           if ( $twidth < $swidth ) {
-               print OUT "<BR>\n";
-           }
            print OUT "<FONT SIZE=-1 id=\"fgfs\">\n";
            open( IN, "<$src/$linkname.txt" );
            while ( <IN> ) {
@@ -237,9 +235,6 @@ while ( <MASTER> ) {
            close( IN );
            print OUT "</FONT>\n";
        } else {
-           if ( $twidth < $swidth ) {
-               print OUT "<BR>\n";
-           }
            print OUT "<FONT SIZE=-1 id=\"fgfs\">\n";
            print OUT "$linkname\n";
            print OUT "</FONT>\n";
@@ -286,17 +281,20 @@ while ( <MASTER> ) {
 
        $thumbinfo = `identify $mdir/$linkname.jpg`;
        ($name, $type, $geom, $junk) = split(/\s+/, $thumbinfo, 4);
+       $geom =~ s/\+.*//;
        ($twidth, $theight) = split(/x/, $geom);
         print "movie thumb geom = $geom  $twidth  $theight\n";
 
        print OUT "<A HREF=\"$mdir/$i\">";
-       print OUT "<IMG WIDTH=$twidth HEIGHT=$theight SRC=\"$mdir/$linkname.jpg\" ALT=\"$linkname\">";
+       if ( -f "$mdir/$linkname.jpg" ) {
+           print OUT "<IMG WIDTH=$twidth HEIGHT=$theight SRC=\"$mdir/$linkname.jpg\" ALT=\"$linkname\">";
+       } else {
+           print OUT "$linkname";
+       }
        print OUT "</A>\n";
 
        if ( -f "$mdir/$linkname.txt" ) {
-           if ( $twidth < $swidth ) {
-               print OUT "<BR>\n";
-           }
+            print OUT "<BR>\n";
            print OUT "<FONT SIZE=-1 id=\"fgfs\">\n";
            open( IN, "<$mdir/$linkname.txt" );
            while ( <IN> ) {
@@ -305,9 +303,7 @@ while ( <MASTER> ) {
            close( IN );
            print OUT "</FONT>\n";
        } else {
-           if ( $twidth < $swidth ) {
-               print OUT "<BR>\n";
-            }
+            print OUT "<BR>\n";
            print OUT "<FONT SIZE=-1 id=\"fgfs\">\n";
            print OUT "$linkname\n";
            print OUT "</FONT>\n";
@@ -343,7 +339,7 @@ while ( <MASTER> ) {
 # Generate Links
 #
 
-# @FILES = `ls $src/*.jpg $src/*.JPG $src/*.gif`;
+# @FILES = `ls $src/*.jpg $src/*.JPG $src/*.png`;
 
 $first = $imagelist[0];
 if ( $first =~ m/\.jpg$/ ) {
@@ -353,8 +349,8 @@ if ( $first =~ m/\.jpg$/ ) {
     # print "  ext = JPG\n";
     $firstname = `basename $first .JPG`;
 } else {
-    # print "  ext = gif\n";
-    $firstname = `basename $first .gif`;
+    # print "  ext = png\n";
+    $firstname = `basename $first .png`;
 }
 chop($firstname);
 
@@ -366,8 +362,8 @@ if ( $last =~ m/\.jpg$/ ) {
     # print "  ext = JPG\n";
     $lastname = `basename $last .JPG`;
 } else {
-    # print "  ext = gif\n";
-    $lastname = `basename $last .gif`;
+    # print "  ext = png\n";
+    $lastname = `basename $last .png`;
 }
 chop($lastname);
 
@@ -394,8 +390,8 @@ for ($i = 0; $i <= $#imagelist; $i++) {
         $linkname = `basename $file .JPG`;
         $ext = "JPG";
     } else {
-        $linkname = `basename $file .gif`;
-        $ext = "gif";
+        $linkname = `basename $file .png`;
+        $ext = "png";
     }
     chop($linkname);
     $nice_name = $linkname;
@@ -408,8 +404,8 @@ for ($i = 0; $i <= $#imagelist; $i++) {
        # print "  ext = JPG\n";
         $prevname = `basename $prev .JPG`;
     } else {
-       # print "  ext = gif\n";
-        $prevname = `basename $prev .gif`;
+       # print "  ext = png\n";
+        $prevname = `basename $prev .png`;
     }
     chop($prevname);
     
@@ -418,7 +414,7 @@ for ($i = 0; $i <= $#imagelist; $i++) {
     } elsif ( $next =~ m/\.JPG$/ ) {
         $nextname = `basename $next .JPG`;
     } else {
-        $nextname = `basename $next .gif`;
+        $nextname = `basename $next .png`;
     }
     chop($nextname);