--- loncom/interface/londocs.pm 2002/08/20 13:02:41 1.8
+++ loncom/interface/londocs.pm 2002/09/04 13:06:20 1.16
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.8 2002/08/20 13:02:41 www Exp $
+# $Id: londocs.pm,v 1.16 2002/09/04 13:06:20 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -34,11 +34,12 @@ use Apache::lonnet;
use Apache::loncommon;
use Apache::lonratedt;
use Apache::lonratsrv;
+use Apache::lonxml;
my $iconpath;
# Mapread read maps into lonratedt::global arrays
-# @links and @resources, determines status
+# @order and @resources, determines status
# sets @order - pointer to resources in right order
# sets @resources - array with the resources with correct idx
#
@@ -54,23 +55,100 @@ sub storemap {
my ($coursenum,$coursedom,$map)=@_;
return
&Apache::lonratedt::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'.
- $map);
+ $map,1);
}
sub editor {
my ($r,$coursenum,$coursedom,$folder,$allowed)=@_;
- my ($errtext,$fatal)=
+ my $errtext='';
+ my $fatal=0;
+ ($errtext,$fatal)=
&mapread($coursenum,$coursedom,$folder.'.sequence');
if ($fatal) {
$r->print('
'.$errtext.'
');
} else {
# ------------------------------------------------------------ Process commands
- if ($allowed) {
+# ---------------- if they are for this folder and user allowed to make changes
+ if (($allowed) && ($ENV{'form.folder'} eq $folder)) {
+# upload a file, if present
+ if (($ENV{'form.uploaddoc.filename'}) &&
+ ($ENV{'form.cmd'}=~/^upload_(\w+)/)) {
+ if ($folder=~/^$1/) {
+# this is for a course, not a user, so set coursedoc flag
+# probably the only place in the system where this should be "1"
+ my $url=&Apache::lonnet::userfileupload('uploaddoc',1);
+ my $ext='false';
+ if ($url=~/^http\:\/\//) { $ext='true'; }
+ $url=~s/\:/\:/g;
+ my $comment=$ENV{'form.comment'};
+ $comment=~s/\\<\;/g;
+ $comment=~s/\>/\>\;/g;
+ $comment=~s/\:/\:/g;
+ my $newidx=$#Apache::lonratedt::resources+1;
+ $Apache::lonratedt::resources[$newidx]=
+ $comment.':'.$url.':'.$ext.':normal:res';
+ $Apache::lonratedt::order[$#Apache::lonratedt::order+1]=
+ $newidx;
+ &storemap($coursenum,$coursedom,$folder.'.sequence');
+ }
+ }
if ($ENV{'form.cmd'}) {
-
+ my ($cmd,$idx)=split(/\_/,$ENV{'form.cmd'});
+ if ($cmd eq 'del') {
+ for (my $i=$idx;$i<$#Apache::lonratedt::order;$i++) {
+ $Apache::lonratedt::order[$i]=
+ $Apache::lonratedt::order[$i+1];
+ }
+ $#Apache::lonratedt::order--;
+ } elsif ($cmd eq 'up') {
+ my $i=$Apache::lonratedt::order[$idx-1];
+ $Apache::lonratedt::order[$idx-1]=
+ $Apache::lonratedt::order[$idx];
+ $Apache::lonratedt::order[$idx]=$i;
+ } elsif ($cmd eq 'down') {
+ my $i=$Apache::lonratedt::order[$idx+1];
+ $Apache::lonratedt::order[$idx+1]=
+ $Apache::lonratedt::order[$idx];
+ $Apache::lonratedt::order[$idx]=$i;
+ }
+# Store the changed version
+ &storemap($coursenum,$coursedom,$folder.'.sequence');
}
- }
+# Group import/search
+ if ($ENV{'form.importdetail'}) {
+ foreach (split(/\&/,$ENV{'form.importdetail'})) {
+ if (defined($_)) {
+ my ($name,$url)=split(/\=/,$_);
+ $name=&Apache::lonnet::unescape($name);
+ $url=&Apache::lonnet::unescape($url);
+ if ($url) {
+ my $idx=$#Apache::lonratedt::resources+1;
+ $Apache::lonratedt::order
+ [$#Apache::lonratedt::order+1]=$idx;
+ my $ext='false';
+ if ($url=~/^http\:\/\//) { $ext='true'; }
+ $url=~s/\:/\:/g;
+ $Apache::lonratedt::resources[$idx]=
+ $name.':'.$url.':'.$ext.':normal:res';
+ }
+ }
+ }
+# Store the changed version
+ &storemap($coursenum,$coursedom,$folder.'.sequence');
+ }
+ }
+# ---------------------------------------------------------------- End commands
# ---------------------------------------------------------------- Print screen
+ my $idx=0;
+ $r->print('');
+ foreach (@Apache::lonratedt::order) {
+ my ($name,$url)=split(/\:/,$Apache::lonratedt::resources[$_]);
+ unless ($name) { $name=(split(/\//,$url))[-1]; }
+ unless ($name) { $name='EMPTY'; }
+ $r->print(&entryline($idx,$name,$url,$folder,$allowed));
+ $idx++;
+ }
+ $r->print('
');
}
}
@@ -91,8 +169,24 @@ sub entryline {
Remove
END
}
-# URL
- $line.='View | ';
+# Figure out what kind of a resource this is
+ my ($extension)=($url=~/\.(\w+)$/);
+ my $uploaded=($url=~/^\/*uploaded\//);
+ my $icon='unknown';
+ if (-e "/home/httpd/html/adm/lonIcons/$extension.gif") {
+ $icon=$extension;
+ }
+ if ($uploaded) {
+ if ($extension eq 'sequence') {
+ $icon='folder_closed';
+ $url=~/\/(\w+)\.sequence/;
+ $url='/adm/coursedocs?folder='.$1;
+ } else {
+ $url=&Apache::lonnet::tokenwrapper($url);
+ }
+ }
+ $line.=' | ';
# Title
$title=&Apache::lonnet::unescape($title);
if ($title=~
@@ -100,7 +194,7 @@ END
) { $title=''.localtime($1).' '.$2.' at '.$3.':
'.
&Apache::lontexconvert::msgtexconverted($4);
}
- $line.='$title | ';
+ $line.="$title | ";
$line.='';
return $line;
}
@@ -114,63 +208,138 @@ sub handler {
# is this a standard course?
- &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['folder']);
my $standard=($ENV{'request.course.uri'}=~/^\/uploaded\//);
- my $forcestandard=($ENV{'form.folder'}=~/^default_/);
- my $forcesupplement=($ENV{'form.folder'}=~/^supplement_/);
+ my $forcestandard;
+ my $forcesupplement;
+ my $script='';
+ my $allowed;
+ my $events='';
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+ ['folder','showdoc']);
+ unless ($ENV{'form.showdoc'}) { # got called from remote
+ $forcestandard=($ENV{'form.folder'}=~/^default_/);
+ $forcesupplement=($ENV{'form.folder'}=~/^supplemental_/);
# does this user have privileges to post, etc?
- my $allowed=&Apache::lonnet::allowed('srm',$ENV{'request.course.id'});
- my $script='';
- if ($allowed) {
- &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['cmd']);
- $script=&Apache::lonratedt::editscript('docs');
+ $allowed=&Apache::lonnet::allowed('srm',$ENV{'request.course.id'});
+ if ($allowed) {
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['cmd']);
+ $script=&Apache::lonratedt::editscript('simple');
+ }
+ } else { # got called in sequence from course
+ $allowed=0;
+ $forcestandard=1;
+ $forcesupplement=0;
+ $script=&Apache::&Apache::lonxml::registerurl(1,undef);
+ $events='onLoad="'.&Apache::lonxml::loadevents.
+ '" onUnload="'.&Apache::lonxml::unloadevents.'"';
}
# get course data
my $coursenum=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
my $coursedom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+# get personal data
+
+ my $uname=$ENV{'user.name'};
+ my $udom=$ENV{'user.domain'};
+ my $plainname=&Apache::lonnet::escape(
+ &Apache::loncommon::plainname($uname,$udom));
+
# graphics settings
$iconpath = $r->dir_config('lonIconsURL') . "/";
-# upload a file, if present
- if (($ENV{'form.uploaddoc.filename'}) && ($allowed)) {
-# this is for a course, not a user, so set coursedoc flag
-# probably the only place in the system where this should be "1"
- my $url=&Apache::lonnet::userfileupload('uploaddoc',1);
- my $comment=$ENV{'form.comment'};
- $comment=~s/\\<\;/g;
- $comment=~s/\>/\>\;/g;
- }
-
# print screen
$r->print(<
The LearningOnline Network with CAPA
-
+
-
-Course Documents
ENDDOCUMENT
+$r->print(&Apache::loncommon::bodytag('Course Documents','',$events));
# --------------------------------------------------0------ Standard documents
if (($standard) && ($allowed) && (!$forcesupplement)) {
$r->print('Main Course Documents
');
my $folder=$ENV{'form.folder'};
- unless ($folder) { $folder='default'; }
+ unless ($folder=~/^default/) { $folder='default'; }
&editor($r,$coursenum,$coursedom,$folder,$allowed);
+ my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
+ '.sequence';
$r->print(<Post a new main course document
-