[BACK]Return to londiff.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / publisher

Diff for /loncom/publisher/londiff.pm between versions 1.5 and 1.9

version 1.5, 2001/05/09 17:38:12 version 1.9, 2002/09/16 13:05:49
Line 1 Line 1
 # The LearningOnline Network with CAPA  # The LearningOnline Network with CAPA
 # Handler to show differences between file versions  # Handler to show differences between file versions
 #  #
   # $Id$
   #
   # Copyright Michigan State University Board of Trustees
   #
   # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
   #
   # LON-CAPA is free software; you can redistribute it and/or modify
   # it under the terms of the GNU General Public License as published by
   # the Free Software Foundation; either version 2 of the License, or
   # (at your option) any later version.
   #
   # LON-CAPA is distributed in the hope that it will be useful,
   # but WITHOUT ANY WARRANTY; without even the implied warranty of
   # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   # GNU General Public License for more details.
   #
   # You should have received a copy of the GNU General Public License
   # along with LON-CAPA; if not, write to the Free Software
   # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   #
   # /home/httpd/html/adm/gpl.txt
   #
   # http://www.lon-capa.org/
   #
   #
 # (Handler to retrieve an old version of a file  # (Handler to retrieve an old version of a file
 #  #
 # (Publication Handler  # (Publication Handler
Line 16 Line 41
 # 03/31,04/03 Gerd Kortemeyer)  # 03/31,04/03 Gerd Kortemeyer)
 #  #
 # 05/02/01,05/09 Gerd Kortemeyer  # 05/02/01,05/09 Gerd Kortemeyer
   # 12/13 Scott Harrison
   #
   ###
   
 package Apache::londiff;  package Apache::londiff;
   
Line 25  use File::Copy; Line 53  use File::Copy;
 use Algorithm::Diff qw(diff);  use Algorithm::Diff qw(diff);
 use Apache::Constants qw(:common :http :methods);  use Apache::Constants qw(:common :http :methods);
 use Apache::loncacc;  use Apache::loncacc;
   use Apache::lonnet();
   use Apache::loncommon();
   
 sub handler {  sub handler {
   
Line 32  sub handler { Line 62  sub handler {
   
 # Get query string for limited number of parameters  # Get query string for limited number of parameters
   
     map {     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
        my ($name, $value) = split(/=/,$_);                                         ['filename','versiontwo','versionone']);
        $value =~ tr/+/ /;  
        $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;  
        if (($name eq 'filename') || ($name eq 'versiontwo') ||   
            ($name eq 'versionone')) {  
            unless ($ENV{'form.'.$name}) {  
               $ENV{'form.'.$name}=$value;  
    }  
        }  
     } (split(/&/,$ENV{'QUERY_STRING'}));  
   
 # Get the files  # Get the files
   
   my $cuname=$ENV{'user.name'};    my $cuname=$ENV{'user.name'};
Line 71  sub handler { Line 91  sub handler {
   
   $r->print('<html><head><title>LON-CAPA Construction Diffs</title></head>');    $r->print('<html><head><title>LON-CAPA Construction Diffs</title></head>');
   
   $r->print('<body bgcolor="#FFFFFF">');    $r->print(&Apache::loncommon::bodytag('Resource Differences'));
   
       
   $r->print('<h1>Compare versions of <tt>'.$efn.'</tt></h1>');    $r->print('<h1>Compare versions of <tt>'.$efn.'</tt></h1>');
Line 82  sub handler { Line 102  sub handler {
       }        }
   
   
  if (&Apache::lonnet::fileembstyle(($efn=~/\.(\w+)$/)) eq   if (&Apache::loncommon::fileembstyle(($efn=~/\.(\w+)$/)) eq
       'ssi') {        'ssi') {
   if ($ENV{'form.versionone'} eq 'priv') {    if ($ENV{'form.versionone'} eq 'priv') {
       my $fn='/home/'.$cuname.'/public_html/'.$efn;        my $fn='/home/'.$cuname.'/public_html/'.$efn;
Removed from v.1.5  
changed lines
  Added in v.1.9

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>