[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.173,1.174

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

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

Modified Files:
	sandweb.cgi 
Log Message:
* beginning to encapsulate config data. 
* created add_module_entry to Config class
* converted getting repo lists & getting module lists to methods


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.173
retrieving revision 1.174
diff -U2 -r1.173 -r1.174
--- sandweb.cgi	17 Feb 2002 20:27:56 -0000	1.173
+++ sandweb.cgi	18 Feb 2002 10:28:13 -0000	1.174
@@ -101,15 +101,15 @@
 
 		# has valid auth cookie
-		my $repository_selected = CGI::param('repository_selected');
-		my $repo_name = CGI::param('repo_name');
-		my $repo_server = CGI::param('repo_server');
-		my $repo_username = CGI::param('repo_username');
-		my $repo_type = CGI::param('repo_type');
-		my $repo_connection = CGI::param('repo_connection');
-		my $repo_root = CGI::param('repo_root');
-		my $new_repository = CGI::param('new_repository');
-		my $submit = CGI::param('Submit');
-		my $vcs_command = CGI::param('vcs_command');
-		my $module_name = CGI::param('module_name');
+		my $repository_selected = CGI::param('repository_selected') || '';
+		my $repo_name = CGI::param('repo_name') || '';
+		my $repo_server = CGI::param('repo_server') || '';
+		my $repo_username = CGI::param('repo_username') || '';
+		my $repo_type = CGI::param('repo_type') || '';
+		my $repo_connection = CGI::param('repo_connection') || '';
+		my $repo_root = CGI::param('repo_root') || '';
+		my $new_repository = CGI::param('new_repository') || '';
+		my $submit = CGI::param('Submit') || '';
+		my $vcs_command = CGI::param('vcs_command') || '';
+		my $module_name = CGI::param('module_name') || '';
 
 		$log->debug("action: $action submit: $submit");
@@ -356,5 +356,5 @@
 	load_config(1); 
 
-	my @repo_list = sort keys %{$user->{'repo'}};
+	my @repo_list = $user->get_repo_list();
 	my @module_list = ();
 
@@ -362,5 +362,5 @@
 	$log->debug("module_list ref: " . ref $user->{'repo'}->{$repo_name}->{'module_list'}); 
 		my @module_list = 
-			@{$user->{'repo'}->{$repo_name}->{'module_list'}}; 
+			$user->get_module_list(repo => $repo_name ); 
 
 		if ($#module_list < 0) {
@@ -564,5 +564,5 @@
     my $username = $auth->get_userinfo('username');
     my $users_dir = $config->{'paths'}->{'users_dir'};
-    my @repos = sort keys %{$user->{'repo'}}; # get list of repositories
+    my @repos = $user->get_repo_list(); # get list of repositories
     $log->debug("<pre>" . Dumper(\%{$user->{'repo'}}) . "</pre>");
 
@@ -1042,5 +1042,5 @@
 	}
 	
-	my @repos = sort keys %{$user->{'repo'}};
+	my @repos = $user->get_repo_list();
 	my @repo_list = ();
 
@@ -1241,8 +1241,9 @@
 	my $repo_connection = $user->{'repo'}->{$repo_name}->{'connection'};
 	my $repo_root = $user->{'repo'}->{$repo_name}->{'root'};
+	my $module_desc = 'blah';
 	
 	my @module_list = ();
 	if ($user->{'repo'}->{$repo_name}->{'module_list'}) {
-		@module_list =  @{$user->{'repo'}->{$repo_name}->{'module_list'}}; 
+		@module_list =  $user->get_module_list(repo => $repo_name ); 
 	}
 
@@ -1255,5 +1256,10 @@
 	if (!$exist) {
 		push @module_list, $module_name;
-		push @{$user->{'repo'}->{$repo_name}->{'module_list'}}, $module_name; 
+		#push @{$user->{'repo'}->{$repo_name}->{'module_list'}}, $module_name; 
+		$user->add_module_entry(repo => $repo_name,
+								module => $module_name,
+								module_desc => $module_desc,
+		);
+								
 	}
 
@@ -1469,5 +1475,5 @@
 	$log->debug('dump', $user->{'repo'});
 
-	foreach my $repo_name (sort keys %{$user->{'repo'}}) {
+	foreach my $repo_name ($user->get_repo_list()) {
 		$log->debug("checking repo: $repo_name " . ref($user->{'repo'}->{$repo_name}->{'module_list'}) . "-");
 		if (ref(\$user->{'repo'}->{$repo_name}->{'module_list'}) ne 'ARRAY') {