rat/lonuserstate.pm - diff

Return to lonuserstate.pm CVS log

Up to [LON-CAPA] / rat

Diff for /rat/lonuserstate.pm between versions 1.96 and 1.98

version 1.96, 2005/09/23 21:39:09	version 1.98, 2005/11/15 18:27:52
Line 31 package Apache::lonuserstate;	Line 31 package Apache::lonuserstate;

# ------------------------------------------------- modules used by this module	# ------------------------------------------------- modules used by this module
use strict;	use strict;
use Apache::Constants qw(:common :http);
use HTML::TokeParser;	use HTML::TokeParser;
use Apache::lonnet;	use Apache::lonnet;
use Apache::loncommon();	use Apache::loncommon();
Line 104 sub processversionfile {	Line 103 sub processversionfile {

sub loadmap {	sub loadmap {
my $uri=shift;	my $uri=shift;
if ($hash{'map_pc_'.$uri}) { return OK; }	if ($hash{'map_pc_'.$uri}) { return; }

$pc++;	$pc++;
my $lpc=$pc;	my $lpc=$pc;
Line 119 sub loadmap {	Line 118 sub loadmap {
unless (($fn=~/\.sequence$/) \|\|	unless (($fn=~/\.sequence$/) \|\|
($fn=~/\.page$/)) {	($fn=~/\.page$/)) {
$errtext.="Invalid map: $fn\n";	$errtext.="Invalid map: $fn\n";
return OK;	return;
}	}

my $instr=&Apache::lonnet::getfile($fn);	my $instr=&Apache::lonnet::getfile($fn);
Line 165 sub loadmap {	Line 164 sub loadmap {
if ($token->[2]->{'external'} eq 'true') { # external	if ($token->[2]->{'external'} eq 'true') { # external
$turi=~s/^http\:\/\//\/adm\/wrapper\/ext\//;	$turi=~s/^http\:\/\//\/adm\/wrapper\/ext\//;
} elsif ($turi=~/^\/*uploaded\//) { # uploaded	} elsif ($turi=~/^\/*uploaded\//) { # uploaded
if (($embstyle eq 'img') \|\| ($embstyle eq 'emb')) {	if (($embstyle eq 'img')
	\|\| ($embstyle eq 'emb')
	\|\| ($embstyle eq 'ign')
	\|\| ($embstyle eq 'unk')) {
$turi='/adm/wrapper'.$turi;	$turi='/adm/wrapper'.$turi;
} elsif ($embstyle eq 'ssi') {	} elsif ($embstyle eq 'ssi') {
#do nothing with these	#do nothing with these

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

Removed from v.1.96
changed lines
	Added in v.1.98