www/server/source/planetrss planetrss.pl

[Pavel Kharitonov]

CVSROOT:        /web/www
Module name:    www
Changes by:     Pavel Kharitonov <ineiev>       13/12/09 08:11:45

Modified files:
        server/source/planetrss: planetrss.pl 

Log message:
        Remove <span>s.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/source/planetrss/planetrss.pl?cvsroot=www&r1=1.17&r2=1.18

Patches:
Index: planetrss.pl
===================================================================
RCS file: /web/www/www/server/source/planetrss/planetrss.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- planetrss.pl        9 Dec 2013 04:33:17 -0000       1.17
+++ planetrss.pl        9 Dec 2013 08:11:41 -0000       1.18
@@ -29,7 +29,7 @@
 # Provides argument handling.
 use Getopt::Long;
 
-my $Version = "1.4";
+my $Version = "1.5";
 my $default_lines = 3;
 my $default_length = 200;
 my $head = "<!-- Autogenerated by planetrss.pl ".$Version." -->\n";
@@ -159,9 +159,7 @@
     my $url   = $feed->get ('url');
     my $title = $feed->get ('title');
     my $desc  = $feed->get ('description');
-    my $tail  = "...\n<a href='".$url."'>more</a></p>\n";
-    my $null_tail = "</p>";
-    my $null_head = "";
+    my $tail  = "...\n<a href='".$url."'>more</a>";
     my $d0;
     $head  = ":\n";
 
@@ -173,6 +171,7 @@
 
     # Sanitize description.
     $desc =~ s/&lt;br \/&gt;//gi; $desc =~ s/\s\s+/ /g;
+    $desc = strip_tag ($desc, "span");
     $desc = strip_tag ($desc, "a") unless $a == 1;
     $desc = strip_tag ($desc, "b") unless $b == 1;
     $desc = strip_tag ($desc, "code") unless $code == 1;
@@ -207,7 +206,7 @@
     $desc =~ s/\s\s+/ /g;
 
     # Empty description: no "more", no ":".
-    $tail = $null_tail unless length ($desc);
+    $tail = "" unless length ($desc);
     $head = "" unless length ($desc);
 
     $d0 = $desc;
@@ -240,12 +239,12 @@
       }
 
     # If we print whole description, there is no "more".
-    $tail = $null_tail unless $d0 ne $desc;
+    $tail = "" unless $d0 ne $desc;
 
     # Kill trailing spaces and possible start of tag.
     $desc =~ s/[<\s]*$//;
 
-    if ($tail ne $null_tail)
+    if ($tail ne "")
       {
         # Kill ending commas.
         $desc =~ s/[.,:;]*$//;
@@ -253,5 +252,5 @@
         $tail =~ s/.// if $desc =~ /[!?]$/;
       }
 
-    print "<p><a href='".$url."'>\n".$title ."</a>".$head.$desc.$tail;
+    print "<p><a href='".$url."'>\n".$title ."</a>".$head.$desc.$tail."</p>\n";
   }