--- loncom/publisher/loncfile.pm 2002/01/21 17:13:49 1.8
+++ loncom/publisher/loncfile.pm 2002/05/27 03:18:46 1.10
@@ -1,7 +1,16 @@
# The LearningOnline Network with CAPA
# Handler to rename files, etc, in construction space
#
-# $Id: loncfile.pm,v 1.8 2002/01/21 17:13:49 albertel Exp $
+# This file responds to the various buttons and events
+# in the top frame of the construction space directory.
+# Each event is processed in two phases. The first phase
+# presents a page that describes the proposed action to the user
+# and requests confirmation. The second phase commits the action
+# and displays a page showing the results of the action.
+#
+
+#
+# $Id: loncfile.pm,v 1.10 2002/05/27 03:18:46 foxr Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -41,6 +50,9 @@
# 03/31,04/03,05/02,05/09,06/23,06/24 Gerd Kortemeyer)
#
# 06/23 Gerd Kortemeyer
+# 05/07/02 Ron Fox:
+# - Added Debug log output so that I can trace what the heck this
+# undocumented thingy does.
package Apache::loncfile;
@@ -49,7 +61,48 @@ use Apache::File;
use File::Copy;
use Apache::Constants qw(:common :http :methods);
use Apache::loncacc;
+use Apache::Log ();
+my $DEBUG=0;
+my $r; # Needs to be global for some stuff RF.
+#
+# Debug
+# If debugging is enabled puts out a debuggin message determined by the
+# caller. The debug message goes to the Apache error log file.
+#
+# Parameters:
+# r - Apache request [in]
+# message - String [in]
+# Returns:
+# nothing.
+sub Debug {
+ my $r = shift;
+ my $log = $r->log;
+ my $message = shift;
+ if ($DEBUG) {
+ $log->debug($message);
+ }
+}
+#
+# URLToPath
+# Convert a URL to a file system path.
+#
+# In order to manipulate the construction space objects, it's necessary
+# to access url identified objects a filespace objects. This function
+# translates a construction space URL to a file system path.
+# Parameters:
+# Url - string [in] The url to convert.
+# Returns:
+# The corresponing file system path.
+sub URLToPath
+{
+ my $Url = shift;
+ &Debug($r, "UrlToPath got: $Url");
+ $Url=~ s/^http\:\/\/[^\/]+\/\~(\w+)/\/home\/$1\/public_html/;
+ $Url=~ s/^http\:\/\/[^\/]+//;
+ &Debug($r, "Returning $Url \n");
+ return $Url;
+}
sub exists {
my ($uname,$udom,$dir,$newfile)=@_;
my $published='/home/httpd/html/res/'.$udom.'/'.$uname.'/'.$dir.'/'.
@@ -156,12 +209,21 @@ sub phaseone {
sub phasetwo {
my ($r,$fn,$uname,$udom)=@_;
+ &Debug($r, "loncfile - Entering phase 2 for $fn");
+
$fn=~/(.*)\/([^\/]+)\.(\w+)$/;
my $dir=$1;
my $main=$2;
my $suffix=$3;
+
+
+ &Debug($r, "loncfile::phase2 dir = $dir main = $main suffix = $suffix");
- my $conspace='/home/'.$uname.'/public_html'.$fn;
+ my $conspace=$fn;
+
+ &Debug($r, "loncfile::phase2 Full construction space name: $conspace");
+
+ &Debug($r, "loncfie::phase2 action is $ENV{'form.action'}");
if ($ENV{'form.action'} eq 'rename') {
if (-e $conspace) {
@@ -200,12 +262,21 @@ sub phasetwo {
return;
}
} elsif ($ENV{'form.action'} eq 'newdir') {
- my $newdir='/home/'.$uname.'/public_html/'.
- $fn.$ENV{'form.newfilename'};
+ my $newdir= $fn.$ENV{'form.newfilename'};
+
+ &Debug($r, "loncfile::phasetwo - new directory name: $newdir");
+
unless (mkdir($newdir,0770)) {
$r->print('Error: '.$!.'');
+ &Debug($r, "loncfile::phasetwo - mkdir failed $!");
}
- $r->print('');
+ &Debug($r, "Done button: uname = $uname, dir = $dir, fn = $fn");
+ my $url = '/priv/'.$uname.$newdir.'/';
+ &Debug($r, "URL[1] = ".$url);
+ $url =~ s/\/home\/$uname\/public_html//o;
+ &Debug($r, "URL = ".$url);
+
+ $r->print('');
return;
}
$r->print('');
@@ -213,20 +284,30 @@ sub phasetwo {
sub handler {
- my $r=shift;
+ $r=shift;
+
+
+ &Debug($r, "loncfile.pm - handler entered");
my $fn;
if ($ENV{'form.filename'}) {
$fn=$ENV{'form.filename'};
- $fn=~s/^http\:\/\/[^\/]+//;
+ &Debug($r, "loncfile::handler - raw url: $fn");
+# $fn=~s/^http\:\/\/[^\/]+\/\~(\w+)/\/home\/$1\/public_html/;
+# $fn=~s/^http\:\/\/[^\/]+//;
+ $fn=URLToPath($fn);
+ &Debug($r, "loncfile::handler - doctored url: $fn");
+
} else {
+ &Debug($r, "loncfile::handler - no form.filename");
$r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.
' unspecified filename for cfile', $r->filename);
return HTTP_NOT_FOUND;
}
unless ($fn) {
+ &Debug($r, "loncfile::handler - doctored url is empty");
$r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.
' trying to cfile non-existing file', $r->filename);
return HTTP_NOT_FOUND;
@@ -238,6 +319,8 @@ sub handler {
($uname,$udom)=
&Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain'));
+ &Debug($r,
+ "loncfile::handler constructaccess uname = $uname domain = $udom");
unless (($uname) && ($udom)) {
$r->log_reason($uname.' at '.$udom.
' trying to manipulate file '.$ENV{'form.filename'}.
@@ -247,6 +330,7 @@ sub handler {
}
$fn=~s/\/\~(\w+)//;
+ &Debug($r, "loncfile::handler ~ removed filename: $fn");
$r->content_type('text/html');
$r->send_http_header;
@@ -264,7 +348,10 @@ sub handler {
'');
}
+
+ &Debug($r, "loncfile::handler Form action is $ENV{'form.action'} ");
if ($ENV{'form.action'} eq 'delete') {
+
$r->print('Delete
');
} elsif ($ENV{'form.action'} eq 'rename') {
$r->print('Rename
');
@@ -277,8 +364,10 @@ sub handler {
return OK;
}
if ($ENV{'form.phase'} eq 'two') {
+ &Debug($r, "loncfile::handler entering phase2");
&phasetwo($r,$fn,$uname,$udom);
} else {
+ &Debug($r, "loncfile::handler entering phase1");
&phaseone($r,$fn,$uname,$udom);
}
@@ -288,3 +377,4 @@ sub handler {
1;
__END__
+