--- loncom/publisher/loncfile.pm	2003/02/04 22:01:38	1.23
+++ loncom/publisher/loncfile.pm	2003/03/10 18:34:14	1.29
@@ -7,10 +7,9 @@
 #  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.23 2003/02/04 22:01:38 albertel Exp $
+#
+# $Id: loncfile.pm,v 1.29 2003/03/10 18:34:14 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -495,7 +494,19 @@ sub Rename1 {
     if(-e $conspace) {
 	if($ENV{'form.newfilename'}) {
 	    my $newfilename = $ENV{'form.newfilename'};
+	    if ($newfilename =~ m|/[^\.]+$|) {
+		#no extension add on orignal extension
+		if ($filename =~ m|/[^\.]*\.([^\.]+)$|) {
+		    $newfilename.='.'.$1;
+		}
+	    }
 	    $request->print(&checksuffix($filename, $newfilename));
+	    #renaming a dir, delete the trailing /
+            #remove last element for current dir
+	    if ($filename =~ m|/$|) {
+		$filename =~ s|/$||;
+		$dir =~ s|/[^/]*$||;
+	    }
 	    my $return=&exists($user, $domain, $dir, $newfilename);
 	    $request->print($return);
 	    if ($return =~/^Error:/) {
@@ -759,6 +770,10 @@ sub NewFile1 {
     if ($ENV{'form.action'} =~ /new(.+)file/) {
 	my $extension=$1;
 	if ($newfilename !~ /\Q.$extension\E$/) {
+	    if ($newfilename =~ m|^[^\.]*\.([^\.]+)$|) {
+		#already has an extension strip it and add in expected one
+		$newfilename =~ s|.([^\.]+)$||;
+	    }
 	    $newfilename.=".$extension";
 	}
     }
@@ -771,7 +786,7 @@ sub NewFile1 {
 	$request->print('<p>File exists.</p></form>');
     }
     else {
-	$request->print('<p>Make new file <tt>'.$newfilename.'</tt>?</p>');
+	$request->print('<p>Make new file <tt>'.$dir.'/'.$newfilename.'</tt>?</p>');
 	my $dest=&MakeFinalUrl($request,$fullpath);
 	&Debug($request, "Cancel url is: ".$cancelurl);
 	&Debug($request, "Dest url is: ".$dest);
@@ -828,9 +843,11 @@ sub phaseone {
 	    '<input type="hidden" name="action" value="'.$ENV{'form.action'}.'" />');
   
   if ($ENV{'form.action'} eq 'rename') {
-    
-    &Rename1($r, $fn, $uname, $udom, $dir);
-    
+      if (!defined($dir)) {
+	  $fn=~m:(.*)/:;
+	  $dir=$1;
+      }
+      &Rename1($r, $fn, $uname, $udom, $dir);
   } elsif ($ENV{'form.action'} eq 'delete') { 
     
     &Delete1($r, $uname, $fn);
@@ -846,17 +863,19 @@ sub phaseone {
     &NewDir1($r, $uname, $dir, $ENV{'form.newfilename'});
   }  elsif ($ENV{'form.action'} eq 'newfile' ||
 	    $ENV{'form.action'} eq 'newhtmlfile' ||
-	    $ENV{'form.action'} eq 'newproblemfile') {
-    if($ENV{'form.newfilename'}) {
-      my $newfilename = $ENV{'form.newfilename'};
-      if (!defined($dir)) {
-	  $fn=~m:(.*)/:;
-	  $dir=$1;
+	    $ENV{'form.action'} eq 'newproblemfile' ||
+            $ENV{'form.action'} eq 'newpagefile' ||
+            $ENV{'form.action'} eq 'newsequencefile') {
+      if($ENV{'form.newfilename'}) {
+	  my $newfilename = $ENV{'form.newfilename'};
+	  if (!defined($dir)) {
+	      $fn=~m:(.*)/:;
+	      $dir=$1;
+	  }
+	  &NewFile1($r, $uname, $udom, $dir, $newfilename);
+      } else {
+	  $r->print('<p>No new filename specified.</p></form>');
       }
-      &NewFile1($r, $uname, $udom, $dir, $fn, $newfilename);
-    }else {
-      $r->print('<p>No new filename specified.</p></form>');
-    }
   }
 }
 
@@ -904,8 +923,19 @@ sub Rename2 {
 	 $newfile);
 
   if(-e $oldfile) {
-      unless(rename($oldfile,
-		    $directory.'/'.$newfile)) {
+      my $dest;
+
+      if ($oldfile =~ m|/$|) {
+	  #renaming a dir
+	  $oldfile =~ s|/$||;
+	  $dest=$directory;
+	  $dest=~s|(/)([^/]*)$|$1|;
+	  $dest.='/'.$newfile;
+      } else {
+	  $dest=$directory.'/'.$newfile;
+      }
+
+      unless(rename($oldfile,$dest)) {
 	  $request->print('<font color="red">Error: '.$!.'</font>');
 	  return 0;
       } else {}
@@ -1083,11 +1113,16 @@ sub phasetwo {
     
     # Break down the file into it's component pieces.
     
-    $fn=~/(.*)\/([^\/]+)\.(\w+)$/;
-    my $dir=$1;			# Directory path
-    my $main=$2;		# Filename.
-    my $suffix=$3;		# Extension.
-    
+    my $dir;		# Directory path
+    my $main;		# Filename.
+    my $suffix;		# Extension.
+
+    if ($fn=~m:(.*)/([^/]+)\.(\w+)$:) {
+	$dir=$1;		# Directory path
+	$main=$2;		# Filename.
+	$suffix=$3;		# Extension.
+    }
+        
     my $dest;                   # On success this is where we'll go.
     
     &Debug($r, 
@@ -1107,12 +1142,19 @@ sub phasetwo {
     
     if ($ENV{'form.action'} eq 'rename') { # Rename.
 	if($ENV{'form.newfilename'}) {
+	    if (!defined($dir)) {
+		$fn=~m:^(.*)/:;
+		$dir=$1;
+	    }
 	    if(!&Rename2($r, $uname, $dir, $fn, $ENV{'form.newfilename'})) {
 		return;
 	    }
 	    # Prepend the directory to the new name to form the basis of the
 	    # url of the new resource.
 	    #
+	    #renaming a dir
+            #remove last element for current dir
+	    if ($fn =~ m|/$|) { $dir =~ s|/[^/]*$||; }
 	    $dest = $dir."/".$ENV{'form.newfilename'};
 	}
     } elsif ($ENV{'form.action'} eq 'delete') { 
@@ -1251,7 +1293,9 @@ sub handler {
       $r->print('<h3>Copy</h3>');
   } elsif ($ENV{'form.action'} eq 'newfile' ||
 	   $ENV{'form.action'} eq 'newhtmlfile' ||
-	   $ENV{'form.action'} eq 'newproblemfile') {
+	   $ENV{'form.action'} eq 'newproblemfile' ||
+           $ENV{'form.action'} eq 'newpagefile' ||
+           $ENV{'form.action'} eq 'newsequencefile' ) {
       $r->print('<h3>New Resource</h3>');
   } else {
      $r->print('<p>Unknown Action</p></body></html>');