Annotation of loncom/publisher/londiff.pm, revision 1.30
1.1 www 1: # The LearningOnline Network with CAPA
2: # Handler to show differences between file versions
3: #
1.30 ! raeburn 4: # $Id: londiff.pm,v 1.29 2011/10/23 23:46:07 www Exp $
1.6 albertel 5: #
6: # Copyright Michigan State University Board of Trustees
7: #
8: # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
9: #
10: # LON-CAPA is free software; you can redistribute it and/or modify
11: # it under the terms of the GNU General Public License as published by
12: # the Free Software Foundation; either version 2 of the License, or
13: # (at your option) any later version.
14: #
15: # LON-CAPA is distributed in the hope that it will be useful,
16: # but WITHOUT ANY WARRANTY; without even the implied warranty of
17: # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18: # GNU General Public License for more details.
19: #
20: # You should have received a copy of the GNU General Public License
21: # along with LON-CAPA; if not, write to the Free Software
22: # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
23: #
24: # /home/httpd/html/adm/gpl.txt
25: #
26: # http://www.lon-capa.org/
27: #
1.7 harris41 28: ###
1.1 www 29:
1.24 jms 30:
31:
32:
1.1 www 33: package Apache::londiff;
34:
35: use strict;
36: use Apache::File;
37: use File::Copy;
1.19 www 38: use File::Compare;
1.1 www 39: use Algorithm::Diff qw(diff);
40: use Apache::Constants qw(:common :http :methods);
1.20 albertel 41: use Apache::loncacc();
1.16 albertel 42: use Apache::lonnet;
1.7 harris41 43: use Apache::loncommon();
1.20 albertel 44: use Apache::lonretrieve();
1.13 sakharuk 45: use Apache::lonlocal;
1.22 albertel 46: use LONCAPA();
1.15 albertel 47:
48: sub get_split_file {
49: my ($fn,$style)=@_;
50: my $f1;
51: my @f1;
1.19 www 52: if ($style eq 'local') {
1.15 albertel 53: if (-e $fn) {
54: my $fh=Apache::File->new($fn);
55: my $line;
56: while($line=<$fh>) {
57: $f1.=$line;
58: }
59: }
60: } elsif ($style eq 'remote') {
1.23 albertel 61: $f1=&Apache::lonnet::getfile($fn);
1.15 albertel 62: }
1.23 albertel 63: @f1=split(/\r\n|\r|\n/,$f1);
1.15 albertel 64: return @f1;
65: }
66:
1.19 www 67: sub are_different_files {
68: my ($fileone,$filetwo)=@_;
69: return &compare($fileone,$filetwo);
70: }
71:
1.1 www 72: sub handler {
73:
1.21 albertel 74: my $r=shift;
1.1 www 75: # Get query string for limited number of parameters
76:
1.21 albertel 77: &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
78: ['filename','versiontwo',
79: 'versionone','filetwo']);
1.1 www 80: # Get the files
81:
1.21 albertel 82: my $cuname=$env{'user.name'};
83: my $cudom=$env{'user.domain'};
1.5 www 84:
1.21 albertel 85: if ($env{'form.filename'}=~/^\/res\//) {
86: ($cudom,$cuname,$env{'form.filename'})=
1.30 ! raeburn 87: ($env{'form.filename'}=~m{^/res/($LONCAPA::domain_re)/($LONCAPA::username_re)(/.*)$});
1.21 albertel 88: } else {
89: unless (($cuname,$cudom)=
90: &Apache::loncacc::constructaccess($env{'form.filename'},
91: $r->dir_config('lonDefDomain'))) {
1.22 albertel 92: $r->log_reason($cuname.':'.$cudom.
1.21 albertel 93: ' trying to get diffs file '.$env{'form.filename'}.
94: ' - not authorized',
95: $r->filename);
96: return HTTP_NOT_ACCEPTABLE;
97: }
98: }
1.17 www 99:
1.21 albertel 100: my $efn=$env{'form.filename'};
1.5 www 101:
1.30 ! raeburn 102: $efn=~s{^/priv/$LONCAPA::domain_re/$LONCAPA::username_re}{};
1.5 www 103:
1.21 albertel 104: my @f1=();
105: my @f2=();
1.1 www 106:
1.21 albertel 107: &Apache::loncommon::content_type($r,'text/html');
108: $r->send_http_header;
1.2 www 109:
1.26 bisitz 110: $r->print(&Apache::loncommon::start_page('Resource Differences',undef,
111: {'no_nav_bar' => 1, }));
1.2 www 112:
1.26 bisitz 113: $r->print(($env{'form.filetwo'}?'':&mt('Compare versions of')).
114: ' <span class="LC_filename">'.$efn.'</span>');
1.5 www 115:
1.21 albertel 116: if (($cuname ne $env{'user.name'}) || ($cudom ne $env{'user.domain'})) {
1.28 www 117: $r->print('<p><span class="LC_info">'
1.27 bisitz 118: .&mt('Co-Author [_1]'
1.26 bisitz 119: ,&Apache::loncommon::plainname($cuname,$cudom)
120: .' ('.$cuname.':'.$cudom.')')
121: .'</span></p>'
122: );
1.21 albertel 123: }
124:
125:
126: if (&Apache::loncommon::fileembstyle(($efn=~/\.(\w+)$/)) eq 'ssi'
127: || $efn =~ /\.meta$/) {
128: $r->print('<p><span class="LC_diff_removed">');
129: if ($env{'form.versionone'} eq 'priv') {
1.30 ! raeburn 130: my $fn=$r->dir_config('lonDocRoot')."/priv/$cudom/$cuname".$efn;
1.21 albertel 131: @f1=&get_split_file($fn,'local');
132: $r->print('<b>'.&mt('Construction Space Version').'</b>');
133: } else {
1.30 ! raeburn 134: my $fn=$r->dir_config('lonDocRoot')."/res/$cudom/$cuname";
1.21 albertel 135: if ($env{'form.versionone'}) {
136: my ($main,$suffix,$is_meta)=
137: &Apache::lonretrieve::get_file_info($efn);
138:
139: $fn.=($efn =~m|(.*/)[^/]+|)[0];
140: # add on to $fn the path information in $efn
141: $fn.=$main.'.'.$env{'form.versionone'}.'.'.$suffix;
142: $r->print('<b>'.&mt('Version').' '.$env{'form.versionone'}.'</b>');
143: } else {
144: $fn.=$efn;
145: $r->print('<b>'.&mt('Current Version').'</b>');
146: }
147: @f1=&get_split_file($fn,'remote');
148: }
149:
150: $r->print('</span><br />'.&mt('versus').'<br /><span class="LC_diff_added">');
151:
152: if ($env{'form.filetwo'}) {
153: my $efn2=$env{'form.filetwo'};
1.30 ! raeburn 154: $efn2=~s{^/priv/$LONCAPA::domain_re/$LONCAPA::username_re}{};
! 155: my $fn=$r->dir_config('lonDocRoot')."/priv/$cudom/$cuname".$efn2;
1.21 albertel 156: @f2=&get_split_file($fn,'local');
157: $r->print('<tt>'.$efn2.'</tt>');
158: } elsif ($env{'form.versiontwo'} eq 'priv') {
1.30 ! raeburn 159: my $fn=$r->dir_config('lonDocRoot')."/priv/$cudom/$cuname".$efn;
1.21 albertel 160: @f2=&get_split_file($fn,'local');
161: $r->print('<b>'.&mt('Construction Space Version').'</b>');
162: } else {
163: my $fn=
164: '/home/httpd/html/res/'.$cudom.'/'.$cuname.'/';
165: if ($env{'form.versiontwo'}) {
166: my ($main,$suffix,$is_meta)=
167: &Apache::lonretrieve::get_file_info($efn);
168: # add on to $fn the path information in $efn
169: $fn.=($efn =~m|(.*/)[^/]+|)[0];
170: $fn.=$main.'.'.$env{'form.versiontwo'}.'.'.$suffix;
171: $r->print('<b>'.&mt('Version').' '.$env{'form.versiontwo'}.'</b>');
172: } else {
173: $fn.=$efn;
174: $r->print('<b>'.&mt('Current Version').'</b>');
175: }
176: @f2=&get_split_file($fn,'remote');
177: }
178: $r->print('</span></p>');
1.1 www 179: # Run diff
180:
1.21 albertel 181: my $diffs = diff(\@f1, \@f2);
1.1 www 182:
1.26 bisitz 183: if (@$diffs) {
184: # Start page output
185: my $chunk;
186: my $line;
187: $r->print('<pre>');
188: foreach $chunk (@$diffs) {
189: foreach $line (@$chunk) {
190: my ($sign, $lineno, $text) = @$line;
191: $text=&HTML::Entities::encode($text,'<>&"');
192: $lineno=substr($lineno.' ',0,7);
193: $r->print('<span class="'.(($sign eq '+')?'LC_diff_added'
194: :'LC_diff_removed').'">'.
195: $sign.' '.$lineno.' '.$text."</span>\n");
196: }
197: $r->print("</pre><hr /><pre>\n");
198: }
199: $r->print('</pre>');
200: } else {
201: $r->print('<p class="LC_info">'.&mt('No differences found').'</p>');
202: }
1.21 albertel 203: } else {
204: $r->print('<h1><span class="LC_warning">'.&mt('Binary File').'</span></h1>');
205: }
206: $r->print('<center><a href="javascript:window.close();">'.&mt('Close This Window').'</a></center>');
207: $r->print(&Apache::loncommon::end_page());
208: return OK;
1.1 www 209: }
210:
211:
212: 1;
213: __END__
1.2 www 214:
1.1 www 215:
1.25 jms 216: =pod
1.1 www 217:
1.25 jms 218: =head1 NAME
1.1 www 219:
1.25 jms 220: Apache::londiff
221:
222: =head1 SYNOPSIS
223:
224: Handler to show difference between two files.
225:
226: This is part of the LearningOnline Network with CAPA project
227: described at http://www.lon-capa.org.
228:
229: =head1 Subroutines
230:
231: =over
232:
233: =item get_split_file()
234:
235: =item are_different_files()
236:
237: =item handler()
238:
239: =cut
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>
![[BACK]](/icons/back.gif){kind=icon}
Return to londiff.pm CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [LON-CAPA] / loncom / publisher