--- CVSROOT/cvs2rss.pl	2005/10/11 22:11:16	1.2
+++ CVSROOT/cvs2rss.pl	2005/10/24 21:38:14	1.8
@@ -46,19 +46,22 @@ my $description;
 my @title=split(",",$ARGV[0]);
 
 my $rss = new XML::RSS(version => '2.0');
-$rss->channel(
-	title=> $channelTitle,
-	link => $channelLink,
-	language => 'en',
-	description => $channelTitle,
-	copyright => '(c) 2005 MSU Board of Trustees.'
-);
 
 # If rssFeed exists, parse it
 if (-r "$rssFeed") {
-	$rss->parsefile($rssFeed);
+    $rss->parsefile($rssFeed);
 }
 
+$rss->channel(
+	      title=> $channelTitle,
+	      link => $channelLink,
+	      language => 'en',
+	      description => $channelTitle,
+	      copyright => '(c) 2005 MSU Board of Trustees.',
+	      pubDate => $pubDate 
+	      );
+
+
 # Limit entries in the feed to $numEntries
 pop(@{$rss->{'items'}}) while (@{$rss->{'items'}} >= $numEntries);
 
@@ -68,45 +71,49 @@ $title[0] =~s/ /\//;
 
 # Format the cvslog msg itself
 while (<STDIN>) {
-	chomp($_);
-	if ($_=~/^[A-Z].*:\s*$/) {
-		$_ = "<br /><b>" . $_ . "</b><br />";
-	}
-	else {
-		$_ .= "<br />";
-	}
-	$description .= $_;
+    chomp($_);
+    if ($_=~/^[A-Z].*:\s*$/) {
+	$_ = "<br /><b>" . &HTML::Entities::encode($_,'<>&"') . "</b><br />";
+    } else {
+	$_ = &HTML::Entities::encode($_,'<>&"');
+	$_ .= "<br />";
+    }
+    $description .= $_;
 }
 
-if ($cvsDiff == 1) {
-	# If the old version of the file is not NONE (if it isn't a new file), and if it is a .txt or .java file (that has no html)
-	# This will rdiff it against the previous version, and include that diff in the rss feed
-
-	if (($title[1] != "NONE") && ($title[0]=~/(.*).(pm)$/)){
-		my $tmpFile = "/tmp/diff.$$";
-		my $cmdLine = "cvs -n rdiff -kk -r " . $title[1] .  " -r " . $title[2] . " " . $title[0] . ">" . $tmpFile;
-		system($cmdLine);
-
-		$description .= "<br /><b>Differences:</b><br /><pre>";
-		open CVSDIFF, "<" . $tmpFile;
-		foreach my $line (<CVSDIFF>) {
-			$description .= &HTML::Entities::encode($line,'<>&"');
-		}
-		$description .= "</pre>";
-		unlink($tmpFile);   
-	} 
+if ($cvsDiff == 1) { 
+
+    # If the old version of the file is not NONE (if
+    # it isn't a new file), and if it is a pm/pl/conf/tab file.
+    # This will rdiff it against the previous version, and
+    # include that diff in the rss feed
+
+    if (($title[1] != "NONE") && ($title[0]=~/(.*).(pm|pl|conf|tab)$/)){
+	my $tmpFile = "/tmp/diff.$$";
+	my $cmdLine = "cvs -n rdiff -u -kk -r " . $title[1] .  " -r " . $title[2] . " " . $title[0] . ">" . $tmpFile;
+	system($cmdLine);
+	
+	$description .= "<br /><b>Differences:</b><br /><pre>";
+	open CVSDIFF, "<" . $tmpFile;
+	foreach my $line (<CVSDIFF>) {
+	    $description .= &HTML::Entities::encode($line,'<>&"');
+	}
+	$description .= "</pre>";
+	unlink($tmpFile);   
+    } 
 }
 
 $rss->add_item(
-	title => "/" . $title[0] . " - " . $title[1] . "/" . $title[2],
-	author => $author,
-	pubDate => $pubDate, 
-	description=> $description,
-	mode => 'insert'
-);		
+	       title => "/" . $title[0] . " - " . $title[1] . "/" . $title[2],
+	       author => $author,
+	       description=> $description,
+	       mode => 'insert',
+	       pubDate => $pubDate,
+	       link => 'http://install.loncapa.org/cgi-bin/cvsweb.cgi/'.$title[0].'.diff?r1='.$title[1].';r2='.$title[2].';f=h'
+	       );		
 
 foreach my $element (@{$rss->{'items'}}) {
-	$element->{'description'} = &HTML::Entities::encode($element->{'description'},'<>&"'); 
+    $element->{'description'} = &HTML::Entities::encode($element->{'description'},'<>&"'); 
 }
 
 $rss->save($rssFeed);