version 1.28, 2005/12/12 21:59:12
|
version 1.34, 2006/12/06 22:22:39
|
Line 38 use Apache::loncacc;
|
Line 38 use Apache::loncacc;
|
use Apache::loncommon(); |
use Apache::loncommon(); |
use Apache::lonlocal; |
use Apache::lonlocal; |
use Apache::lonnet; |
use Apache::lonnet; |
|
use LONCAPA(); |
|
|
# ------------------------------------ Interface for selecting previous version |
# ------------------------------------ Interface for selecting previous version |
sub phaseone { |
sub phaseone { |
Line 51 sub phaseone {
|
Line 52 sub phaseone {
|
my $resdir=$resfn; |
my $resdir=$resfn; |
$resdir=~s/\/[^\/]+$/\//; |
$resdir=~s/\/[^\/]+$/\//; |
|
|
$fn=~/\/([^\/]+)\.(\w+)$/; |
my ($main,$suffix,$is_meta) = &get_file_info($fn); |
my $main=$1; |
|
my $suffix=$2; |
|
|
|
if (-e $resfn) { |
if (-e $resfn) { |
$r->print('<form action=/adm/retrieve method=post>'. |
$r->print('<form action="/adm/retrieve" method="POST">'. |
'<input type=hidden name=filename value="/~'.$uname.$fn.'">'. |
'<input type="hidden" name="filename" value="/~'.$uname.$fn.'" />'. |
'<input type=hidden name=phase value=two>'. |
'<input type="hidden" name="phase" value="two" />'. |
'<table border=2><tr><th>'.&mt('Select').'</th><th>'. |
&Apache::loncommon::start_data_table(). |
&mt('Version').'</th>'. |
&Apache::loncommon::start_data_table_header_row(). |
'<th>'.&mt('Published on ...').'</th>'. |
'<th>'.&mt('Select').'</th>'. |
'<th>'.&mt('Metadata').'</th></tr>'); |
'<th>'.&mt('Version').'</th>'. |
|
'<th>'.&mt('Published on ...').'</th>'); |
opendir(DIR,$resdir); |
if (!$is_meta) { |
my @files = grep(/^\Q$main\E\.(\d+)\.\Q$suffix\E$/,readdir(DIR)); |
$r->print('<th>'.&mt('Metadata').'</th>'); |
@files = sort { |
} |
my ($aver) = ($a=~/^\Q$main\E\.(\d+)\.\Q$suffix\E$/); |
if ($is_meta |
my ($bver) = ($b=~/^\Q$main\E\.(\d+)\.\Q$suffix\E$/); |
|| &Apache::loncommon::fileembstyle($suffix) eq 'ssi') { |
return $aver <=> $bver; |
$r->print('<th>'.&mt('Diffs').'</th>'); |
} (@files); |
} |
closedir(DIR); |
$r->print(&Apache::loncommon::end_data_table_header_row()); |
|
|
foreach my $filename (@files) { |
opendir(DIR,$resdir); |
if ($filename=~/^\Q$main\E\.(\d+)\.\Q$suffix\E$/) { |
my @files = grep(/^\Q$main\E\.(\d+)\.\Q$suffix\E$/,readdir(DIR)); |
my $version=$1; |
@files = sort { |
my $rmtime=&Apache::lonnet::metadata($resdir.'/'.$filename,'lastrevisiondate'); |
my ($aver) = ($a=~/^\Q$main\E\.(\d+)\.\Q$suffix\E$/); |
$r->print('<tr><td><input type=radio name=version value="'. |
my ($bver) = ($b=~/^\Q$main\E\.(\d+)\.\Q$suffix\E$/); |
$version.'"></td><td>'.&mt('Previously published version').' '.$version.'</td><td>'. |
return $aver <=> $bver; |
localtime($rmtime).'</td><td>'. |
} (@files); |
'<a href="'.$urldir.$filename.'.meta" target=cat>'. |
closedir(DIR); |
&mt('Metadata Version').' '.$version.'</a>'); |
|
if (&Apache::loncommon::fileembstyle($suffix) eq 'ssi') { |
foreach my $filename (@files) { |
$r->print( |
if ($filename=~/^\Q$main\E\.(\d+)\.\Q$suffix\E$/) { |
' <a target=cat href="/adm/diff?filename=/~'. |
my $version=$1; |
$uname.$fn. |
my $rmtime=&Apache::lonnet::metadata($resdir.'/'.$filename,'lastrevisiondate'); |
'&versiontwo=priv&versionone='.$version. |
$r->print(&Apache::loncommon::start_data_table_row(). |
'">'.&mt('Diffs with Version').' '.$version.'</a>'); |
'<td><input type="radio" name="version" value="'. |
} |
$version.'" /></td><td>'.&mt('Previously published version').' '.$version.'</td><td>'. |
$r->print('</a></td></tr>'); |
localtime($rmtime).'</td>'); |
} |
|
|
if (!$is_meta) { |
|
$r->print('<td><a href="'.$urldir.$filename.'.meta" target=cat>'. |
|
&mt('Metadata Version').' '.$version.'</a></td>'); |
|
} |
|
if ($is_meta |
|
|| &Apache::loncommon::fileembstyle($suffix) eq 'ssi') { |
|
$r->print( |
|
'<td><a target="cat" href="/adm/diff?filename=/~'. |
|
$uname.$fn. |
|
'&versiontwo=priv&versionone='.$version. |
|
'">'.&mt('Diffs with Version').' '.$version. |
|
'</a></td>'); |
|
} |
|
$r->print(&Apache::loncommon::end_data_table_row()); |
|
} |
|
} |
|
closedir(DIR); |
|
my $rmtime=&Apache::lonnet::metadata($resfn,'lastrevisiondate'); |
|
$r->print(&Apache::loncommon::start_data_table_row(). |
|
'<td><input type="radio" name="version" value="new" /></td>'. |
|
'<td><b>'.&mt('Currently published version').'</b></td><td>'.localtime($rmtime). |
|
'</td>'); |
|
if (!$is_meta) { |
|
$r->print('<td><a href="'.$urldir.$main.'.'.$suffix.'.meta" target=cat>'. |
|
&mt('Metadata current version').'</a></td>'); |
|
} |
|
if ($is_meta |
|
|| &Apache::loncommon::fileembstyle($suffix) eq 'ssi') { |
|
$r->print( |
|
'<td><a target="cat" href="/adm/diff?filename=/~'. |
|
$uname.$fn. |
|
'&versiontwo=priv'. |
|
'">'.&mt('Diffs with current Version').'</a></td>'); |
|
} |
|
$r->print(&Apache::loncommon::end_data_table_row(). |
|
&Apache::loncommon::end_data_table(). |
|
'<p>'.'<span class="LC_warning">'. |
|
&mt('Retrieval of an old version will overwrite the file currently in construction space').'</span></p>'); |
|
if (!$is_meta) { |
|
$r->print('<p>'.'<span class="LC_warning">'. |
|
&mt('This will only retrieve the resource, if you want to retrieve the metadata you will need to do that separately.'). |
|
'</span></p>'); |
|
} |
|
$r->print('<input type="submit" value="'.&mt('Retrieve version').'" /></form>'); |
|
} else { |
|
$r->print('<h3>'.&mt('No previous versions published.').'</h3>'); |
} |
} |
closedir(DIR); |
|
my $rmtime=&Apache::lonnet::metadata($resfn,'lastrevisiondate'); |
|
$r->print('<tr><td><input type=radio name=version value="new"></td>'. |
|
'<th>'.&mt('Currently public version').'</th><td>'.localtime($rmtime). |
|
'</td><td><a href="'.$urldir.$main.'.'.$suffix.'.meta" target=cat>'. |
|
&mt('Metadata current version').'</a>'); |
|
if (&Apache::loncommon::fileembstyle($suffix) eq 'ssi') { |
|
$r->print( |
|
' <a target=cat href="/adm/diff?filename=/~'. |
|
$uname.$fn. |
|
'&versiontwo=priv'. |
|
'">'.&mt('Diffs with current Version').'</a>'); |
|
} |
|
$r->print('</td></tr></table><p>'. |
|
'<font size=+1 color=red>'. |
|
&mt('Retrieval of an old version will overwrite the file currently in construction space').'</font><p>'. |
|
'<input type=submit value="'.&mt('Retrieve version').'"></form>'); |
|
} else { |
|
$r->print('<h3>'.&mt('No previous versions published.').'</h3>'); |
|
} |
|
$r->print('<p><a href="/priv/'.$uname.$fn.'">'.&mt('Back to').' '.$fn. |
$r->print('<p><a href="/priv/'.$uname.$fn.'">'.&mt('Back to').' '.$fn. |
'</a></p>'); |
'</a></p>'); |
} |
} |
Line 126 sub phasetwo {
|
Line 151 sub phasetwo {
|
} else { |
} else { |
$r->print('<h3>'.&mt('Retrieving old version').' '.$version.'</h3>'); |
$r->print('<h3>'.&mt('Retrieving old version').' '.$version.'</h3>'); |
} |
} |
|
my ($main,$suffix,$is_meta) = &get_file_info($fn); |
|
|
my $logfile; |
my $logfile; |
my $ctarget='/home/'.$uname.'/public_html'.$fn; |
my $ctarget='/home/'.$uname.'/public_html'.$fn; |
my $vfn=$fn; |
my $vfn=$fn; |
if ($version ne 'new') { |
if ($version ne 'new') { |
$vfn=~s/\.(\w+)$/\.$version\.$1/; |
$vfn=~s/\.(\Q$suffix\E)$/\.$version\.$1/; |
} |
} |
|
|
my $csource=$r->dir_config('lonDocRoot').'/res/'.$udom.'/'.$uname.$vfn; |
my $csource=$r->dir_config('lonDocRoot').'/res/'.$udom.'/'.$uname.$vfn; |
unless ($logfile=Apache::File->new('>>'.$ctarget.'.log')) { |
|
|
my $logname = $ctarget; |
|
if ($is_meta) { $logname =~ s/\.meta$//; } |
|
$logname = $ctarget.'.log'; |
|
unless ($logfile=Apache::File->new('>>'.$logname)) { |
$r->print( |
$r->print( |
'<font color=red>'.&mt('No write permission to user directory, FAIL').'</font>'); |
'<font color=red>'.&mt('No write permission to user directory, FAIL').'</font>'); |
} |
} |
Line 141 sub phasetwo {
|
Line 173 sub phasetwo {
|
"\n\n================= Retrieve ".localtime()." ================\n". |
"\n\n================= Retrieve ".localtime()." ================\n". |
"Version: $version\nSource: $csource\nTarget: $ctarget\n"; |
"Version: $version\nSource: $csource\nTarget: $ctarget\n"; |
$r->print('<p>'.&mt('Copying file').': '); |
$r->print('<p>'.&mt('Copying file').': '); |
if (copy($csource,$ctarget)) { |
if (copy($csource,$ctarget)) { |
$r->print('ok<p>'); |
$r->print('ok<p>'); |
print $logfile "Copied sucessfully.\n\n"; |
print $logfile "Copied sucessfully.\n\n"; |
} else { |
} else { |
Line 152 sub phasetwo {
|
Line 184 sub phasetwo {
|
$r->print('<font size=+2><a href="/priv/'.$uname.$fn. |
$r->print('<font size=+2><a href="/priv/'.$uname.$fn. |
'">'.&mt('Back to').' '.$fn.'</a></font>'); |
'">'.&mt('Back to').' '.$fn.'</a></font>'); |
} else { |
} else { |
$r->print( |
$r->print('<span class="LC_warning">'.&mt('Please pick a version to retrieve').'</span><p>'); |
'<font size=+1 color=red>'.&mt('Please pick a version to retrieve').'</font><p>'); |
|
&phaseone($r,$fn,$uname,$udom); |
&phaseone($r,$fn,$uname,$udom); |
} |
} |
} |
} |
|
|
|
sub get_file_info { |
|
my ($fn) = @_; |
|
my ($main,$suffix) = ($fn=~/\/([^\/]+)\.(\w+)$/); |
|
my $is_meta=0; |
|
if ($suffix eq 'meta') { |
|
$is_meta = 1; |
|
($main,$suffix) = ($main=~/(.+)\.(\w+)$/); |
|
$suffix .= '.meta'; |
|
} |
|
return ($main,$suffix,$is_meta); |
|
} |
|
|
# ---------------------------------------------------------------- Main Handler |
# ---------------------------------------------------------------- Main Handler |
sub handler { |
sub handler { |
|
|
Line 200 sub handler {
|
Line 243 sub handler {
|
return HTTP_NOT_ACCEPTABLE; |
return HTTP_NOT_ACCEPTABLE; |
} |
} |
|
|
$fn=~s/\/\~(\w+)//; |
$fn=~s{/~($LONCAPA::username_re)}{}; |
|
|
&Apache::loncommon::content_type($r,'text/html'); |
&Apache::loncommon::content_type($r,'text/html'); |
$r->send_http_header; |
$r->send_http_header; |
|
|
$r->print('<html><head><title>LON-CAPA Construction Space</title></head>'); |
$r->print(&Apache::loncommon::start_page('Retrieve Published Resources')); |
|
|
$r->print(&Apache::loncommon::bodytag('Retrieve Published Resources')); |
|
|
|
|
|
$r->print('<h1>'.&mt('Retrieve previous versions of').' <tt>'.$fn.'</tt></h1>'); |
$r->print('<h1>'.&mt('Retrieve previous versions of').' <tt>'.$fn.'</tt></h1>'); |
|
|
if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) { |
if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) { |
$r->print('<h3><font color=red>'.&mt('Co-Author').': '.$uname. |
$r->print('<h3><span class="LC_diff_coauthor">'.&mt('Co-Author').': '.$uname. |
&mt(' at ').$udom. |
&mt(' at ').$udom. |
'</font></h3>'); |
'</span></h3>'); |
} |
} |
|
|
|
|
Line 225 sub handler {
|
Line 266 sub handler {
|
&phaseone($r,$fn,$uname,$udom); |
&phaseone($r,$fn,$uname,$udom); |
} |
} |
|
|
$r->print('</body></html>'); |
$r->print(&Apache::loncommon::end_page()); |
return OK; |
return OK; |
} |
} |
|
|