[LON-CAPA-cvs] cvs: loncom /interface lonindexer.pm lonsource.pm

taceyjo1 lon-capa-cvs@mail.lon-capa.org
Wed, 07 Jul 2004 00:02:01 -0000


This is a MIME encoded message

--taceyjo11089158521
Content-Type: text/plain

taceyjo1		Tue Jul  6 20:02:01 2004 EDT

  Modified files:              
    /loncom/interface	lonindexer.pm lonsource.pm 
  Log:
  Here is the rest of the source code moving code, I also attempted to 
  keep it all tabinated, anyway, going to close the bug now #78
  
  
--taceyjo11089158521
Content-Type: text/plain
Content-Disposition: attachment; filename="taceyjo1-20040706200201.txt"

Index: loncom/interface/lonindexer.pm
diff -u loncom/interface/lonindexer.pm:1.118 loncom/interface/lonindexer.pm:1.119
--- loncom/interface/lonindexer.pm:1.118	Fri Jul  2 04:01:20 2004
+++ loncom/interface/lonindexer.pm	Tue Jul  6 20:02:00 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Directory Indexer
 #
-# $Id: lonindexer.pm,v 1.118 2004/07/02 08:01:20 albertel Exp $
+# $Id: lonindexer.pm,v 1.119 2004/07/07 00:02:00 taceyjo1 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1018,7 +1018,7 @@
 	if ($hash{'display_attrs_10'} == 1) {
 	    my $source = &Apache::lonnet::metadata($filelink,'sourceavail');
 	    if($source eq 'open') {
-		my $sourcelink = &Apache::lonsource::make_link($filelink);
+		my $sourcelink = &Apache::lonsource::make_link($filelink,$listname);
 		$r->print('<td>'."<a href=\"javascript:openWindow('".$sourcelink.
 			  "', 'previewsource', '700', '700', 'no', 'yes','yes')\";".
 			  " TARGET=_self>Yes</a> "."</td>\n");
Index: loncom/interface/lonsource.pm
diff -u loncom/interface/lonsource.pm:1.3 loncom/interface/lonsource.pm:1.4
--- loncom/interface/lonsource.pm:1.3	Fri Jun 18 11:13:07 2004
+++ loncom/interface/lonsource.pm	Tue Jul  6 20:02:00 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Souce Code handler
 #
-# $Id: lonsource.pm,v 1.3 2004/06/18 15:13:07 www Exp $
+# $Id: lonsource.pm,v 1.4 2004/07/07 00:02:00 taceyjo1 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,27 +42,156 @@
 use HTML::Entities;
 
 sub make_link {
-    my ($filename) = @_;
+    my ($filename, $listname) = @_;
     my $sourcelink = "http://".$ENV{'SERVER_NAME'}.
-	"/adm/source/?filename=".$filename;
+	"/adm/source/?filename=".$filename."&listname=".$listname;
 
     return $sourcelink;
 }
 
 sub stage_2 {
-    my ($r, $filename) = @_;
-    $r->print("Coming Soon");
-    return OK;
+	my ($r, $filename, $author, $listname) = @_;
+	$filename = $filename;
+	&Apache::loncommon::content_type($r,'text/html');
+	my ($uname, $udom) = &Apache::loncacc::constructaccess('/~'.$author.'/',$r->dir_config('lonDefDomain'));
+	$r->send_http_header;
+	$r->print('<html><head><title>LON-CAPA Move source to construction space</title>');
+	$r->print(&Apache::loncommon::bodytag('Problem source code moving operation'));
+	$r->print("Please enter the directory that you would like the source code to go into, a default has also been provided <br />");
+	$r->print("Also note, the path is in reference to the root of your construction space, and new directories will be automatically created. <br /><br />");
+	$r->print('		    <form name="copy" action="/adm/source/" target="_parent" method="post">
+	<input type="hidden" name="filename" value="'.$filename.'" />
+	<input type="hidden" name="listname" value="'.$listname.'" />
+	<input type="hidden" name="action" value="copy_stage" />
+	<input type="text" name="newpath" value="/shared_source/'.$author.'" />&nbsp;
+	<input type="submit" value="Copy" />
+	</form>');
+	return OK;
+}
+
+
+sub copy_stage {
+    my ($r, $filename, $listname, $newpath) = @_;
+    my $role;
+    my $domain;
+    my $author_name;
+    #Figure out if we are author or co-author
+    if($ENV{'request.role'} =~ m|ca.|) { 
+    	($role, $domain, $author_name) = split(/\//,$ENV{'request.role'});
+    } else {
+    	$role = "au.";
+    	$domain = $ENV{'user.domain'};
+    	$author_name = $ENV{'user.name'};
+    	}
+    
+    my $path_to_new_file = '/home/'.$author_name.'/public_html/'.$newpath.'/'.$listname;
+    #Just checking again for access as we want to make sure that it is really ok now that we have the real path
+    my ($uname,$udom)= &Apache::loncacc::constructaccess($path_to_new_file,$domain);
+    unless (($uname) && ($udom)) {
+	 return HTTP_NOT_ACCEPTABLE;
+    }
+    &Apache::loncommon::content_type($r,'text/html');
+    $r->send_http_header;
+    $r->print('<html><head><title>LON-CAPA Move source to construction space</title>');
+	 $r->print(&Apache::loncommon::bodytag('Copying Source'));
+	 my $result = &Apache::loncfile::exists($uname, $udom, $path_to_new_file);
+	 $r->print($result);	
+	 if(($result) && ($result =~ m|published|) ) {
+	 		&delete_file($r, $author_name, $newpath, $filename, $path_to_new_file, '1');
+	 } elsif(($result) && ($result =~ m|exists!|)) {
+	 		&confirm($r, $author_name, $newpath, $filename, $path_to_new_file);
+	 } else { 
+	 		&copy_file($r, $author_name, $newpath, $filename, $path_to_new_file);
+	 }
+	
+return OK;	
+	
+}
+
+sub confirm {
+	my ($r, $author_name, $newpath, $filename, $path_to_new_file) = @_;
+	$r->print("<b>Press delete to remove file and replace it with a copy of the source you are viewing</b><br /><br />");
+	$r->print('		    <form name="delete_confirm" action="/adm/source/" target="_parent" method="post">
+		      <input type="hidden" name="filename" value="'.$filename.'" />
+		      <input type="hidden" name="path" value="'.$path_to_new_file.'" />
+		      <input type="hidden" name="author" value="'.$author_name.'" />
+		      <input type="hidden" name="newpath" value="'.$newpath.'" />
+		      <input type="hidden" name="action" value="delete_confirm" />
+	            
+	              <input type="submit" value="Delete" />
+		    </form>');
 }
 
+sub delete_file {
+	my ($r, $author_name, $newpath, $filename, $path_to_new_file, $type) = @_;
+	if($type eq '1') { 
+		$r->print("<b>Cannot delete non-obsolete published file</b><br />Please
+					use the code view in previous window to use shared code<br /><br />");
+		$r->print('<input type="button" value="Close Window" name="close" onClick="window.close()">');
+	} else {
+		if(-e $path_to_new_file) {
+	   unless(unlink($path_to_new_file)) {
+			$r->print('<font color="red">'.&mt('Error').': '.$!.'</font>');
+			return 0;
+	   }
+	} else {
+	    $r->print('<p> '.&mt('No such file').'. </p></form>');
+	    return 0;
+	  }
+	  &copy_file($r, $author_name, $newpath, $filename, $path_to_new_file);
+	}
+}
+
+sub copy_file {
+	my ($r, $author_name, $newpath, $filename, $path_to_new_file) = @_;
+	$r->print("<b>Creating directories</b>");
+	my $path = '/home/'.$author_name.'/public_html/';
+	my @directories = split(/\//,$newpath);
+	foreach my $now_checking (@directories) { 
+		if($now_checking ne '') {
+			$path = $path.'/'.$now_checking;
+			if(-e $path) {} #More moving along, isn't recursion fun'
+			else {
+				unless(mkdir($path, 02770)) {
+					$r->print('<font color="red">'.&mt('Error').': '.$!.'</font>');
+					return 0;
+				}
+				unless(chmod(02770, ($path))) {
+					$r->print('<font color="red"> '.&mt('Error').': '.$!.'</font>');
+					return 0;
+				}
+			}
+		} else { } #Just move along
+	}
+	$r->print("<br /><b>Copying File</b>");
+	my $problem_filename = "/home/httpd/html".$filename;
+	my $file_output = &Apache::lonnet::getfile($problem_filename);
+	my $fs=Apache::File->new(">$path_to_new_file");
+	if (defined($fs)) {
+		print $fs $file_output;
+	}
+	$r->print("<br /><br />");
+	$r->print('<input type="button" value="Close Window" name="close" onClick="window.close()">');
+	#Some 1.3'ish feature is to include the derivative feature, will go here..'
+}	
+
 sub print_item {
-    my ($r, $filename) = @_;
-    $filename = "/home/httpd/html".$filename;
-    my $file_output = &Apache::lonnet::getfile($filename);
-    my ($rows,$cols) = &Apache::edit::textarea_sizes(\$file_output);
-    $r->print('<textarea rows="'.$rows.'" cols="'.$cols.'" name="editxmltext">'.
-	      &HTML::Entities::encode($file_output,'<>&"').'</textarea>');
-    return OK;
+	my ($r, $filename) = @_;
+	$filename = "/home/httpd/html".$filename;
+	&Apache::lonnet::logthis("print_item filename = $filename");
+	my $file_output = &Apache::lonnet::getfile($filename);
+	my $count=0;
+	my $maxlength=-1;
+	foreach (split ("\n", $file_output)) {
+		$count+=int(length($_)/79);
+		$count++;
+		if (length($_) > $maxlength) { $maxlength = length($_); }
+	}
+	my $rows = $count;
+	my $cols = $maxlength;
+	$r->print('<textarea rows="'.$rows.'" cols="'.$cols.'" name="editxmltext">'.
+	&HTML::Entities::encode($file_output,'<>&"').'</textarea>');
+	return OK;
 	
 }
 
@@ -70,32 +199,43 @@
 sub handler { 
     my $r=shift;
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-					    ['filename']);
+					    ['filename','listname']);
     my $filename = $ENV{'form.filename'};
+    my $listname = $ENV{'form.listname'};
     my $source = &Apache::lonnet::metadata($filename,'sourceavail');
     if ($source ne 'open') {
-	$ENV{'user.error.msg'}="$filename:cre:1:1:Source code not available";
-	return HTTP_NOT_ACCEPTABLE;
+	 	$ENV{'user.error.msg'}="$filename:cre:1:1:Source code not available";
+	 	return HTTP_NOT_ACCEPTABLE;
     }
-    if ((!&Apache::lonnet::allowed('cre')) ||
-	(!&Apache::lonnet::allowed('bre',$filename))) {
-	$ENV{'user.error.msg'}="$filename:bre:1:1:Access to resource denied";
-	return HTTP_NOT_ACCEPTABLE;
+    if ((!&Apache::lonnet::allowed('cre',$filename)) ||
+		(!&Apache::lonnet::allowed('bre',$filename))) {
+		$ENV{'user.error.msg'}="$filename:bre:1:1:Access to resource denied";
+		return HTTP_NOT_ACCEPTABLE;
     }
     if ($ENV{'form.action'} eq 'stage2') { 
-	&stage_2($r, $ENV{'form.filename'});
-    } else {
-	&Apache::loncommon::content_type($r,'text/html');
-	$r->send_http_header;
-	$r->print('		    <form name="copy" action="/adm/source/" target="_parent" method="post">
+    	my $author = &Apache::lonnet::metadata($filename,'authorspace');
+    	$author =~ m|@|;
+    	$author = $`; #This just tells who the author name is for later processing.
+		&stage_2($r, $ENV{'form.filename'}, $author, $listname);
+    } elsif($ENV{'form.action'} eq 'copy_stage') {
+    		&copy_stage($r, $filename,$ENV{'form.listname'},$ENV{'form.newpath'});
+   	} elsif($ENV{'form.action'} eq 'delete_confirm') {
+   		&Apache::loncommon::content_type($r,'text/html');
+			$r->send_http_header;
+    		&delete_file($r, $ENV{'form.author'}, $ENV{'form.newpath'}, $ENV{'form.filename'}, $ENV{'form.path'}, '0');
+   	} else {
+			&Apache::loncommon::content_type($r,'text/html');
+			$r->send_http_header;
+			$r->print('		    <form name="copy" action="/adm/source/" target="_parent" method="post">
 				<input type="button" value="Close Window" name="close" onClick="window.close()">
 		      <input type="hidden" name="filename" value="'.$filename.'" />
+		      <input type="hidden" name="listname" value="'.$listname.'" />
 		      <input type="hidden" name="action" value="stage2" />
 	              <input type="submit" value="Copy to CSTR" />
 		    </form>');
-	$r->print('<hr />');
-	&print_item($r, $ENV{'form.filename'});
-    }
+			$r->print('<hr />');
+			&print_item($r, $ENV{'form.filename'});
+    	  }
     return OK;
 }
 

--taceyjo11089158521--