--- loncom/interface/londocs.pm 2002/09/10 19:01:09 1.22 +++ loncom/interface/londocs.pm 2003/08/05 12:47:21 1.71 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.22 2002/09/10 19:01:09 www Exp $ +# $Id: londocs.pm,v 1.71 2003/08/05 12:47:21 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -29,15 +29,28 @@ package Apache::londocs; use strict; -use Apache::Constants qw(:common); +use Apache::Constants qw(:common :http); use Apache::lonnet; use Apache::loncommon; use Apache::lonratedt; use Apache::lonratsrv; use Apache::lonxml; +use HTML::Entities; +use GDBM_File; my $iconpath; +my %hash; + +my $hashtied; +my %alreadyseen=(); + +my $hadchanges; + +# Available help topics + +my %help=(); + # Mapread read maps into lonratedt::global arrays # @order and @resources, determines status # sets @order - pointer to resources in right order @@ -53,6 +66,7 @@ sub mapread { sub storemap { my ($coursenum,$coursedom,$map)=@_; + $hadchanges=1; return &Apache::lonratedt::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'. $map,1); @@ -112,15 +126,32 @@ sub editor { } $#Apache::lonratedt::order--; } elsif ($cmd eq 'up') { + if (($idx) && (defined($Apache::lonratedt::order[$idx-1]))) { 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') { + if (defined($Apache::lonratedt::order[$idx+1])) { my $i=$Apache::lonratedt::order[$idx+1]; $Apache::lonratedt::order[$idx+1]= $Apache::lonratedt::order[$idx]; $Apache::lonratedt::order[$idx]=$i; + } + } elsif ($cmd eq 'rename') { + my ($rtitle,@rrest)=split(/\:/, + $Apache::lonratedt::resources[ + $Apache::lonratedt::order[$idx]]); + my $comment= + &HTML::Entities::decode($ENV{'form.title'}); + $comment=~s/\/\>\;/g; + $comment=~s/\:/\:/g; + $Apache::lonratedt::resources[ + $Apache::lonratedt::order[$idx]]= + $comment.':'.join(':',@rrest); + } # Store the changed version &storemap($coursenum,$coursedom,$folder.'.sequence'); @@ -139,6 +170,7 @@ sub editor { my $ext='false'; if ($url=~/^http\:\/\//) { $ext='true'; } $url=~s/\:/\:/g; + $name=~s/\:/\:/g; $Apache::lonratedt::resources[$idx]= $name.':'.$url.':'.$ext.':normal:res'; } @@ -147,6 +179,20 @@ sub editor { # Store the changed version &storemap($coursenum,$coursedom,$folder.'.sequence'); } +# Loading a complete map + if (($ENV{'form.importmap'}) && ($ENV{'form.loadmap'})) { + foreach +(&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$ENV{'form.importmap'}))) { + my $idx=$#Apache::lonratedt::resources; + $idx++; + $Apache::lonratedt::resources[$idx]=$_; + $Apache::lonratedt::order + [$#Apache::lonratedt::order+1]=$idx; + } + +# Store the changed version + &storemap($coursenum,$coursedom,$folder.'.sequence'); + } } # ---------------------------------------------------------------- End commands # ---------------------------------------------------------------- Print screen @@ -155,8 +201,8 @@ sub editor { 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)); + unless ($name) { $name='NO RESOURCE'; $url='/adm/notfound.html'; } + $r->print(&entryline($idx,$name,$url,$folder,$allowed,$_)); $idx++; } $r->print(''); @@ -166,18 +212,38 @@ sub editor { # --------------------------------------------------------------- An entry line sub entryline { - my ($index,$title,$url,$folder,$allowed)=@_; + my ($index,$title,$url,$folder,$allowed,$residx)=@_; + $title=~s/\&colon\;/\:/g; + $title=&HTML::Entities::encode(&HTML::Entities::decode( + &Apache::lonnet::unescape($title)),'\"\<\>\&\''); + my $renametitle=$title; + my $foldertitle=$title; + if ($title=~ + /^(\d+)\_\_\_\&\;\&\;\&\;\_\_\_(\w+)\_\_\_\&\;\&\;\&\;\_\_\_(\w+)\_\_\_\&\;\&\;\&\;\_\_\_(.*)$/ + ) { + $foldertitle=&Apache::lontexconvert::msgtexconverted($4); + $renametitle=$4; + $title=''.localtime($1).' '. + &Apache::loncommon::plainname($2,$3).':
'. + $foldertitle; + } + $renametitle=~s/\"\;/\\\"/g; my $line=''; # Edit commands if ($allowed) { $line.=(< - +
+ + - -
+ UP
+
+ DOWN
 -Remove
+ +Remove + +Rename END } # Figure out what kind of a resource this is @@ -199,24 +265,109 @@ END } } $url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//; -# Title - $title=&Apache::lonnet::unescape($title); - my $foldertitle=$title; - if ($title=~ - /^(\d+)\_\_\_\&\&\&\_\_\_(\w+)\_\_\_\&\&\&\_\_\_(\w+)\_\_\_\&\&\&\_\_\_(.*)$/ - ) { - $foldertitle=&Apache::lontexconvert::msgtexconverted($4); - $title=''.localtime($1).' '. - &Apache::loncommon::plainname($2,$3).':
'. - $foldertitle; - } - if ($isfolder) { $url.='&foldername='.$foldertitle; } - $line.=''. - "$title"; + "$title"; return $line; } +# ---------------------------------------------------------------- tie the hash + +sub tiehash { + $hashtied=0; + if ($ENV{'request.course.fn'}) { + if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.".db", + &GDBM_READER(),0640)) { + $hashtied=1; + } + } +} + +sub untiehash { + if ($hashtied) { untie %hash; } + $hashtied=0; +} + +# --------------------------------------------------------------- check on this + +sub checkonthis { + my ($r,$url,$level,$title)=@_; + $alreadyseen{$url}=1; + $r->rflush(); + if (($url) && ($url!~/^\/uploaded\//) && ($url!~/\*$/)) { + $r->print('
'); + for (my $i=0;$i<=$level*5;$i++) { + $r->print(' '); + } + $r->print(''. + ($title?$title:$url).' '); + if ($url=~/^\/res\//) { + my $result=&Apache::lonnet::repcopy( + &Apache::lonnet::filelocation('',$url)); + if ($result==OK) { + $r->print('ok'); + $r->rflush(); + &Apache::lonnet::countacc($url); + $url=~/\.(\w+)$/; + if (&Apache::loncommon::fileembstyle($1) eq 'ssi') { + $r->print('
'); + $r->rflush(); + for (my $i=0;$i<=$level*5;$i++) { + $r->print(' '); + } + $r->print('- Rendering: '); + my $oldpath=$ENV{'request.filename'}; + $ENV{'request.filename'}=&Apache::lonnet::filelocation('',$url); + &Apache::lonxml::xmlparse($r,'web', + &Apache::lonnet::getfile( + &Apache::lonnet::filelocation('',$url))); + $ENV{'request.filename'}=$oldpath; + if (($Apache::lonxml::errorcount) || + ($Apache::lonxml::warningcount)) { + if ($Apache::lonxml::errorcount) { + $r->print(''. + $Apache::lonxml::errorcount.' error(s) '); + } + if ($Apache::lonxml::warningcount) { + $r->print(''. + $Apache::lonxml::warningcount.' warning(s)'); + } + } else { + $r->print('ok'); + } + $r->rflush(); + } + my $dependencies= + &Apache::lonnet::metadata($url,'dependencies'); + foreach (split(/\,/,$dependencies)) { + if (($_=~/^\/res\//) && (!$alreadyseen{$_})) { + &checkonthis($r,$_,$level+1); + } + } + } elsif ($result==HTTP_SERVICE_UNAVAILABLE) { + $r->print('connection down'); + } elsif ($result==HTTP_NOT_FOUND) { + $r->print('not found'); + } else { + $r->print('access denied'); + } + } + } +} + # ================================================================ Main Handler sub handler { my $r = shift; @@ -224,6 +375,136 @@ sub handler { $r->send_http_header; return OK if $r->header_only; +# --------------------------------------------- Initialize help topics for this + foreach ('Adding_Course_Doc','Main_Course_Documents', + 'Adding_External_Resource','Navigate_Content', + 'Adding_Folders','Docs_Overview', 'Load_Map', + 'Supplemental', 'Score_Upload_Form', + 'Importing_LON-CAPA_Resource','Uploading_From_Harddrive') { + $help{$_}=&Apache::loncommon::help_open_topic('Docs_'.$_); + } + # Composite help files + $help{'Syllabus'} = &Apache::loncommon::help_open_topic( + 'Docs_About_Syllabus,Docs_Editing_Templated_Pages'); + $help{'Simple Page'} = &Apache::loncommon::help_open_topic( + 'Docs_About_Simple_Page,Docs_Editing_Templated_Pages'); + $help{'Bulletin Board'} = &Apache::loncommon::help_open_topic( + 'Docs_About_Bulletin_Board,Docs_Editing_Templated_Pages'); + $help{'My Personal Info'} = &Apache::loncommon::help_open_topic( + 'Docs_About_My_Personal_Info,Docs_Editing_Templated_Pages'); + $help{'Caching'} = &Apache::loncommon::help_open_topic('Caching'); + + if ($ENV{'form.verify'}) { + + my $loaderror=&Apache::lonnet::overloaderror($r); + if ($loaderror) { return $loaderror; } + + $r->print('Verify Content'. + &Apache::loncommon::bodytag('Verify Course Documents')); + $hashtied=0; + undef %alreadyseen; + %alreadyseen=(); + &tiehash(); + foreach (keys %hash) { + if (($_=~/^src\_(.+)$/) && (!$alreadyseen{$hash{$_}})) { + &checkonthis($r,$hash{$_},0,$hash{'title_'.$1}); + } + } + &untiehash(); + $r->print('

Done.

'); + } elsif ($ENV{'form.versions'}) { + $r->print('Check Versions'. + &Apache::loncommon::bodytag('Check Course Document Versions')); + $hashtied=0; + &tiehash(); + my %changes=&Apache::lonnet::dump + ('versionupdate',$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, + $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); + my $firstkey=(keys %changes)[0]; + unless ($firstkey=~/^error\:/) { + unless ($ENV{'form.timerange'}) { + $ENV{'form.timerange'}=604800; + } + my $seltext='during the last '.$ENV{'form.timerange'}.' seconds'; + my $startsel=''; + my $monthsel=''; + my $weeksel=''; + my $daysel=''; + if ($ENV{'form.timerange'}==-1) { + $seltext='since start of course'; + $startsel='selected'; + $ENV{'form.timerange'}=time; + } + my $starttime=time-$ENV{'form.timerange'}; + if ($ENV{'form.timerange'}==2592000) { + $seltext='during the last month ('.localtime($starttime).')'; + $monthsel='selected'; + } elsif ($ENV{'form.timerange'}==604800) { + $seltext='during the last week ('.localtime($starttime).')'; + $weeksel='selected'; + } elsif ($ENV{'form.timerange'}==86400) { + $seltext='since yesterday ('.localtime($starttime).')'; + $daysel='selected'; + } + + $r->print(< + + + +

Content changed $seltext

+ + + + +ENDHEADERS + foreach (keys %changes) { + if ($changes{$_}>$starttime) { + my ($root,$extension)=($_=~/^(.*)\.(\w+)$/); + my $currentversion=&Apache::lonnet::getversion($_); + my $linkurl=&Apache::lonnet::clutter($_); + $r->print( + ''. + ''); + } + } + $r->print('
FileModification DateVersionDifferences
'.$linkurl. + ''. + localtime($changes{$_}).''.$currentversion.''); + my $lastold=1; + for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) { + my $url=$root.'.'.$prevvers.'.'.$extension; + if (&Apache::lonnet::metadata($url,'lastrevisiondate')< + $starttime) { + $lastold=$prevvers; + } + } + for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) { + my $url=$root.'.'.$prevvers.'.'.$extension; + $r->print('Version '.$prevvers.' ('. + localtime(&Apache::lonnet::metadata($url,'lastrevisiondate')). + ')'); + if (&Apache::loncommon::fileembstyle($extension) eq 'ssi') { + $r->print(' Diffs'); + } + $r->print('
'); + } + $r->print('
'); + $r->print('

Done.

'); + } else { + $r->print('

No content modifications yet.

'); + } + &untiehash(); + } else { # is this a standard course? my $standard=($ENV{'request.course.uri'}=~/^\/uploaded\//); @@ -232,6 +513,7 @@ sub handler { my $script=''; my $allowed; my $events=''; + my $buttons=''; my $showdoc=0; &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['folder','foldername']); @@ -250,9 +532,10 @@ sub handler { } } else { # got called in sequence from course $allowed=0; - $script=''.&Apache::lonxml::registerurl(1,undef).''.&Apache::lonmenu::registerurl(1,undef).' + ENDNEWSCRIPT } # -------------------------------------------------------------------- Body tag $r->print(''. - &Apache::loncommon::bodytag('Course Documents','',$events)); + &Apache::loncommon::bodytag('Course Documents','',$events). + $buttons); unless ($showdoc) { + if ($allowed) { + $r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc', + 'Editing the Table of Contents for your Course')); + $r->print(< + + + + +
+ + +
+
+ + +
+ENDCOURSEVERIFY + } # --------------------------------------------------------- Standard documents + $r->print(''); if (($standard) && ($allowed) && (!$forcesupplement)) { - $r->print('

Main Course Documents

'); + $r->print(' +

Main Course Documents'. + ($allowed?' '.$help{'Main_Course_Documents'}:'').'

'); my $folder=$ENV{'form.folder'}; unless ($folder=~/^default/) { $folder='default'; } + my $postexec=''; + if ($folder eq 'default') { + $r->print(''); + } else { + $postexec='self.close();'; + } + $hadchanges=0; &editor($r,$coursenum,$coursedom,$folder,$allowed); + if ($hadchanges) { + $r->print( +''. +'
'. +'

Changes will become active for your current session after , or the next time you log in.'. +$help{'Caching'}.'

'); + } my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time. '.sequence'; + $r->print(<
@@ -343,84 +705,137 @@ ENDNEWSCRIPT
Upload a new main course document Import a published document Special documents
File:
- +
-Title:
+Title:
+ + $help{'Uploading_From_Harddrive'} +
-
+ - + +"javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="Search"> + +"javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="Import"> +$help{'Importing_LON-CAPA_Resource'} + +

+

+
+ +$help{'Load_Map'} +
+ +value="New Folder" />$help{'Adding_Folders'} +
+ +value="External Resource" /> $help{'Adding_External_Resource'} +
- + + + $help{'Syllabus'} +
+ +$help{'Navigate_Content'} +
+ +onClick="javascript:makesmppage();" /> $help{'Simple Page'} + +
+
+ + + + +$help{'Simple Problem'} + +
+
+ + + + + +$help{'Score_Upload_Form'} +
+ +$help{'Bulletin Board'} +
+ +$help{'My Personal Info'} +
ENDFORM - $r->print('
'); + $r->print(''); } # ----------------------------------------------------- Supplemental documents if (!$forcestandard) { - $r->print('

Supplemental Course Documents

'); + $r->print( + '

Supplemental Course Documents'. + ($allowed?' '.$help{'Supplemental'}:'').'

'); my $folder=$ENV{'form.folder'}; unless ($folder=~/supplemental/) { $folder='supplemental'; } &editor($r,$coursenum,$coursedom,$folder,$allowed); @@ -430,78 +845,101 @@ ENDFORM '.sequence'; $r->print(< + -
Upload a new supplemental course document Import a published document Special documents
- +
Comment:
+ + $help{'Uploading_From_Harddrive'} +
-
+ + +"javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="Search"> +"javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="Import">$help{'Importing_LON-CAPA_Resource'} +

+

+ + +
+ +value="New Folder" /> $help{'Adding_Folders'} +
+ +value="External Resource" /> $help{'Adding_External_Resource'} +
+ +$help{'Syllabus'} +
+ +$help{'My Personal Info'} +
+ ENDSUPFORM } } if ($allowed) { $r->print('
'); } + $r->print(''); } else { # -------------------------------------------------------- This is showdoc mode $r->print("

Uploaded Document

It is recommended that you use an up-to-date virus scanner before handling this file.

". &entryline(0,"Click to download or use your browser's Save Link function",$showdoc).'

'); } - $r->print(''); - return OK; + } + $r->print(''); + return OK; } 1;