Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv6628/bin
Modified Files:
sandweb.cgi
Log Message:
* working on multi-module settings and management of repositories/module,
at a good stopping point for the moment but not everything will work.
Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.130
retrieving revision 1.131
diff -U2 -r1.130 -r1.131
--- sandweb.cgi 2002/01/27 01:55:02 1.130
+++ sandweb.cgi 2002/01/27 02:39:55 1.131
@@ -323,4 +323,6 @@
my %entry;
$entry{'MODULE_NAME'} = $module;
+ $entry{'MODULE_DESC'} = $module_settings->{$module}->{'description'};
+ $entry{'REPOSITORY'} = $module_settings->{$module}->{'repository'};
push @module_loop, \%entry;
}
@@ -1129,12 +1131,21 @@
(ref(\$userprefs->{'repository'}->{'repo_type'}) eq 'SCALAR')) {
- $log->debug("repo_type is not a repository entry.");
my %temp = %{$userprefs->{'repository'}};
- #delete $userprefs->{'repository'};
%{$userprefs->{'repository'}} = ();
%{$userprefs->{'repository'}->{$temp{'name'}}} = %temp;
}
-
$repository_settings = $userprefs->{'repository'};
+
+ $log->debug("verifying modules data structure");
+ # make sure data structure containing repositories is consistent
+ if ( ($userprefs->{'module'}->{'name'}) &&
+ (ref(\$userprefs->{'module'}->{'name'}) eq 'SCALAR')) {
+
+ my %temp = %{$userprefs->{'module'}};
+ %{$userprefs->{'module'}} = ();
+ %{$userprefs->{'module'}->{$temp{'name'}}} = %temp;
+ }
+ $module_settings = $userprefs->{'module'};
+
return 1;
}
|
