loncom/lonsql - diff

Return to lonsql CVS log

Up to [LON-CAPA] / loncom

Diff for /loncom/lonsql between versions 1.13 and 1.34

version 1.13, 2001/03/26 20:17:20	version 1.34, 2001/04/16 18:51:22
Line 19 require "find.pl";	Line 19 require "find.pl";
sub wanted {	sub wanted {
(($dev,$ino,$mode,$nlink,$uid,$gid) = lstat($_)) &&	(($dev,$ino,$mode,$nlink,$uid,$gid) = lstat($_)) &&
-f _ &&	-f _ &&
/^.*\.meta$/ &&	/^.*\.meta$/ && !/^.+\.\d+\.[^\.]+\.meta$/ &&
push(@metalist,"$dir/$_");	push(@metalist,"$dir/$_");
}	}


$childmaxattempts=10;	$childmaxattempts=10;
$run =0;#running counter to generate the query-id	$run =0;#running counter to generate the query-id

Line 39 while ($configline=<CONFIG>) {	Line 38 while ($configline=<CONFIG>) {
}	}
close(CONFIG);	close(CONFIG);

	# ------------------------------------- Make sure that database can be accessed
	{
	my $dbh;
	unless (
	$dbh = DBI->connect("DBI:mysql:loncapa","www",$perlvar{'lonSqlAccess'},{ RaiseError =>0,PrintError=>0})
	) {
	print "Cannot connect to database!\n";
	exit;
	}
	else {
	$dbh->disconnect;
	}
	}

# --------------------------------------------- Check if other instance running	# --------------------------------------------- Check if other instance running

my $pidfile="$perlvar{'lonDaemons'}/logs/lonsql.pid";	my $pidfile="$perlvar{'lonDaemons'}/logs/lonsql.pid";
Line 60 while ($configline=<CONFIG>) {	Line 73 while ($configline=<CONFIG>) {
chomp($ip);	chomp($ip);

$hostip{$ip}=$id;	$hostip{$ip}=$id;

if ($id eq $perlvar{'lonHostID'}) { $thisserver=$name; }	if ($id eq $perlvar{'lonHostID'}) { $thisserver=$name; }

$PREFORK++;	$PREFORK++;
Line 191 sub make_new_child {	Line 203 sub make_new_child {
#open database handle	#open database handle
# making dbh global to avoid garbage collector	# making dbh global to avoid garbage collector
unless (	unless (
$dbh = DBI->connect("DBI:mysql:loncapa","www","123",{ RaiseError =>0,PrintError=>0})	$dbh = DBI->connect("DBI:mysql:loncapa","www",$perlvar{'lonSqlAccess'},{ RaiseError =>0,PrintError=>0})
) {	) {
my $st=120+int(rand(240));	sleep(10+int(rand(20)));
&logthis("<font color=blue>WARNING: Couldn't connect to database ($st secs): $@</font>");	&logthis("<font color=blue>WARNING: Couldn't connect to database ($st secs): $@</font>");
print "database handle error\n";	print "database handle error\n";
sleep($st);
exit;	exit;

};	};
Line 212 sub make_new_child {	Line 223 sub make_new_child {
my $userinput = <$client>;	my $userinput = <$client>;
chomp($userinput);	chomp($userinput);

my ($conserver,$querytmp,$customtmp)=split(/&/,$userinput);	my ($conserver,$querytmp,
	$customtmp,$customshowtmp)=split(/&/,$userinput);
my $query=unescape($querytmp);	my $query=unescape($querytmp);
my $custom=unescape($customtmp);	my $custom=unescape($customtmp);
	my $customshow=unescape($customshowtmp);

#send query id which is pid_unixdatetime_runningcounter	#send query id which is pid_unixdatetime_runningcounter
$queryid = $thisserver;	$queryid = $thisserver;
Line 223 sub make_new_child {	Line 236 sub make_new_child {
$queryid .= $run;	$queryid .= $run;
print $client "$queryid\n";	print $client "$queryid\n";

	&logthis("QUERY: $query");
	&logthis("QUERY: $query");
	sleep 1;
#prepare and execute the query	#prepare and execute the query
my $sth = $dbh->prepare($query);	my $sth = $dbh->prepare($query);
my $result;	my $result;
unless ($sth->execute())	my @files;
{	my $subsetflag=0;
&logthis("<font color=blue>WARNING: Could not retrieve from database: $@</font>");	if ($query) {
$result="";	unless ($sth->execute())
}	{
else {	&logthis("<font color=blue>WARNING: Could not retrieve from database: $@</font>");
my $r1=$sth->fetchall_arrayref;	$result="";
my @r2; map {my $a=$_; my @b=map {escape($_)} @$a; push @r2,join(",", @b)} (@$r1);	}
$result=join("&",@r2) . "\n";	else {
	my $r1=$sth->fetchall_arrayref;
	my @r2;
	map {my $a=$_;
	my @b=map {escape($_)} @$a;
	push @files,@{$a}[3];
	push @r2,join(",", @b)
	} (@$r1);
	$result=join("&",@r2);
	}
}	}

# do custom metadata searching here and build into result	# do custom metadata searching here and build into result
if ($custom) {	if ($custom or $customshow) {
&logthis("am going to do custom query for $custom");	&logthis("am going to do custom query for $custom");
@metalist=(); pop @metalist;	if ($query) {
&find("$perlvar{'lonDocRoot'}/res");	@metalist=map {$perlvar{'lonDocRoot'}.$_.'.meta'} @files;
&logthis("FILELIST:" . join(":::",@metalist));	}
	else {
	@metalist=(); pop @metalist;
	opendir(RESOURCES,"$perlvar{'lonDocRoot'}/res/$perlvar{'lonDefDomain'}");
	my @homeusers=grep
	{&ishome("$perlvar{'lonDocRoot'}/res/$perlvar{'lonDefDomain'}/$_")}
	grep {!/^\.\.?$/} readdir(RESOURCES);
	closedir RESOURCES;
	foreach my $user (@homeusers) {
	&find("$perlvar{'lonDocRoot'}/res/$perlvar{'lonDefDomain'}/$user");
	}
	}
	# &logthis("FILELIST:" . join(":::",@metalist));
# if file is indicated in sql database and	# if file is indicated in sql database and
# not part of sql-relevant query, do not pattern match.	# not part of sql-relevant query, do not pattern match.
# if file is not in sql database, output error.	# if file is not in sql database, output error.
# if file is indicated in sql database and is	# if file is indicated in sql database and is
# part of query result list, then do the pattern match.	# part of query result list, then do the pattern match.
my $customresult='';	my $customresult='';
	my @r2;
foreach my $m (@metalist) {	foreach my $m (@metalist) {
my $fh=IO::File->new($m);	my $fh=IO::File->new($m);
my @lines=<$fh>;	my @lines=<$fh>;
my $stuff=join('',@lines);	my $stuff=join('',@lines);
if ($stuff=~/$custom/s) {	if ($stuff=~/$custom/s) {
&logthis("found: $stuff");	foreach my $f ('abstract','author','copyright',
	'creationdate','keywords','language',
	'lastrevisiondate','mime','notes',
	'owner','subject','title') {
	$stuff=~s/\n?\<$f[^\>]\>.?<\/$f[^\>]*\>\n?//;
	}
	my $m2=$m; my $docroot=$perlvar{'lonDocRoot'};
	$m2=~s/^$docroot//;
	$m2=~s/\.meta$//;
	unless ($query) {
	my $q2="select * from metadata where url like '$m2'";
	my $sth = $dbh->prepare($q2);
	$sth->execute();
	my $r1=$sth->fetchall_arrayref;
	map {my $a=$_;
	my @b=map {escape($_)} @$a;
	push @files,@{$a}[3];
	push @r2,join(",", @b)
	} (@$r1);
	}
	# &logthis("found: $stuff");
	$customresult.='&custom='.escape($m2).','.escape($stuff);
}	}
$customresult.='&custom='.escape($stuff);
}	}
	$result=join("&",@r2) unless $query;
$result.=$customresult;	$result.=$customresult;
}	}
# reply with result	# reply with result
$result.="ABCABC";	$result.="\n" if $result;
&reply("queryreply:$queryid:$result",$conserver);	&reply("queryreply:$queryid:$result",$conserver);

}	}
Line 312 sub reply {	Line 370 sub reply {
}	}
} else {	} else {
$answer='self_reply';	$answer='self_reply';
	$answer=subreply($cmd,$server);
}	}
return $answer;	return $answer;
}	}
Line 331 sub unescape {	Line 390 sub unescape {
$str =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;	$str =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
return $str;	return $str;
}	}

	# --------------------------------------- Is this the home server of an author?
	# (copied from lond, modification of the return value)
	sub ishome {
	my $author=shift;
	$author=~s/\/home\/httpd\/html\/res\/([^\/])\/([^\/]).*/$1\/$2/;
	my ($udom,$uname)=split(/\//,$author);
	my $proname=propath($udom,$uname);
	if (-e $proname) {
	return 1;
	} else {
	return 0;
	}
	}

	# -------------------------------------------- Return path to profile directory
	# (copied from lond)
	sub propath {
	my ($udom,$uname)=@_;
	$udom=~s/\W//g;
	$uname=~s/\W//g;
	my $subdir=$uname.'__';
	$subdir =~ s/(.)(.)(.).*/$1\/$2\/$3/;
	my $proname="$perlvar{'lonUsersDir'}/$udom/$subdir/$uname";
	return $proname;
	}

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

Removed from v.1.13
changed lines
	Added in v.1.34