www/prep FTP ftp.html wrappers-and-scripts/ftp_...

[Karl Berry]

CVSROOT:        /web/www
Module name:    www
Changes by:     Karl Berry <karl>       07/11/05 22:38:40

Modified files:
        prep           : FTP ftp.html 
        prep/wrappers-and-scripts: ftp_convert.pl 

Log message:
        carvalho, ticket 346549

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/prep/FTP?cvsroot=www&r1=1.83&r2=1.84
http://web.cvs.savannah.gnu.org/viewcvs/www/prep/ftp.html?cvsroot=www&r1=1.127&r2=1.128
http://web.cvs.savannah.gnu.org/viewcvs/www/prep/wrappers-and-scripts/ftp_convert.pl?cvsroot=www&r1=1.7&r2=1.8

Patches:
Index: FTP
===================================================================
RCS file: /web/www/www/prep/FTP,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- FTP 31 Oct 2007 21:32:02 -0000      1.83
+++ FTP 5 Nov 2007 22:37:52 -0000       1.84
@@ -67,6 +67,7 @@
 The Americas (other than the U.S.):
 
 Brazil - ftp://ftp.unicamp.br/pub/gnu/
+Brazil - ftp://savannah.c3sl.ufpr.br/savannah-nongnu/, 
http://savannah.c3sl.ufpr.br/, rsync://savannah.c3sl.ufpr.br/savannah/ (also 
mirrors alpha.gnu.org; also available via rsync)
 Canada - ftp://mirror.publicns.net/pub/gnu/gnu/, 
http://mirror.publicns.net/pub/gnu/gnu/
 
 Australia:

Index: ftp.html
===================================================================
RCS file: /web/www/www/prep/ftp.html,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -b -r1.127 -r1.128
--- ftp.html    31 Oct 2007 21:32:02 -0000      1.127
+++ ftp.html    5 Nov 2007 22:37:52 -0000       1.128
@@ -204,6 +204,14 @@
   <li><a href="ftp://ftp.unicamp.br/pub/gnu/";>ftp://ftp.unicamp.br/pub/gnu/</a>
   </li>
  </ul>
+ <ul>
+  <li><a 
href="ftp://savannah.c3sl.ufpr.br/savannah-nongnu/";>ftp://savannah.c3sl.ufpr.br/savannah-nongnu/</a>
+  </li>
+  <li><a href="http://savannah.c3sl.ufpr.br/";>http://savannah.c3sl.ufpr.br/</a>
+  </li>
+  <li><a 
href="rsync://savannah.c3sl.ufpr.br/savannah/">rsync://savannah.c3sl.ufpr.br/savannah/</a>
+  </li>
+ </ul>
  </li>
 </ul>
  <ul>
@@ -663,7 +671,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2007/10/31 21:32:02 $
+$Date: 2007/11/05 22:37:52 $
 <!-- timestamp end -->
 </p>
 </div>

Index: wrappers-and-scripts/ftp_convert.pl
===================================================================
RCS file: /web/www/www/prep/wrappers-and-scripts/ftp_convert.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- wrappers-and-scripts/ftp_convert.pl 23 Sep 2007 22:18:45 -0000      1.7
+++ wrappers-and-scripts/ftp_convert.pl 5 Nov 2007 22:38:24 -0000       1.8
@@ -187,16 +187,11 @@
                                foreach $ftpsite (@ftp_sites)
                                {
                                  ($actual_bits,$extra_bits) = ($ftpsite =~ 
/(\S+)(.*$)/);
-                                       if ($ftpsite =~ /(http:\S+)/ )
-                                       {
+                                       if ($ftpsite =~ /(http:\S+)/ ) {
                                                print "  <li><a 
href=\"$1\">$1</a>\n";
-                                       }
-                                       elsif ($ftpsite =~ /(ftp:\S+)/ )
-                                       {
+                                       } elsif ($ftpsite =~ 
/((ftp|rsync):\S+)/ ) {
                                                print "  <li><a 
href=\"$1\">$1</a>\n";
-                                       }
-                                       else
-                                       {
+                                       } else {
                                                print "  <li><a 
href=\"ftp://$actual_bits\";>$actual_bits</a>$extra_bits\n";
           }
                                        print "  </li>\n";