version 1.81, 2007/04/12 00:00:55
|
version 1.90, 2008/03/11 01:45:47
|
Line 372 sub make_new_child {
|
Line 372 sub make_new_child {
|
$run = $run+1; |
$run = $run+1; |
my $userinput = <$client>; |
my $userinput = <$client>; |
chomp($userinput); |
chomp($userinput); |
$userinput=~s/\:(\w+)$//; |
$userinput=~s/\:($LONCAPA::domain_re)$//; |
my $searchdomain=$1; |
my $searchdomain=$1; |
# |
# |
my ($conserver,$query, |
my ($conserver,$query, |
Line 387 sub make_new_child {
|
Line 387 sub make_new_child {
|
print $client "$queryid\n"; |
print $client "$queryid\n"; |
# |
# |
# &logthis("QUERY: $query - $arg1 - $arg2 - $arg3 - $queryid"); |
# &logthis("QUERY: $query - $arg1 - $arg2 - $arg3 - $queryid"); |
sleep 1; |
# sleep 1; |
# |
# |
my $result=''; |
my $result=''; |
# |
# |
Line 441 sub make_new_child {
|
Line 441 sub make_new_child {
|
if ($locresult) { |
if ($locresult) { |
$result .= &escape(join(':',map{$_.'='.$replies{$_}} keys %replies)); |
$result .= &escape(join(':',map{$_.'='.$replies{$_}} keys %replies)); |
} |
} |
|
} elsif ($query eq 'usersearch') { |
|
my ($srchby,$srchtype,$srchterm); |
|
if ((&unescape($arg1) eq $searchdomain) && |
|
($arg2 =~ /\%\%/)) { |
|
($srchby,$srchtype) = |
|
map {&unescape($_);} (split(/\%\%/,$arg2)); |
|
$srchterm = &unescape($arg3); |
|
} else { |
|
($srchby,$srchtype,$srchterm) = |
|
map {&unescape($_);} ($arg1,$arg2,$arg3); |
|
} |
|
$result = &do_user_search($searchdomain,$srchby, |
|
$srchtype,$srchterm); |
|
} elsif ($query eq 'instdirsearch') { |
|
$result = &do_inst_dir_search($searchdomain,$arg1,$arg2,$arg3); |
|
} elsif ($query eq 'getinstuser') { |
|
$result = &get_inst_user($searchdomain,$arg1,$arg2); |
} elsif ($query eq 'prepare activity log') { |
} elsif ($query eq 'prepare activity log') { |
my ($cid,$domain) = map {&unescape($_);} ($arg1,$arg2); |
my ($cid,$domain) = map {&unescape($_);} ($arg1,$arg2); |
&logthis('preparing activity log tables for '.$cid); |
&logthis('preparing activity log tables for '.$cid); |
Line 459 sub make_new_child {
|
Line 476 sub make_new_child {
|
($query eq 'portfolio_access')) { |
($query eq 'portfolio_access')) { |
$result = &portfolio_table_update($query,$arg1,$arg2, |
$result = &portfolio_table_update($query,$arg1,$arg2, |
$arg3); |
$arg3); |
|
} elsif ($query eq 'allusers') { |
|
my ($uname,$udom) = map {&unescape($_);} ($arg1,$arg2); |
|
my %userdata; |
|
my (@data) = split(/\%\%/,$arg3); |
|
foreach my $item (@data) { |
|
my ($key,$value) = split(/=/,$item); |
|
$userdata{$key} = &unescape($value); |
|
} |
|
$userdata{'username'} = $uname; |
|
$userdata{'domain'} = $udom; |
|
$result = &allusers_table_update($query,$uname,$udom,\%userdata); |
} else { |
} else { |
# Do an sql query |
# Do an sql query |
$result = &do_sql_query($query,$arg1,$arg2,$searchdomain); |
$result = &do_sql_query($query,$arg1,$arg2,$searchdomain); |
Line 481 sub make_new_child {
|
Line 509 sub make_new_child {
|
} |
} |
} |
} |
|
|
|
sub do_user_search { |
|
my ($domain,$srchby,$srchtype,$srchterm) = @_; |
|
my $result; |
|
my $quoted_dom = $dbh->quote( $domain ); |
|
my ($query,$quoted_srchterm,@fields); |
|
my ($table_columns,$table_indices) = |
|
&LONCAPA::lonmetadata::describe_metadata_storage('allusers'); |
|
foreach my $coldata (@{$table_columns}) { |
|
push(@fields,$coldata->{'name'}); |
|
} |
|
my $fieldlist = join(',',@fields); |
|
$query = "SELECT $fieldlist FROM allusers WHERE (domain = $quoted_dom AND "; |
|
if ($srchby eq 'lastfirst') { |
|
my ($fraglast,$fragfirst) = split(/,/,$srchterm); |
|
$fragfirst =~ s/^\s+//; |
|
$fraglast =~ s/\s+$//; |
|
if ($srchtype eq 'exact') { |
|
$query .= 'lastname = '.$dbh->quote($fraglast). |
|
' AND firstname = '.$dbh->quote($fragfirst); |
|
} elsif ($srchtype eq 'begins') { |
|
$query .= 'lastname LIKE '.$dbh->quote($fraglast.'%'). |
|
' AND firstname LIKE '.$dbh->quote($fragfirst.'%'); |
|
} else { |
|
$query .= 'lastname LIKE '.$dbh->quote('%'.$fraglast.'%'). |
|
' AND firstname LIKE '.$dbh->quote('%'.$fragfirst.'%'); |
|
} |
|
} else { |
|
my %srchfield = ( |
|
uname => 'username', |
|
lastname => 'lastname', |
|
); |
|
if ($srchtype eq 'exact') { |
|
$query .= $srchfield{$srchby}.' = '.$dbh->quote($srchterm); |
|
} elsif ($srchtype eq 'begins') { |
|
$query .= $srchfield{$srchby}.' LIKE '.$dbh->quote($srchterm.'%'); |
|
} else { |
|
$query .= $srchfield{$srchby}.' LIKE '.$dbh->quote('%'.$srchterm.'%'); |
|
} |
|
} |
|
$query .= ") ORDER BY username "; |
|
my $sth = $dbh->prepare($query); |
|
if ($sth->execute()) { |
|
my @results; |
|
while (my @row = $sth->fetchrow_array) { |
|
my @items; |
|
for (my $i=0; $i<@row; $i++) { |
|
push(@items,&escape($fields[$i]).'='.&escape($row[$i])); |
|
} |
|
my $userstr = join(':', @items); |
|
push(@results,&escape($userstr)); |
|
} |
|
$sth->finish; |
|
$result = join('&',@results); |
|
} else { |
|
&logthis('<font color="blue">'. |
|
'WARNING: Could not retrieve from database:'. |
|
$sth->errstr().'</font>'); |
|
} |
|
return $result; |
|
} |
|
|
|
sub do_inst_dir_search { |
|
my ($domain,$srchby,$srchterm,$srchtype) = @_; |
|
$srchby = &unescape($srchby); |
|
$srchterm = &unescape($srchterm); |
|
$srchtype = &unescape($srchtype); |
|
my (%instusers,%instids,$result,$response); |
|
eval { |
|
local($SIG{__DIE__})='DEFAULT'; |
|
$result=&localenroll::get_userinfo($domain,undef,undef,\%instusers, |
|
\%instids,undef,$srchby,$srchterm, |
|
$srchtype); |
|
}; |
|
if ($result eq 'ok') { |
|
if (%instusers) { |
|
foreach my $key (keys(%instusers)) { |
|
my $usrstr = &Apache::lonnet::freeze_escape($instusers{$key}); |
|
$response .=&escape(&escape($key).'='.$usrstr).'&'; |
|
} |
|
} |
|
$response=~s/\&$//; |
|
} else { |
|
$response = 'unavailable'; |
|
} |
|
return $response; |
|
} |
|
|
|
sub get_inst_user { |
|
my ($domain,$uname,$id) = @_; |
|
$uname = &unescape($uname); |
|
$id = &unescape($id); |
|
my (%instusers,%instids,$result,$response); |
|
eval { |
|
local($SIG{__DIE__})='DEFAULT'; |
|
$result=&localenroll::get_userinfo($domain,$uname,$id,\%instusers, |
|
\%instids); |
|
}; |
|
if ($result eq 'ok') { |
|
if (keys(%instusers) > 0) { |
|
foreach my $key (keys(%instusers)) { |
|
my $usrstr = &Apache::lonnet::freeze_escape($instusers{$key}); |
|
$response .= &escape(&escape($key).'='.$usrstr).'&'; |
|
} |
|
} |
|
$response=~s/\&$//; |
|
} else { |
|
$response = 'unavailable'; |
|
} |
|
return $response; |
|
} |
|
|
######################################################## |
######################################################## |
######################################################## |
######################################################## |
|
|
Line 736 sub get_access_hash {
|
Line 875 sub get_access_hash {
|
return %access; |
return %access; |
} |
} |
|
|
|
sub allusers_table_update { |
|
my ($query,$uname,$udom,$userdata) = @_; |
|
my %tablenames = ( |
|
'allusers' => 'allusers', |
|
); |
|
my $result = 'ok'; |
|
my $tablechk = &check_table($query); |
|
if ($tablechk == 0) { |
|
my $request = |
|
&LONCAPA::lonmetadata::create_metadata_storage($query,$query); |
|
$dbh->do($request); |
|
if ($dbh->err) { |
|
&logthis("create $query". |
|
" ERROR: ".$dbh->errstr); |
|
$result = 'error'; |
|
} |
|
} |
|
if ($result eq 'ok') { |
|
my %loghash = |
|
&LONCAPA::lonmetadata::process_allusers_data($dbh,undef, |
|
\%tablenames,$uname,$udom,$userdata,'update'); |
|
foreach my $key (keys(%loghash)) { |
|
&logthis($loghash{$key}); |
|
} |
|
} |
|
return $result; |
|
} |
|
|
########################################### |
########################################### |
sub check_table { |
sub check_table { |
my ($table_id) = @_; |
my ($table_id) = @_; |