[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.129,1.130

[Nick J. <nje...@us...>]

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

Modified Files:
	sandweb.cgi 
Log Message:
* working on sorting out repositoy/module mess


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.129
retrieving revision 1.130
diff -U2 -r1.129 -r1.130
--- sandweb.cgi	2002/01/27 00:34:34	1.129
+++ sandweb.cgi	2002/01/27 01:55:02	1.130
@@ -48,5 +48,7 @@
 # these variables are declared here, they will be 
 # instantiated below ( if needed )
-my $userprefs;  # data loaded from users prefs config file
+my $userprefs;  # user data loaded from users prefs config file
+my $repository_settings;  # repository data loaded from users prefs config file
+my $module_settings;  # module data loaded from users prefs config file
 
 # internal variable configs for development ease
@@ -96,12 +98,5 @@
 				load_prefs(1);
 				$log->debug("loading prefs");
-				my $username = $auth->get_userinfo('username');
 
-				my $repo = $userprefs->{'repository'}->{'name'};
-				my $repo_type = $userprefs->{'repository'}->{'VCS'};
-				my $root = $userprefs->{'repository'}->{'root'};
-				my $server = $userprefs->{'repository'}->{'server'};
-				my $sandbox = $userprefs->{'paths'}->{'users_dir'} . "/$username";
-
 				if ( $action eq 'main_menu' ) {
 					# called main menu
@@ -137,5 +132,5 @@
 					);
 				}
-				elsif ( $action eq 'browse_repository_menu' ) {
+				elsif ( $action eq 'browse_module_menu' ) {
 					# called sandbox viewer
 					my $location = CGI::param('location');
@@ -143,5 +138,5 @@
 						$location = "";
 					}
-					browse_repository_menu( 
+					browse_module_menu( 
 						cookie => $cookie,
 						location => $location,
@@ -310,4 +305,7 @@
 	my $cookie = $args{'cookie'};
 
+	my $no_modules = 0; # true if user has no repositories defined
+	my @module_loop = ();
+
 	$log->debug("entering browse_menu()");
 	unless ($cookie) {
@@ -317,7 +315,21 @@
 	load_prefs(1); 
 
+	my @modules = keys %{$module_settings};
+	if ($#modules < 0) {
+		$no_modules = 1;
+	} else {
+		# build repository list for template
+		foreach my $module (@modules) {
+			my %entry;
+			$entry{'MODULE_NAME'} = $module;
+			push @module_loop, \%entry;
+		}
+	}
+
 	my $content = $ui->get_menu(
 		MENU => 'browse',
 		PROGNAME => "$progname",
+		NO_MODULES => ($no_modules) ? "No exisiting modules.\n" : "",
+		MODULE_LOOP => \@module_loop,
 	);
 
@@ -341,10 +353,10 @@
 #   cookie		- the sessions cookie
 #
-sub browse_repository_menu {
+sub browse_module_menu {
 	my %args = @_;
 	my $location = $args{'location'} || '';
 	my $cookie = $args{'cookie'};
 
-	$log->debug("entering browse_repository_menu()");
+	$log->debug("entering browse_module_menu()");
 
 	unless ($cookie) {
@@ -475,5 +487,5 @@
 			$log->debug("no files selected for removal");
 			set_error("Please select file(s) or folder(s) to remove.");
-			browse_repository_menu( 
+			browse_module_menu( 
 				cookie => $cookie,
 				location => $location,
@@ -504,5 +516,5 @@
 		}
 
-		browse_repository_menu( 
+		browse_module_menu( 
 			cookie => $cookie,
 			location => $location,
@@ -647,5 +659,5 @@
 		if ($file) {
 			$file->create_file();
-			browse_repository_menu( 
+			browse_module_menu( 
 				cookie => $cookie,
 				location => $location,
@@ -674,5 +686,5 @@
 		if ($file) {
 			$file->create_folder();
-			browse_repository_menu( 
+			browse_module_menu( 
 				cookie => $cookie,
 				location => $location,
@@ -714,5 +726,5 @@
 			); 
 
-			browse_repository_menu(
+			browse_module_menu(
 				cookie => $cookie,
 				location => $location,
@@ -760,5 +772,5 @@
 	else {
 		set_error("Invalid selection: $file_command");
-		browse_repository_menu( 
+		browse_module_menu( 
 			cookie => $cookie,
 			location => $location,
@@ -1124,4 +1136,5 @@
 	}
 	
+	$repository_settings = $userprefs->{'repository'};
 	return 1;
 }