File:
[LON-CAPA] /
loncom /
publisher /
londiff.pm
Revision
1.27:
download - view:
text,
annotated -
select for diffs
Thu May 14 14:24:18 2009 UTC (14 years, 11 months ago) by
bisitz
Branches:
MAIN
CVS tags:
version_2_9_X,
version_2_9_99_0,
version_2_9_1,
version_2_9_0,
version_2_8_99_1,
version_2_8_99_0,
version_2_10_0_RC2,
version_2_10_0_RC1,
version_2_10_0,
bz6209-base,
bz6209,
bz5969,
bz2851,
PRINT_INCOMPLETE_base,
PRINT_INCOMPLETE,
HEAD,
GCI_3,
GCI_2,
BZ5971-printing-apage
Don't translate separator character between and domain.
Advantages: No need to change the translation files, if...
- different separator character should be used
- different output is wanted, e.g. just username, plainname, both, etc.
- different style should be used for output
(work in progress to make this even more flexible by introducing a global function usernamewrapper)
1: # The LearningOnline Network with CAPA
2: # Handler to show differences between file versions
3: #
4: # $Id: londiff.pm,v 1.27 2009/05/14 14:24:18 bisitz Exp $
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: #
28: ###
29:
30:
31:
32:
33: package Apache::londiff;
34:
35: use strict;
36: use Apache::File;
37: use File::Copy;
38: use File::Compare;
39: use Algorithm::Diff qw(diff);
40: use Apache::Constants qw(:common :http :methods);
41: use Apache::loncacc();
42: use Apache::lonnet;
43: use Apache::loncommon();
44: use Apache::lonretrieve();
45: use Apache::lonlocal;
46: use LONCAPA();
47:
48: sub get_split_file {
49: my ($fn,$style)=@_;
50: my $f1;
51: my @f1;
52: if ($style eq 'local') {
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') {
61: $f1=&Apache::lonnet::getfile($fn);
62: }
63: @f1=split(/\r\n|\r|\n/,$f1);
64: return @f1;
65: }
66:
67: sub are_different_files {
68: my ($fileone,$filetwo)=@_;
69: return &compare($fileone,$filetwo);
70: }
71:
72: sub handler {
73:
74: my $r=shift;
75: # Get query string for limited number of parameters
76:
77: &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
78: ['filename','versiontwo',
79: 'versionone','filetwo']);
80: # Get the files
81:
82: my $cuname=$env{'user.name'};
83: my $cudom=$env{'user.domain'};
84:
85: if ($env{'form.filename'}=~/^\/res\//) {
86: ($cudom,$cuname,$env{'form.filename'})=
87: ($env{'form.filename'}=~m{^/res/($LONCAPA::domain_re)/($LONCAPA::username_re)/(.*)$});
88: } else {
89: unless (($cuname,$cudom)=
90: &Apache::loncacc::constructaccess($env{'form.filename'},
91: $r->dir_config('lonDefDomain'))) {
92: $r->log_reason($cuname.':'.$cudom.
93: ' trying to get diffs file '.$env{'form.filename'}.
94: ' - not authorized',
95: $r->filename);
96: return HTTP_NOT_ACCEPTABLE;
97: }
98: }
99:
100: my $efn=$env{'form.filename'};
101:
102: $efn=~s{/\~($LONCAPA::username_re)}{}g;
103:
104: my @f1=();
105: my @f2=();
106:
107: &Apache::loncommon::content_type($r,'text/html');
108: $r->send_http_header;
109:
110: $r->print(&Apache::loncommon::start_page('Resource Differences',undef,
111: {'no_nav_bar' => 1, }));
112:
113: $r->print(($env{'form.filetwo'}?'':&mt('Compare versions of')).
114: ' <span class="LC_filename">'.$efn.'</span>');
115:
116: if (($cuname ne $env{'user.name'}) || ($cudom ne $env{'user.domain'})) {
117: $r->print('<p><span class="LC_warning">'
118: .&mt('Co-Author [_1]'
119: ,&Apache::loncommon::plainname($cuname,$cudom)
120: .' ('.$cuname.':'.$cudom.')')
121: .'</span></p>'
122: );
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') {
130: my $fn='/home/'.$cuname.'/public_html/'.$efn;
131: @f1=&get_split_file($fn,'local');
132: $r->print('<b>'.&mt('Construction Space Version').'</b>');
133: } else {
134: my $fn=
135: '/home/httpd/html/res/'.$cudom.'/'.$cuname.'/';
136: if ($env{'form.versionone'}) {
137: my ($main,$suffix,$is_meta)=
138: &Apache::lonretrieve::get_file_info($efn);
139:
140: $fn.=($efn =~m|(.*/)[^/]+|)[0];
141: # add on to $fn the path information in $efn
142: $fn.=$main.'.'.$env{'form.versionone'}.'.'.$suffix;
143: $r->print('<b>'.&mt('Version').' '.$env{'form.versionone'}.'</b>');
144: } else {
145: $fn.=$efn;
146: $r->print('<b>'.&mt('Current Version').'</b>');
147: }
148: @f1=&get_split_file($fn,'remote');
149: }
150:
151: $r->print('</span><br />'.&mt('versus').'<br /><span class="LC_diff_added">');
152:
153: if ($env{'form.filetwo'}) {
154: my $efn2=$env{'form.filetwo'};
155: $efn2=~s{/\~($LONCAPA::username_re)}{}g;
156: my $fn='/home/'.$cuname.'/public_html/'.$efn2;
157: @f2=&get_split_file($fn,'local');
158: $r->print('<tt>'.$efn2.'</tt>');
159: } elsif ($env{'form.versiontwo'} eq 'priv') {
160: my $fn='/home/'.$cuname.'/public_html/'.$efn;
161: @f2=&get_split_file($fn,'local');
162: $r->print('<b>'.&mt('Construction Space Version').'</b>');
163: } else {
164: my $fn=
165: '/home/httpd/html/res/'.$cudom.'/'.$cuname.'/';
166: if ($env{'form.versiontwo'}) {
167: my ($main,$suffix,$is_meta)=
168: &Apache::lonretrieve::get_file_info($efn);
169: # add on to $fn the path information in $efn
170: $fn.=($efn =~m|(.*/)[^/]+|)[0];
171: $fn.=$main.'.'.$env{'form.versiontwo'}.'.'.$suffix;
172: $r->print('<b>'.&mt('Version').' '.$env{'form.versiontwo'}.'</b>');
173: } else {
174: $fn.=$efn;
175: $r->print('<b>'.&mt('Current Version').'</b>');
176: }
177: @f2=&get_split_file($fn,'remote');
178: }
179: $r->print('</span></p>');
180: # Run diff
181:
182: my $diffs = diff(\@f1, \@f2);
183:
184: if (@$diffs) {
185: # Start page output
186: my $chunk;
187: my $line;
188: $r->print('<pre>');
189: foreach $chunk (@$diffs) {
190: foreach $line (@$chunk) {
191: my ($sign, $lineno, $text) = @$line;
192: $text=&HTML::Entities::encode($text,'<>&"');
193: $lineno=substr($lineno.' ',0,7);
194: $r->print('<span class="'.(($sign eq '+')?'LC_diff_added'
195: :'LC_diff_removed').'">'.
196: $sign.' '.$lineno.' '.$text."</span>\n");
197: }
198: $r->print("</pre><hr /><pre>\n");
199: }
200: $r->print('</pre>');
201: } else {
202: $r->print('<p class="LC_info">'.&mt('No differences found').'</p>');
203: }
204: } else {
205: $r->print('<h1><span class="LC_warning">'.&mt('Binary File').'</span></h1>');
206: }
207: $r->print('<center><a href="javascript:window.close();">'.&mt('Close This Window').'</a></center>');
208: $r->print(&Apache::loncommon::end_page());
209: return OK;
210: }
211:
212:
213: 1;
214: __END__
215:
216:
217: =pod
218:
219: =head1 NAME
220:
221: Apache::londiff
222:
223: =head1 SYNOPSIS
224:
225: Handler to show difference between two files.
226:
227: This is part of the LearningOnline Network with CAPA project
228: described at http://www.lon-capa.org.
229:
230: =head1 Subroutines
231:
232: =over
233:
234: =item get_split_file()
235:
236: =item are_different_files()
237:
238: =item handler()
239:
240: =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