[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.99,1.100

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv17176/bin

Modified Files:
	sandweb.cgi 
Log Message:
added debugging to the File class

Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.99
retrieving revision 1.100
diff -U2 -r1.99 -r1.100
--- sandweb.cgi	2001/12/20 02:30:37	1.99
+++ sandweb.cgi	2001/12/20 20:29:41	1.100
@@ -75,5 +75,5 @@
 				# unable to load user with cookie, or cookie expired
 				set_error("unable to get cookie");
-				$log->debug("unable to get valid cookie: '$cookie'\n");
+				$log->debug("unable to get valid cookie: '$cookie'");
 				login_menu();
 				exit 0;
@@ -93,5 +93,5 @@
 				# User is logged in; load prefs
 				load_prefs(1);
-				$log->debug("loading prefs\n");
+				$log->debug("loading prefs");
 				my $username = $auth->get_userinfo('username');
 
@@ -173,5 +173,5 @@
 					my $page = param('action');
 					my $msg = "Invalid page - $page!";
-                			$log->error("$msg\n");
+                			$log->error("$msg");
                 			set_error("$msg");
                 			debug_menu( cookie => $cookie );
@@ -181,5 +181,5 @@
 		else {
 			# no cookie, default login_menu
-			$log->debug("no cookie found: '$cookie'\n");
+			$log->debug("no cookie found: '$cookie'");
 			login_menu(); 
 		}
@@ -198,5 +198,5 @@
 	my %args = @_;
 
-	$log->debug("entering login menu\n");
+	$log->debug("entering login menu");
 
 	my $content = $ui->get_menu( 
@@ -221,5 +221,5 @@
 	my %args = @_;
 
-	$log->debug("entering main menu\n");
+	$log->debug("entering main menu");
 
 	my $cookie = $args{'cookie'};
@@ -233,5 +233,5 @@
 	}
 
-	$log->debug("cookie: '$cookie'\n");
+	$log->debug("cookie: '$cookie'");
 
 	print header( -cookie => $cookie );
@@ -251,5 +251,5 @@
 	my %args = @_;
 
-	$log->debug("entering debug menu\n");
+	$log->debug("entering debug menu");
 
 	my $cookie = $args{'cookie'};
@@ -302,5 +302,5 @@
 
 	if ( $repo_type eq 'CVS' ) {
-		$log->debug("repo type is CVS, setting up CVSROOT\n");
+		$log->debug("repo type is CVS, setting up CVSROOT");
 		if ( $connection eq 'local' ) {
 			$vcsroot = "$root";
@@ -310,5 +310,5 @@
 	}
 
-	$log->debug("creating Repository object\n");
+	$log->debug("creating Repository object");
 	my $repository = SandWeb::Repository->new( 
 						root => "$vcsroot",
@@ -317,5 +317,5 @@
 	);
 
-	$log->debug("creating Browse object\n");
+	$log->debug("creating Browse object");
 	my $browse = SandWeb::Browse->new( 
 					username => $username,
@@ -324,5 +324,5 @@
 	);
 
-	$log->debug("creating File object\n");
+	$log->debug("creating File object");
 	my $file = SandWeb::File->new(
 		 'log_obj' => $log,
@@ -358,5 +358,5 @@
 	my %args = @_;
 
-	$log->debug("entering file handling routine\n");
+	$log->debug("entering file handling routine");
 
 	my $cookie = $args{'cookie'};
@@ -372,7 +372,7 @@
 
 	my $file_command = $args{'file_command'};
-	$log->debug("file command is : $file_command\n");
+	$log->debug("file command is : $file_command");
 	my $location = $args{'location'};
-	$log->debug("location is : $location\n");
+	$log->debug("location is : $location");
 	my @filename = ();
 	my $count = 0;
@@ -397,5 +397,5 @@
 	if ( $file_command eq 'remove' ) {
 		unless (@filename) {
-			$log->debug("no files selected for removal\n");
+			$log->debug("no files selected for removal");
 			set_error("Please select file(s) or folder(s) to remove.");
 			browse_menu( 
@@ -487,7 +487,7 @@
 	}
 	elsif ( $file_command eq 'view' ) {
-		$log->debug("viewing file : $filename\n");
+		$log->debug("viewing file : $filename");
 		if ( $file->get_file_type() ne "Text" ) {
-			$log->debug("User wants to view non-text file.\n");
+			$log->debug("User wants to view non-text file.");
 			set_error("This does not appear to be a text file.");
 			browse_menu(
@@ -517,13 +517,13 @@
 	} 
 	elsif ( $file_command eq 'edit' ) {
-		$log->debug("editing file : $filename \n");
+		$log->debug("editing file : $filename");
 		if ($save) {
 	        	my $data = param('data'),
 			my $filename = $file->get_filename();
-			$log->debug("saving edited file : $filename \n");
+			$log->debug("saving edited file : $filename");
 
-			$log->debug("opening $users_dir/$username$location/$filename\n");
+			$log->debug("opening $users_dir/$username$location/$filename");
 			unless (open ( FILE, "> $users_dir/$username$location/$filename" )) {
-				$log->error("could not open $users_dir/$username$location/$filename for writing : $!\n");
+				$log->error("could not open $users_dir/$username$location/$filename for writing : $!");
 				browse_menu( 
 					cookie => $cookie,
@@ -534,6 +534,6 @@
 			unless (close FILE) {
 				my $error = "could not save $users_dir/$username$location/$filename : $!";
-				$log->error("$error\n");
-				set_error("$error\n");
+				$log->error("$error");
+				set_error("$error");
 				browse_menu( 
 					cookie => $cookie,
@@ -548,5 +548,5 @@
 		}
 		if ( $file->get_file_type() ne "Text" ) {
-			$log->debug("User wants to edit non-text file : $filename\n");
+			$log->debug("User wants to edit non-text file : $filename");
 			set_error("This does not appear to be a text file.");
                         browse_menu(
@@ -556,8 +556,8 @@
 		}
 		my @tmp;
-		$log->debug("opening $users_dir/$username/$location/$filename\n");
+		$log->debug("opening $users_dir/$username/$location/$filename");
 		unless (open (FILE, "< $users_dir/$username/$location/$filename") ) {
 			my $error = "could not open $users_dir/$username/$location/$filename for reading : $!";
-			$log->error("$error\n");
+			$log->error("$error");
 			set_error("$error");
 			browse_menu(
@@ -571,5 +571,5 @@
 		unless (close FILE) {
 			my $error = "could not close $users_dir/$username/$location/$filename : $!";
-			$log->error("$error\n");
+			$log->error("$error");
 			set_error("$error");
 			browse_menu(
@@ -578,5 +578,5 @@
                         );
 		}
-		$log->debug("closing $users_dir/$username/$location/$filename\n");
+		$log->debug("closing $users_dir/$username/$location/$filename");
 		my $content = $ui->get_menu( 
 			MENU => 'edit_file',
@@ -1085,5 +1085,5 @@
 
 	if ($stat) {
-		$log->standard("$username logged on.\n");
+		$log->standard("$username logged on.");
 		my $cookie = cookie( $auth->set_cookie() );
 		unless ($cookie) {
@@ -1094,5 +1094,5 @@
 	}
 	else {
-		$log->standard("Invalid login attempt, username: $username\n");
+		$log->standard("Invalid login attempt, username: $username");
 		set_error("Login incorrect!");
 		login_menu();