Menu
▾
▴
[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.204,1.205
|
From: Nick J. <nje...@us...> - 2002-02-23 03:47:28
|
Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv19982
Modified Files:
sandweb.cgi
Log Message:
* fixed up some code
Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.204
retrieving revision 1.205
diff -U2 -r1.204 -r1.205
--- sandweb.cgi 22 Feb 2002 22:10:31 -0000 1.204
+++ sandweb.cgi 23 Feb 2002 03:47:25 -0000 1.205
@@ -436,8 +436,8 @@
my $repo_server = $user->get_repo_server(repo => $repo_name);
- my $repo_username = $user->get_repo_username(repo => $repo_name);
- my $repo_type = $user->get_repo_type(repo => $repo_name);
- my $repo_connection = $user->get_repo_connection(repo => $repo_name);
- my $repo_root = $user->get_repo_root(repo => $repo_name);
+ my $repo_username = $user->get_repo_username(repo => $repo_name);
+ my $repo_type = $user->get_repo_type(repo => $repo_name);
+ my $repo_connection = $user->get_repo_connection(repo => $repo_name);
+ my $repo_root = $user->get_repo_root(repo => $repo_name);
my $vcsroot;
@@ -587,156 +587,156 @@
###############################################################################
sub repository_menu {
- my %args = @_;
- my $ck_auth = $args{'ck_auth'};
- my $repository_selected = $args{'repository_selected'};
- my $repo_name = $args{'repo_name'};
- my $repo_server = $args{'repo_server'};
- my $repo_username = $args{'repo_username'};
- my $repo_type = $args{'repo_type'};
- my $repo_connection = $args{'repo_connection'};
- my $repo_root = $args{'repo_root'};
- my $new_repository = $args{'new_repository'} ? 1 : 0;
- my $submit = $args{'submit'} ? 1 : 0;
-
- $log->debug("entering repository_menu\n");
-
- $log->debug("<pre>" . Dumper(\%args) . "</pre>");
-
- my $new_string = 'Add a new repository';
- my $username = $auth->get_username();
- my $users_dir = $config->{'paths'}->{'users_dir'};
- my @repos = $user->get_repo_list(); # get list of repositories
-
- $repository_selected = $repository_selected || $repos[0] || $new_string; # default for pulldown
-
- if (($repository_selected) && ($repository_selected ne $new_string)) {
- my $valid = 0;
- # verify repository name
- foreach my $repo (@repos) {
- if ($repository_selected eq $repo) {
- $repo_name = $repo;
- $valid = 1;
- }
- }
- if (!$valid) {
- # bad repository name
- set_error("Invalid repository name: $repository_selected\n");
- $repository_selected = $new_string;
- $repo_name = '';
- }
- }
-
- if (($repository_selected eq $new_string) && (!$new_repository)) {
- # repository selected was 'add new repository'
- # new repository display
+ my %args = @_;
+ my $ck_auth = $args{'ck_auth'};
+ my $repository_selected = $args{'repository_selected'};
+ my $repo_name = $args{'repo_name'};
+ my $repo_server = $args{'repo_server'};
+ my $repo_username = $args{'repo_username'};
+ my $repo_type = $args{'repo_type'};
+ my $repo_connection = $args{'repo_connection'};
+ my $repo_root = $args{'repo_root'};
+ my $new_repository = $args{'new_repository'} ? 1 : 0;
+ my $submit = $args{'submit'} ? 1 : 0;
+
+ $log->debug("entering repository_menu\n");
+
+ $log->debug("<pre>" . Dumper(\%args) . "</pre>");
+
+ my $new_string = 'Add a new repository';
+ my $username = $auth->get_username();
+ my $users_dir = $config->{'paths'}->{'users_dir'};
+ my @repos = $user->get_repo_list(); # get list of repositories
+
+ # default for pulldown
+ $repository_selected = $repository_selected || $repos[0] || $new_string;
+
+ if (($repository_selected) && ($repository_selected ne $new_string)) {
+ my $valid = 0;
+ # verify repository name
+ foreach my $repo (@repos) {
+ if ($repository_selected eq $repo) {
+ $repo_name = $repo;
+ $valid = 1;
+ }
+ }
+ if (!$valid) {
+ # bad repository name
+ set_error("Invalid repository name: $repository_selected\n");
+ $repository_selected = $new_string;
+ $repo_name = '';
+ }
+ }
+
+ if (($repository_selected eq $new_string) && (!$new_repository)) {
+ # repository selected was 'add new repository'
+ # new repository display
$repo_name = '';
- $repo_server = '';
- $repo_username = '';
- $repo_connection = '';
- $repo_type = '';
- $repo_root = '';
+ $repo_server = '';
+ $repo_username = '';
+ $repo_connection = '';
+ $repo_type = '';
+ $repo_root = '';
- } elsif ($repository_selected) {
- # display existing repository
+ } elsif ($repository_selected) {
+ # display existing repository
$repo_name = $repository_selected;
- $repo_server =
+ $repo_server =
$user->get_repo_server(repo => $repo_name);
- $repo_username =
+ $repo_username =
$user->get_repo_username(repo => $repo_name);
- $repo_connection =
+ $repo_connection =
$user->get_repo_connection(repo => $repo_name);
- $repo_type =
+ $repo_type =
$user->get_repo_type(repo => $repo_name);
- $repo_root =
+ $repo_root =
$user->get_repo_root(repo => $repo_name);
- }
+ }
+
+ # selected repository data
+ my $vcsroot;
- # selected repository data
- my $vcsroot;
+ my $repository = SandWeb::Repository->new(
+ root => "",
+ repo_type => "",
+ sandbox => "$users_dir/$username",
+ );
- my $repository = SandWeb::Repository->new(
- root => "",
- repo_type => "",
- sandbox => "$users_dir/$username",
- );
-
- my @connections = $repository->get_connections();
- my @repo_types = $repository->get_repo_types();
-
- # loop data
- my @loop_repo_connection = ();
- my @loop_repository_select = ();
- my @loop_repo_type = ();
+ my @connections = $repository->get_connections();
+ my @repo_types = $repository->get_repo_types();
+
+ # loop data
+ my @loop_repo_connection = ();
+ my @loop_repository_select = ();
+ my @loop_repo_type = ();
$log->debug('@repos: '. join('-', @repos). "\nrepository_selected: '$repository_selected'\n");
- foreach my $repo (@repos) {
+ foreach my $repo (@repos) {
chomp $repo;
- my %entries;
- if ($repository_selected eq $repo) {
- # Doesn't seem to work!?? ($repository_selected != $new_string)) {
- $entries{REPOSITORY_ENTRY} = "<option selected>$repo</option>";
- } else {
- $entries{REPOSITORY_ENTRY} = "<option>$repo</option>";
- }
- push (@loop_repository_select, \%entries);
- }
- # add new repo
- my %tmp;
- if ($repository_selected eq $new_string) {
- $tmp{REPOSITORY_ENTRY} = "<option selected>$new_string</option>";
-
- } else {
- $tmp{REPOSITORY_ENTRY} = "<option>$new_string</option>";
-
- }
- push (@loop_repository_select, \%tmp);
-
-
- foreach my $type (@connections) {
- my %row_data;
- if ($type eq $repo_connection) {
- $row_data{REPO_CONNECTION} = "<option selected>$type</option>";
- }
- else {
- $row_data{REPO_CONNECTION} = "<option>$type</option>";
- }
- push (@loop_repo_connection, \%row_data);
- }
-
- foreach my $type (@repo_types) {
- my %row_data;
- if ($type eq $repo_type) {
- $row_data{REPO_TYPE} = "<option selected>$type</option>";
- }
- else {
- $row_data{REPO_TYPE} = "<option>$type</option>";
- }
- push (@loop_repo_type, \%row_data);
- }
-
-
- my $content = $ui->get_menu(
- MENU => 'repository',
- PROGNAME => $progname,
- LOOP_REPO_CONNECTION => \@loop_repo_connection,
- LOOP_REPO_TYPE => \@loop_repo_type,
- LOOP_REPOSITORY_SELECT => \@loop_repository_select,
- REPOSITORY_SELECTED => $repository_selected,
- REPO_ROOT => $repo_root,
- REPO_NAME => $repo_name,
- REPO_SERVER => $repo_server,
- REPO_USERNAME => $repo_username,
- );
-
- print CGI::header( -cookie => $ck_auth );
- $ui->print_screen(
- TITLE=> 'SandWeb : repository',
- MENU_TITLE => 'SandWeb',
- SUBMENU_TITLE => 'repository',
- FOOTER => '',
- CONTENT => $content,
- ERROR => $error,
- );
- exit 0;
+ my %entries;
+ if ($repository_selected eq $repo) {
+ $entries{REPOSITORY_ENTRY} = "<option selected>$repo</option>";
+ } else {
+ $entries{REPOSITORY_ENTRY} = "<option>$repo</option>";
+ }
+ push (@loop_repository_select, \%entries);
+ }
+ # add new repo
+ my %tmp;
+ if ($repository_selected eq $new_string) {
+ $tmp{REPOSITORY_ENTRY} = "<option selected>$new_string</option>";
+
+ } else {
+ $tmp{REPOSITORY_ENTRY} = "<option>$new_string</option>";
+
+ }
+ push (@loop_repository_select, \%tmp);
+
+
+ foreach my $type (@connections) {
+ my %row_data;
+ if ($type eq $repo_connection) {
+ $row_data{REPO_CONNECTION} = "<option selected>$type</option>";
+ }
+ else {
+ $row_data{REPO_CONNECTION} = "<option>$type</option>";
+ }
+ push (@loop_repo_connection, \%row_data);
+ }
+
+ foreach my $type (@repo_types) {
+ my %row_data;
+ if ($type eq $repo_type) {
+ $row_data{REPO_TYPE} = "<option selected>$type</option>";
+ }
+ else {
+ $row_data{REPO_TYPE} = "<option>$type</option>";
+ }
+ push (@loop_repo_type, \%row_data);
+ }
+
+
+ my $content = $ui->get_menu(
+ MENU => 'repository',
+ PROGNAME => $progname,
+ LOOP_REPO_CONNECTION => \@loop_repo_connection,
+ LOOP_REPO_TYPE => \@loop_repo_type,
+ LOOP_REPOSITORY_SELECT => \@loop_repository_select,
+ REPOSITORY_SELECTED => $repository_selected,
+ REPO_ROOT => $repo_root,
+ REPO_NAME => $repo_name,
+ REPO_SERVER => $repo_server,
+ REPO_USERNAME => $repo_username,
+ );
+
+ print CGI::header( -cookie => $ck_auth );
+ $ui->print_screen(
+ TITLE=> 'SandWeb : repository',
+ MENU_TITLE => 'SandWeb',
+ SUBMENU_TITLE => 'repository',
+ FOOTER => '',
+ CONTENT => $content,
+ ERROR => $error,
+ );
+ exit 0;
}
@@ -834,8 +834,8 @@
my $repo_server = $user->get_repo_server(repo => $repo_name);
- my $repo_username = $user->get_repo_username(repo => $repo_name);
- my $repo_type = $user->get_repo_type(repo => $repo_name);
- my $repo_connection = $user->get_repo_connection(repo => $repo_name);
- my $repo_root = $user->get_repo_root(repo => $repo_name);
+ my $repo_username = $user->get_repo_username(repo => $repo_name);
+ my $repo_type = $user->get_repo_type(repo => $repo_name);
+ my $repo_connection = $user->get_repo_connection(repo => $repo_name);
+ my $repo_root = $user->get_repo_root(repo => $repo_name);
my $vcsroot;
@@ -1210,8 +1210,8 @@
my $repo_server = $user->get_repo_server(repo => $repo_name);
- my $repo_username = $user->get_repo_username(repo => $repo_name);
- my $repo_type = $user->get_repo_type(repo => $repo_name);
- my $repo_connection = $user->get_repo_connection(repo => $repo_name);
- my $repo_root = $user->get_repo_root(repo => $repo_name);
+ my $repo_username = $user->get_repo_username(repo => $repo_name);
+ my $repo_type = $user->get_repo_type(repo => $repo_name);
+ my $repo_connection = $user->get_repo_connection(repo => $repo_name);
+ my $repo_root = $user->get_repo_root(repo => $repo_name);
my $sandbox = $user->{'paths'}->{'users_dir'} || '';
@@ -1405,8 +1405,8 @@
$log->debug('dump', \%return);
my $return = write_config();
- if (! $return) {
- # uh oh, problem occured
- checkout_menu( ck_auth => $ck_auth );
- }
+ if (! $return) {
+ # uh oh, problem occured
+ checkout_menu( ck_auth => $ck_auth );
+ }
my $content = $ui->get_menu(
@@ -1473,28 +1473,28 @@
sub repository_commit {
- my %args = @_;
- my $ck_auth = $args{'ck_auth'};
- my $repository_selected = $args{'repository_selected'};
- my $repo_name = $args{'repo_name'};
- my $repo_server = $args{'repo_server'};
- my $repo_username = $args{'repo_username'};
- my $repo_type = $args{'repo_type'};
- my $repo_connection = $args{'repo_connection'};
- my $repo_root = $args{'repo_root'};
- my $new_repository = $args{'new_repository'} ? 1 : 0;
- my $new_string = 'Add a new repository';
-
- load_config(1); # load prefs and do not log error msg
- $log->debug("<pre>" . Dumper(\%args) . "</pre>");
-
- if (! $repo_name) {
- # cannot commit without repository name
- $log->error("cannot commit without repository name!\n");
- set_error("cannot commit without repository name!\n");
- repository_menu( ck_auth => $ck_auth );
- exit(0);
- }
+ my %args = @_;
+ my $ck_auth = $args{'ck_auth'};
+ my $repository_selected = $args{'repository_selected'};
+ my $repo_name = $args{'repo_name'};
+ my $repo_server = $args{'repo_server'};
+ my $repo_username = $args{'repo_username'};
+ my $repo_type = $args{'repo_type'};
+ my $repo_connection = $args{'repo_connection'};
+ my $repo_root = $args{'repo_root'};
+ my $new_repository = $args{'new_repository'} ? 1 : 0;
+ my $new_string = 'Add a new repository';
+
+ load_config(1); # load prefs and do not log error msg
+ $log->debug("<pre>" . Dumper(\%args) . "</pre>");
+
+ if (! $repo_name) {
+ # cannot commit without repository name
+ $log->error("cannot commit without repository name!\n");
+ set_error("cannot commit without repository name!\n");
+ repository_menu( ck_auth => $ck_auth );
+ exit(0);
+ }
- # commit data to file
+ # commit data to file
if ($user->repository_exists(repo => $repo_name)) {
$log->debug("updating: username '$repo_username'\n");
@@ -1519,12 +1519,12 @@
my $return = write_config();
- if (! $return) {
- # uh oh, problem occured
- repository_menu( ck_auth => $ck_auth );
- }
- # when finished go to repository menu. (this should be dynamic probably,
- # so it returns to whichever menu they wanted to go to in the first
- # place).
- repository_menu( ck_auth => $ck_auth, repository_selected => $repo_name );
+ if (! $return) {
+ # uh oh, problem occured
+ repository_menu( ck_auth => $ck_auth );
+ }
+ # when finished go to repository menu. (this should be dynamic probably,
+ # so it returns to whichever menu they wanted to go to in the first
+ # place).
+ repository_menu( ck_auth => $ck_auth, repository_selected => $repo_name );
}
@@ -1587,5 +1587,5 @@
###############################################################################
sub write_config {
- $log->debug("write_config()");
+ $log->debug("write_config()");
my $username = $auth->get_username();
# write config data into the .$user_cfg file in the users directory
@@ -1595,9 +1595,9 @@
);
- if (! $return) {
- # uh oh, problem occured
- $log->debug("ERROR: $msg");
- $log->error("$msg");
- set_error("$msg");
+ if (! $return) {
+ # uh oh, problem occured
+ $log->debug("ERROR: $msg");
+ $log->error("$msg");
+ set_error("$msg");
return 0;
}
|
