--- loncom/interface/londocs.pm 2002/10/15 20:50:19 1.27 +++ loncom/interface/londocs.pm 2003/01/20 17:30:31 1.45 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.27 2002/10/15 20:50:19 www Exp $ +# $Id: londocs.pm,v 1.45 2003/01/20 17:30:31 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -29,12 +29,13 @@ 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; @@ -42,6 +43,9 @@ my $iconpath; my %hash; my $hashtied; +my %alreadyseen=(); + +my $hadchanges; # Mapread read maps into lonratedt::global arrays # @order and @resources, determines status @@ -58,6 +62,7 @@ sub mapread { sub storemap { my ($coursenum,$coursedom,$map)=@_; + $hadchanges=1; return &Apache::lonratedt::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'. $map,1); @@ -117,15 +122,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'); @@ -160,7 +182,7 @@ sub editor { foreach (@Apache::lonratedt::order) { my ($name,$url)=split(/\:/,$Apache::lonratedt::resources[$_]); unless ($name) { $name=(split(/\//,$url))[-1]; } - unless ($name) { $name='EMPTY'; } + unless ($name) { $name='NO RESOURCE'; $url='/adm/notfound.html'; } $r->print(&entryline($idx,$name,$url,$folder,$allowed)); $idx++; } @@ -172,6 +194,21 @@ sub editor { sub entryline { my ($index,$title,$url,$folder,$allowed)=@_; + $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) { @@ -182,7 +219,10 @@ sub entryline { DOWN -Remove + +Remove + +Rename END } # Figure out what kind of a resource this is @@ -204,17 +244,6 @@ 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:$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: '); + &Apache::lonxml::xmlparse($r,'web', + &Apache::lonnet::getfile( + &Apache::lonnet::filelocation('',$url))); + 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; @@ -256,34 +349,12 @@ sub handler { $r->print('Verify Content'. &Apache::loncommon::bodytag('Verify Course Documents')); $hashtied=0; + undef %alreadyseen; + %alreadyseen=(); &tiehash(); foreach (keys %hash) { - if ($_=~/^src\_(.+)$/) { - my $resid=$1; - $r->rflush(); - if ($hash{$_}) { - my $fn=$hash{$_}; - $r->print('
'. - ($hash{'title_'.$resid}?$hash{'title_'.$resid}:$fn).' '); - if ($fn=~/^\/res\//) { - my $result=&Apache::lonnet::repcopy($fn); - if ($result eq OK) { - $r->print('ok'); - $r->rflush(); - my $dependencies= - &Apache::lonnet::metadata($_,'dependencies'); - $r->print('Dependencies: '.$dependencies.'
'); - } elsif ($result eq HTTP_SERVICE_UNAVAILABLE) { - $r->print( - 'connection down'); - } elsif ($result eq HTTP_NOT_FOUND) { - $r->print('not found'); - } else { - $r->print( - 'access denied'); - } - } - } + if (($_=~/^src\_(.+)$/) && (!$alreadyseen{$hash{$_}})) { + &checkonthis($r,$hash{$_},0,$hash{'title_'.$1}); } } &untiehash(); @@ -292,7 +363,91 @@ sub handler { &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('
'); + } else { + $r->print('

No content modifications yet.

'); + } &untiehash(); } else { # is this a standard course? @@ -369,17 +524,21 @@ function makenewext(targetname) { } function makesmppage() { - var title=prompt('Listed Title for the Page'); + var title=prompt('Listed Title for the Page'); + if (title) { this.document.forms.newsmppg.importdetail.value= title+'=/adm/$udom/$uname/$now/smppg'; this.document.forms.newsmppg.submit(); + } } function makebulboard() { - var title=prompt('Listed Title for the Bulletin Board'); + var title=prompt('Listed Title for the Bulletin Board'); + if (title) { this.document.forms.newbul.importdetail.value= title+'=/adm/$udom/$uname/$now/bulletinboard'; this.document.forms.newbul.submit(); + } } function finishpick() { @@ -390,7 +549,18 @@ function finishpick() { ('this.document.forms.'+form+'.importdetail.value="'+title+'='+url+ '";this.document.forms.'+form+'.submit();'); } + +function changename(folder,index,oldtitle) { + var title=prompt('New Title',oldtitle); + if (title) { + this.document.forms.renameform.title.value=title; + this.document.forms.renameform.cmd.value='rename_'+index; + this.document.forms.renameform.folder.value=folder; + this.document.forms.renameform.submit(); + } +} + ENDNEWSCRIPT } # -------------------------------------------------------------------- Body tag @@ -399,6 +569,15 @@ ENDNEWSCRIPT unless ($showdoc) { if ($allowed) { $r->print(< + + + + +
+ + +
@@ -406,16 +585,22 @@ ENDNEWSCRIPT ENDCOURSEVERIFY } # --------------------------------------------------------- Standard documents - $r->print(''); + $r->print('
'); if (($standard) && ($allowed) && (!$forcesupplement)) { - $r->print(' +

Main Course Documents

'); + $r->print('

Main Course Documents

'); my $folder=$ENV{'form.folder'}; unless ($folder=~/^default/) { $folder='default'; } + $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.

'); + } my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time. '.sequence'; $r->print(<
@@ -434,13 +619,11 @@ Title:
+
Upload a new main course document Import a published document Special documents -
- - + +"javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="Search"> +"javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="Import">
@@ -501,7 +684,7 @@ ENDFORM # ----------------------------------------------------- Supplemental documents if (!$forcestandard) { $r->print( - '

Supplemental Course Documents

'); + '

Supplemental Course Documents

'); my $folder=$ENV{'form.folder'}; unless ($folder=~/supplemental/) { $folder='supplemental'; } &editor($r,$coursenum,$coursedom,$folder,$allowed); @@ -511,7 +694,7 @@ ENDFORM '.sequence'; $r->print(<
@@ -529,13 +712,12 @@ ENDFORM
Upload a new supplemental course document Import a published document Special documents -
- + +"javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="Search"> +"javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="Import">