--- loncom/interface/lonrss.pm 2005/11/20 19:37:44 1.6
+++ loncom/interface/lonrss.pm 2006/04/22 20:58:32 1.17
@@ -1,7 +1,7 @@
# The LearningOnline Network
# RSS Feeder
#
-# $Id: lonrss.pm,v 1.6 2005/11/20 19:37:44 www Exp $
+# $Id: lonrss.pm,v 1.17 2006/04/22 20:58:32 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -36,10 +36,13 @@ use Apache::lontexconvert;
use Apache::lonlocal;
use Apache::lonhtmlcommon;
+
sub filterfeedname {
my $filename=shift;
$filename=~s/(\_rss\.html|\.rss)$//;
$filename=~s/\W//g;
+ $filename=~s/\_rssfeed$//;
+ $filename=~s/^nohist\_//;
return $filename;
}
@@ -83,7 +86,7 @@ sub advertisefeeds {
}
foreach my $feed (sort(keys(%feednames))) {
if ($feed!~/^error\:/) {
- my $feedurl='feed://'.$ENV{'HTTP_HOST'}.'/public/'.$udom.'/'.$uname.'/'.$feed.'.rss';
+ my $feedurl='http://'.$ENV{'HTTP_HOST'}.'/public/'.$udom.'/'.$uname.'/'.$feed.'.rss';
my $htmlurl='http://'.$ENV{'HTTP_HOST'}.'/'.$mode.'/'.$udom.'/'.$uname.'/'.$feed.'_rss.html';
$feeds.='
'.$feednames{$feed}.
'
'.($edit?&mt('Edit'):'HTML').': '.$htmlurl.''.
@@ -97,17 +100,29 @@ sub advertisefeeds {
}
}
+sub rss_link {
+ my ($url) = @_;
+ return qq||;
+}
+
{
my $feedcounter;
- sub addentry {
+ sub get_new_feed_id {
$feedcounter++;
- my $id=time.'00000'.$$.'00000'.$feedcounter;
- return &editentry($id,@_);
+ return time().'00000'.$$.'00000'.$feedcounter;
}
}
+sub addentry {
+ my $id=&get_new_feed_id();
+ return &editentry($id,@_);
+}
+
sub editentry {
- my ($id,$uname,$udom,$filename,$title,$description,$url,$status,$encurl,$enclength,$enctype)=@_;
+ my ($id,$uname,$udom,$filename,$title,$description,$url,$status,$encurl,$enctype)=@_;
+ if ($status eq 'deleted') {
+ return &changestatus($id,$uname,$udom,$filename,$status);
+ }
my $feedname=&feedname($filename);
&Apache::lonnet::put('nohist_all_rss_feeds',
{ &filterfeedname($filename) => &displayfeedname($filename,$uname,$udom) },
@@ -117,7 +132,6 @@ sub editentry {
$id.'_description' => $description,
$id.'_link' => $url,
$id.'_enclosureurl' => $encurl,
- $id.'_enclosurelength' => $enclength,
$id.'_enclosuretype' => $enctype,
$id.'_status' => $status},$udom,$uname);
}
@@ -130,7 +144,6 @@ sub changestatus {
$id.'_description',
$id.'_link',
$id.'_enclosureurl',
- $id.'_enclosurelength',
$id.'_enclosuretype',
$id.'_status'],$udom,$uname);
} else {
@@ -138,8 +151,24 @@ sub changestatus {
}
}
+sub changed_js {
+ return <
+ function changed(tform,id) {
+ tform.elements[id+"_modified"].checked=true;
+ }
+
+ENDSCRIPT
+}
+
+sub determine_enclosure_types {
+ my ($url)=@_;
+ my ($ending)=($url=~/\.(\w+)$/);
+ return &Apache::loncommon::filemimetype($ending);
+}
+
sub handler {
- my $r = shift;
+ my ($r) = @_;
my $edit=0;
my $html=0;
@@ -165,15 +194,11 @@ sub handler {
my $feedname=&feedname($filename);
my $displayfeedname=&displayfeedname($filename,$uname,$udom);
if ($html) {
- $r->print(&Apache::lonxml::xmlbegin().&Apache::loncommon::bodytag
- ($displayfeedname,'','','',$udom,
- $env{'form.register'}).<
- function changed(tform,id) {
- tform.elements[id+"_modified"].checked=true;
- }
-
-ENDSCRIPT
+ $r->print(&Apache::loncommon::start_page($displayfeedname,undef,
+ {'domain' => $udom,
+ 'force_register' =>
+ $env{'form.register'}}).
+ &changed_js());
} else {
$r->print("\n".
"\nhttp://".$ENV{'HTTP_HOST'}.'/public/'.$udom.'/'.$uname.'/'.
@@ -182,6 +207,23 @@ ENDSCRIPT
&mt('An RSS Feed provided by the LON-CAPA Learning Content Management System').
'');
}
+# Do we have stuff to store?
+ if ($edit) {
+ my %newsfeed=&Apache::lonnet::dump($feedname,$udom,$uname);
+ foreach my $entry (sort(keys(%newsfeed)),$env{'form.newid'}.'_status') {
+ if ($entry=~/^(\d+)\_status$/) {
+ my $id=$1;
+ if ($env{'form.'.$id.'_modified'}) {
+ &editentry($id,$uname,$udom,$feedname,
+ $env{'form.'.$id.'_title'},
+ $env{'form.'.$id.'_description'},
+ $env{'form.'.$id.'_url'},
+ $env{'form.'.$id.'_status'});
+ }
+ }
+ }
+ }
+ my $newid = &get_new_feed_id();
# Is this user for real?
my $homeserver=&Apache::lonnet::homeserver($uname,$udom);
if ($html) {
@@ -212,7 +254,7 @@ ENDSCRIPT
}
# Get feed items
my %newsfeed=&Apache::lonnet::dump($feedname,$udom,$uname);
- foreach my $entry (sort(keys(%newsfeed))) {
+ foreach my $entry (sort(keys(%newsfeed)),$newid.'_status') {
if ($entry=~/^(\d+)\_status$/) {
my $id=$1;
if ($edit) {
@@ -222,10 +264,11 @@ ENDSCRIPT
'delete' => 'delete',
'store' => 'Store changes');
my %status=();
+ unless ($newsfeed{$id.'_status'}) { $newsfeed{$id.'_status'}='public'; }
$status{$newsfeed{$id.'_status'}}='checked="checked"';
$r->print(<
-
+
@@ -233,7 +276,7 @@ ENDSCRIPT
-
+
@@ -250,10 +293,16 @@ ENDEDIT
"http://".$ENV{'HTTP_HOST'}.
$newsfeed{$id.'_link'}.
($html?("'>".&mt('Read more')."
\n"):"\n"));
+# Enclosure? Get stats
if ($newsfeed{$id.'_enclosureurl'}) {
- $r->print(($html?"".&mt('Enclosure')."":"' />"));
+ my @stat=&Apache::lonnet::stat_file($newsfeed{$id.'_enclosureurl'});
+ if ($stat[7]) {
+# Has non-zero length (and exists)
+ my $enclosuretype=$newsfeed{$id.'_enclosetype'};
+ $r->print(($html?"".&mt('Enclosure')."":"' />"));
+ }
}
if ($html) {
$r->print("\n
\n");
@@ -264,7 +313,7 @@ ENDEDIT
}
}
}
- $r->print("\n".($html?''.($edit?'':'').'