doc/loncapafiles/updatequery.piml - diff

Return to updatequery.piml CVS log

Up to [LON-CAPA] / doc / loncapafiles

Diff for /doc/loncapafiles/updatequery.piml between versions 1.15 and 1.18

version 1.15, 2002/06/09 23:31:09	version 1.18, 2002/08/17 19:05:03
Line 145 END	Line 145 END
}	}
my $choice=<>;	my $choice=<>;
chomp($choice);	chomp($choice);
	my $bad_domain_flag=0;
	my @bad_domain_names=('raw','userfiles','priv','adm','uploaded');
	foreach my $bad (@bad_domain_names) {
	$bad_domain_flag=1 if $choice eq $bad;
	}
if ($ipdomain and $choice=~/^\s*$/) {	if ($ipdomain and $choice=~/^\s*$/) {
$choice=$ipdomain;	$choice=$ipdomain;
open(OUT,'>>/tmp/loncapa_updatequery.out');	open(OUT,'>>/tmp/loncapa_updatequery.out');
Line 161 END	Line 166 END
$r='l';	$r='l';
$flag=1;	$flag=1;
}	}
	elsif ($bad_domain_flag) {
	print "Invalid input ('$choice' conflicts with LON-CAPA namespace).\n";
	print "Please try something different than '$choice'\n";
	}
else {	else {
print "Invalid input (only alphanumeric characters supported).\n";	print "Invalid input (only alphanumeric characters supported).\n";
}	}
Line 264 my %perlvar;	Line 273 my %perlvar;
$perlvar{'lonDefDomain'}=$lonDefDomain;	$perlvar{'lonDefDomain'}=$lonDefDomain;
$perlvar{'lonAdmEMail'}=$lonAdmEMail;	$perlvar{'lonAdmEMail'}=$lonAdmEMail;
$perlvar{'lonRole'}=$lonRole;	$perlvar{'lonRole'}=$lonRole;
unless ($perlvar{'lonSqlAccess'}) {	unless ($perlvar{'lonLoadLim'} and $perlvar{'lonLoadLim'}!~/\{\[\[\[\[/) {
$perlvar{'lonSqlAccess'}='localhostkey';
}
unless ($perlvar{'lonLoadLim'}) {
$perlvar{'lonLoadLim'}='2.00';	$perlvar{'lonLoadLim'}='2.00';
}	}
unless ($perlvar{'lonExpire'}) {	unless ($perlvar{'lonExpire'} and $perlvar{'lonExpire'}!~/\{\[\[\[\[/) {
$perlvar{'lonExpire'}='86400';	$perlvar{'lonExpire'}='86400';
}	}
unless ($perlvar{'lonReceipt'}) {	unless ($perlvar{'lonReceipt'} and $perlvar{'lonReceipt'}!~/\{\[\[\[\[/) {
my $lonReceipt='';	my $lonReceipt='';
srand(time ^ $$ ^ unpack "%L*", `ps axww \| gzip`);	srand(time ^ $$ ^ unpack "%L*", `ps axww \| gzip`);
my @alnum=(0..9,a..z);	my @alnum=(0..9,a..z);
Line 313 my %perlvar;	Line 319 my %perlvar;
}	}
close(CONFIG);	close(CONFIG);
}	}
	unless ($perlvar{'lonLoadLim'} and $perlvar{'lonLoadLim'}!~/\{\[\[\[\[/) {
	$perlvar{'lonLoadLim'}='2.00';
	}
	unless ($perlvar{'lonExpire'} and $perlvar{'lonExpire'}!~/\{\[\[\[\[/) {
	$perlvar{'lonExpire'}='86400';
	}
	unless ($perlvar{'lonReceipt'} and $perlvar{'lonReceipt'}!~/\{\[\[\[\[/) {
	my $lonReceipt='';
	srand(time ^ $$ ^ unpack "%L*", `ps axww \| gzip`);
	my @alnum=(0..9,a..z);
	foreach my $i (1..20) {
	$lonReceipt.=$alnum[int(rand(36))];
	}
	$perlvar{'lonReceipt'}=$lonReceipt;
	}
my %perlvarstatic;	my %perlvarstatic;
if (-e "${confdir}loncapa_apache.conf") {	if (-e "${confdir}loncapa_apache.conf") {
open(CONFIG,'<'.$confdir.'loncapa_apache.conf') or	open(CONFIG,'<'.$confdir.'loncapa_apache.conf') or
Line 330 my %perlvarstatic;	Line 351 my %perlvarstatic;
# update loncapa.conf until 7 is entered	# update loncapa.conf until 7 is entered

$flag=0;	$flag=0;

while (!$flag) {	while (!$flag) {
print(<<END);	print(<<END);

Line 343 This is now the current configuration of	Line 365 This is now the current configuration of
6) Server Load: $perlvar{'lonLoadLim'}	6) Server Load: $perlvar{'lonLoadLim'}
7) Everything is correct up above	7) Everything is correct up above
END	END
	my $hbug=-1;
	my $dbug=-1;
	{
	my $v=$perlvar{'lonHostID'};
	$hbug=0;
	$hbug=1 if $v=~/\W/;
	$hbug=1 if $v=~/\_/;
	}
	{
	my $v=$1;
	$dbug=0;
	$dbug=1 if $v=~/\W/;
	$dbug=1 if $v=~/\_/;
	}

	if ($hbug) {
	print "** ERROR ** ".
	"Invalid lonHostID (should only be letters and/or digits)\n";
	}
	if ($dbug) {
	print "** ERROR ** ".
	"Invalid lonDefDomain (should only be letters and/or digits)\n";
	}

print(<<END);	print(<<END);
ENTER A CHOICE OF 1-6 TO CHANGE, otherwise ENTER 7:	ENTER A CHOICE OF 1-6 TO CHANGE, otherwise ENTER 7:
END	END
Line 350 my $choice=<>;	Line 396 my $choice=<>;
chomp($choice);	chomp($choice);
if ($choice==1) {	if ($choice==1) {
print(<<END);	print(<<END);
2) Domain Name: $perlvar{'lonDefDomain'}	1) Domain Name: $perlvar{'lonDefDomain'}
ENTER NEW VALUE:	ENTER NEW VALUE:
END	END
my $choice2=<>;	my $choice2=<>;
Line 359 END	Line 405 END
}	}
elsif ($choice==2) {	elsif ($choice==2) {
print(<<END);	print(<<END);
1) Machine Name: $perlvar{'lonHostID'}	2) Machine Name: $perlvar{'lonHostID'}
ENTER NEW VALUE:	ENTER NEW VALUE:
END	END
my $choice2=<>;	my $choice2=<>;

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.15
changed lines
	Added in v.1.18