[LON-CAPA-cvs] cvs: loncom /interface lonparmset.pm lonrss.pm

[www]

www		Fri Jun  2 06:02:38 2006 EDT

  Modified files:              
    /loncom/interface	lonparmset.pm lonrss.pm 
  Log:
  Stop generating empty blogs.
  
  
Index: loncom/interface/lonparmset.pm
diff -u loncom/interface/lonparmset.pm:1.309 loncom/interface/lonparmset.pm:1.310
--- loncom/interface/lonparmset.pm:1.309	Fri Jun  2 02:48:54 2006
+++ loncom/interface/lonparmset.pm	Fri Jun  2 06:02:37 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.309 2006/06/02 06:48:54 www Exp $
+# $Id: lonparmset.pm,v 1.310 2006/06/02 10:02:37 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3345,7 +3345,8 @@
                                                    'problemstatus' => 'Problem Status Visible',
 						   'int_pos' => 'Positive Integer',
 						   'int_zero_pos' => 'Positive Integer or Zero',
-						   'hinttries' => 'Number of Tries till Hints appear');
+						   'hinttries' => 'Number of Tries till Hints appear',
+                                                   'numbubbles' => 'Number of Bubbles in Exam Mode');
     if ($standard_parms{$name}) {
 	return $standard_parms{$name}; 
     } else { 
Index: loncom/interface/lonrss.pm
diff -u loncom/interface/lonrss.pm:1.23 loncom/interface/lonrss.pm:1.24
--- loncom/interface/lonrss.pm:1.23	Thu May 18 18:30:11 2006
+++ loncom/interface/lonrss.pm	Fri Jun  2 06:02:37 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # RSS Feeder
 #
-# $Id: lonrss.pm,v 1.23 2006/05/18 22:30:11 albertel Exp $
+# $Id: lonrss.pm,v 1.24 2006/06/02 10:02:37 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -93,8 +93,7 @@
 	$mode='adm';
     }
     foreach my $feed (sort(keys(%feednames))) {
-	if ($feed ne '' 
-	    && ($feed!~/^error\:/) && ($feed!~/^feed\_display\_option\_/)) {
+	if (($feed!~/^error\:/) && ($feed!~/^feed\_display\_option\_/)) {
 	    my $feedurl='http://'.$ENV{'HTTP_HOST'}.'/public/'.$udom.'/'.$uname.'/'.$feed.'.rss';
 	    my $htmlurl='http://'.$ENV{'HTTP_HOST'}.'/'.$mode.'/'.$udom.'/'.$uname.'/'.$feed.'_rss.html';
 	    if ($feednames{'feed_display_option_'.$feed} eq 'hidden') {
@@ -140,7 +139,8 @@
     }
     my $feedname=&feedname($filename);
     &Apache::lonnet::put('nohist_all_rss_feeds',
-			 { &filterfeedname($filename) => &displayfeedname($filename,$uname,$udom) },
+			 { &filterfeedname($filename) => 
+			       (&displayfeedname($filename,$uname,$udom))[0] },
 			 $udom,$uname);
     return &Apache::lonnet::put($feedname,{
 	$id.'_title' => $title,