loncom/lond - diff

Return to lond CVS log

Up to [LON-CAPA] / loncom

Diff for /loncom/lond between versions 1.265 and 1.266

version 1.265, 2004/11/02 23:13:18	version 1.266, 2004/11/27 17:23:08
Line 3119 sub put_course_id_handler {	Line 3119 sub put_course_id_handler {

my $userinput = "$cmd:$tail";	my $userinput = "$cmd:$tail";

my ($udom, $what) = split(/:/, $tail);	my ($udom, $what) = split(/:/, $tail,2);
chomp($what);	chomp($what);
my $now=time;	my $now=time;
my @pairs=split(/\&/,$what);	my @pairs=split(/\&/,$what);
Line 3127 sub put_course_id_handler {	Line 3127 sub put_course_id_handler {
my $hashref = &tie_domain_hash($udom, "nohist_courseids", &GDBM_WRCREAT());	my $hashref = &tie_domain_hash($udom, "nohist_courseids", &GDBM_WRCREAT());
if ($hashref) {	if ($hashref) {
foreach my $pair (@pairs) {	foreach my $pair (@pairs) {
my ($key,$descr,$inst_code)=split(/=/,$pair);	my ($key,$courseinfo) = split(/=/,$pair);
$hashref->{$key}=$descr.':'.$inst_code.':'.$now;	$hashref->{$key}=$courseinfo.':'.$now;
}	}
if (untie(%$hashref)) {	if (untie(%$hashref)) {
&Reply( $client, "ok\n", $userinput);	&Reply( $client, "ok\n", $userinput);
Line 3176 sub dump_course_id_handler {	Line 3176 sub dump_course_id_handler {

my $userinput = "$cmd:$tail";	my $userinput = "$cmd:$tail";

my ($udom,$since,$description) =split(/:/,$tail);	my ($udom,$since,$description,$instcodefilter,$ownerfilter) =split(/:/,$tail);
if (defined($description)) {	if (defined($description)) {
$description=&unescape($description);	$description=&unescape($description);
} else {	} else {
$description='.';	$description='.';
}	}
	if (defined($instcodefilter)) {
	$instcodefilter=&unescape($instcodefilter);
	} else {
	$instcodefilter='.';
	}
	if (defined($ownerfilter)) {
	$ownerfilter=&unescape($ownerfilter);
	} else {
	$ownerfilter='.';
	}

unless (defined($since)) { $since=0; }	unless (defined($since)) { $since=0; }
my $qresult='';	my $qresult='';
my $hashref = &tie_domain_hash($udom, "nohist_courseids", &GDBM_WRCREAT());	my $hashref = &tie_domain_hash($udom, "nohist_courseids", &GDBM_WRCREAT());
if ($hashref) {	if ($hashref) {
while (my ($key,$value) = each(%$hashref)) {	while (my ($key,$value) = each(%$hashref)) {
my ($descr,$lasttime,$inst_code);	my ($descr,$lasttime,$inst_code,$owner);
if ($value =~ m/^([^\:]):([^\:]):(\d+)$/) {	if ($value =~ m/^([^\:]):([^\:]):([^\:]*):(\d+)$/) {
	($descr,$inst_code,$owner,$lasttime)=($1,$2,$3,$4);
	} elsif ($value =~ m/^([^\:]):([^\:]):(\d+)$/) {
($descr,$inst_code,$lasttime)=($1,$2,$3);	($descr,$inst_code,$lasttime)=($1,$2,$3);
} else {	} else {
($descr,$lasttime) = split(/\:/,$value);	($descr,$lasttime) = split(/\:/,$value);
}	}
if ($lasttime<$since) { next; }	if ($lasttime<$since) { next; }
if ($description eq '.') {	my $match = 1;
$qresult.=$key.'='.$descr.':'.$inst_code.'&';	unless ($description eq '.') {
} else {	my $unescapeDescr = &unescape($descr);
my $unescapeVal = &unescape($descr);	unless (eval('$unescapeDescr=~/\Q$description\E/i')) {
if (eval('$unescapeVal=~/\Q$description\E/i')) {	$match = 0;
$qresult.=$key.'='.$descr.':'.$inst_code.'&';
}	}
	}
	unless ($instcodefilter eq '.' \|\| !defined($instcodefilter)) {
	my $unescapeInstcode = &unescape($inst_code);
	unless (eval('$unescapeInstcode=~/\Q$instcodefilter\E/i')) {
	$match = 0;
	}
}	}
	unless ($ownerfilter eq '.' \|\| !defined($ownerfilter)) {
	my $unescapeOwner = &unescape($owner);
	unless (eval('$unescapeOwner=~/\Q$ownerfilter\E/i')) {
	$match = 0;
	}
	}
	if ($match == 1) {
	$qresult.=$key.'='.$descr.':'.$inst_code.':'.$owner.'&';
	}
}	}
if (untie(%$hashref)) {	if (untie(%$hashref)) {
chop($qresult);	chop($qresult);

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

Removed from v.1.265
changed lines
	Added in v.1.266