[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.316,1.317

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

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

Modified Files:
	sandweb.cgi 
Log Message:
view_file now checks to see if the current file exists or not.


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.316
retrieving revision 1.317
diff -U2 -r1.316 -r1.317
--- sandweb.cgi	15 Aug 2002 03:13:30 -0000	1.316
+++ sandweb.cgi	28 Aug 2002 00:13:03 -0000	1.317
@@ -267,5 +267,5 @@
 				}
 
-				if ( $vcs_command eq "branch" ) {
+  				if ( $vcs_command eq "branch" ) {
 					my $branch_sync = $cgi->param('branch_sync') || '';
 					my $branch_switch = $cgi->param('branch_switch') || '';
@@ -1100,5 +1100,9 @@
 	if ( $file->get_file_type() ne "Text" ) {
 		$log->debug("User wants to view non-text file : $filename");
-		set_message("This does not appear to be a text file.");
+		if ( $file->exists() ) {
+			set_message("This does not appear to be a text file.");
+		} else {
+			set_message("This file does not exist.");
+		}
 		$file_content = "";
 	} else {
@@ -1173,17 +1177,31 @@
 	);
 
-	my $menu = $ui->get_menu( 
-		MENU => 'view_file',
-		PROGNAME => "$progname",
-		MODULE_NAME => $module_name,
-		REPO_NAME => $repo_name,
-		FILENAME => "$filename",
-		LOCATION => "$location",
-		EDIT => "$edit",
-		FILE_CONTENT => "$file_content",
-		FILE_SIZE => $file->get_size(),
-		FILE_TYPE => $file->get_file_type(),
-		FILE_AGE => $file->get_age(),
-	);
+	my $menu;
+
+	if ( $file->exists() ) {
+		$menu = $ui->get_menu( 
+			MENU => 'view_file',
+			PROGNAME => "$progname",
+			MODULE_NAME => $module_name,
+			REPO_NAME => $repo_name,
+			FILENAME => "$filename",
+			LOCATION => "$location",
+			EDIT => "$edit",
+			FILE_CONTENT => "$file_content",
+			FILE_SIZE => $file->get_size(),
+			FILE_TYPE => $file->get_file_type(),
+			FILE_AGE => $file->get_age(),
+		);
+	} else {
+		$log->debug("User viewing file that does not exist : $location/$filename");
+		$menu = $ui->get_menu( 
+			MENU => 'output',
+			PROGNAME => "$progname",
+			FILENAME => "$filename",
+			LOCATION => "$location",
+			OUTPUT => "No such file.",
+		);
+	}		
+
 
 	my $popup_footer = $ui->get_menu(