[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.154,1.155

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

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

Modified Files:
	sandweb.cgi 
Log Message:
* fixed formatting and data input<->output handling. Still not 100% there
  but data seems to read/write "ok"


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.154
retrieving revision 1.155
diff -U2 -r1.154 -r1.155
--- sandweb.cgi	2002/02/05 07:23:40	1.154
+++ sandweb.cgi	2002/02/05 07:54:44	1.155
@@ -471,4 +471,5 @@
 		preferences_menu( ck_auth => $ck_auth );
 	}
+	#XXX - not accessing $user->{'repo'}->{$repo_name}*
 	my $username = $auth->get_userinfo('username');
 	my $template_dir = $config->{'paths'}->{'template_dir'};
@@ -586,4 +587,5 @@
 	my $template_dir = $config->{'paths'}->{'template_dir'};
 	my $users_dir = $config->{'paths'}->{'users_dir'};
+	#XXX - not accessing $user->{'repo'}->{$repo_name}*
 	my $server = $user->{'repository'}->{'server'};
 	my $vcs_username = $user->{'repository'}->{'username'};
@@ -910,4 +912,5 @@
 	my $users_dir = $config->{'paths'}->{'users_dir'};
 	my %return;
+	#XXX - not accessing $user->{'repo'}->{$repo_name}*
 	my $server = $user->{'repository'}->{'server'};
 	my $vcs_username = $user->{'repository'}->{'username'};
@@ -1257,11 +1260,11 @@
 	load_config(1); # load prefs and do not log error msg
 	my $username = $auth->get_userinfo('username');
-	my $name = $user->{'repository'}->{'name'};
-	my $server = $user->{'repository'}->{'server'};
-	my $vcs_username = $user->{'repository'}->{'username'};
-	my $root = $user->{'repository'}->{'root'};
+	my $name = $user->{'repo'}->{'name'};
+	my $server = $user->{'repo'}->{'server'};
+	my $vcs_username = $user->{'repo'}->{'username'};
+	my $root = $user->{'repo'}->{'root'};
 	my $users_dir = $config->{'paths'}->{'users_dir'};
-	my $repo_type = $user->{'repository'}->{'repo_type'};
-	my $connection = $user->{'repository'}->{'connection'};
+	my $repo_type = $user->{'repo'}->{'repo_type'};
+	my $connection = $user->{'repo'}->{'connection'};
 	my $vcsroot;
 
@@ -1356,13 +1359,4 @@
 	);
 
-	my @repository_params = (
-		'name',
-		'server',
-		'username',
-		'repo_type',
-		'connection',
-		'root',
-	);
-
 	foreach my $param (@personal_params) {
 		if ( CGI::param("$param") ) {
@@ -1371,10 +1365,4 @@
 	}
 
-	foreach my $param (@repository_params) {
-		if ( CGI::param("$param") ) {
-			$user->{'repository'}->{"$param"} = param("$param");
-		}
-	}
-		
 	my $username = $auth->get_userinfo('username');
 	# write config data into the .$user_cfg file in the users directory
@@ -1401,9 +1389,9 @@
     my $repository_selected = $args{'repository_selected'};
     my $repo_name = $args{'repo_name'};
-    my $repo_server = $args{'server'};
-    my $repo_username = $args{'usr_name'};
+    my $repo_server = $args{'repo_server'};
+    my $repo_username = $args{'repo_username'};
     my $repo_type = $args{'repo_type'};
-    my $repo_connection = $args{'connection'};
-    my $repo_root = $args{'root'};
+    my $repo_connection = $args{'repo_connection'};
+    my $repo_root = $args{'repo_root'};
     my $new_repository = $args{'new_repository'} ? 1 : 0;
     unless ($ck_auth) {
@@ -1423,4 +1411,5 @@
         exit(0);
     }
+
     # commit data to file
     $user->{'repo'}->{$repo_name}->{'name'} = $repo_name;
@@ -1433,4 +1422,5 @@
     my $username = $auth->get_userinfo('username');
     # write config data into the .$user_cfg file in the users directory
+	$log->debug("pre-write\n");
     $log->debug('dump', $user->{'repo'});
     my ($return, $msg) = $user->write_preferences_config(
@@ -1498,6 +1488,6 @@
 	$log->debug("verifying repository data structure");	
 	# make sure data structure containing repositories is consistent
-	if ( ($user->{'repo'}->{'repo_type'}) && 
-	    (ref(\$user->{'repo'}->{'repo_type'}) eq 'SCALAR')) {
+	if ( ($user->{'repo'}->{'type'}) && 
+	    (ref(\$user->{'repo'}->{'type'}) eq 'SCALAR')) {
 
 		my %temp = %{$user->{'repo'}};
@@ -1505,4 +1495,5 @@
 		%{$user->{'repo'}->{$temp{'name'}}} = %temp;
 	}
+	$log->debug('dump', $user->{'repo'});
 
 	$log->debug("verifying modules data structure");