version 1.429, 2009/10/19 23:16:36
|
version 1.433, 2009/11/12 15:59:00
|
Line 67 my $currentdomainid;
|
Line 67 my $currentdomainid;
|
my $client; |
my $client; |
my $clientip; # IP address of client. |
my $clientip; # IP address of client. |
my $clientname; # LonCAPA name of client. |
my $clientname; # LonCAPA name of client. |
|
my $clientversion; # LonCAPA version running on client |
|
|
my $server; |
my $server; |
|
|
Line 3121 sub dump_with_regexp {
|
Line 3122 sub dump_with_regexp {
|
my $qresult=''; |
my $qresult=''; |
my $count=0; |
my $count=0; |
while (my ($key,$value) = each(%$hashref)) { |
while (my ($key,$value) = each(%$hashref)) { |
|
if ($namespace eq 'roles') { |
|
if ($key =~ /^($LONCAPA::match_domain)_($LONCAPA::match_community)_(cc|co|in|ta|ep|ad|st|cr)/) { |
|
if ($clientversion =~ /^(\d+)\.(\d+)$/) { |
|
my $major = $1; |
|
my $minor = $2; |
|
next if (($major < 2) || (($major == 2) && ($minor < 10))); |
|
} |
|
} |
|
} |
if ($regexp eq '.') { |
if ($regexp eq '.') { |
$count++; |
$count++; |
if (defined($range) && $count >= $end) { last; } |
if (defined($range) && $count >= $end) { last; } |
Line 3784 sub dump_course_id_handler {
|
Line 3794 sub dump_course_id_handler {
|
$cc_clone{$clonedom.'_'.$clonenum} = 1; |
$cc_clone{$clonedom.'_'.$clonenum} = 1; |
} |
} |
} |
} |
if (defined($createdbefore)) { |
if ($createdbefore ne '') { |
$createdbefore = &unescape($createdbefore); |
$createdbefore = &unescape($createdbefore); |
} else { |
} else { |
$createdbefore = 0; |
$createdbefore = 0; |
} |
} |
if (defined($createdafter)) { |
if ($createdafter ne '') { |
$createdafter = &unescape($createdafter); |
$createdafter = &unescape($createdafter); |
} else { |
} else { |
$createdafter = 0; |
$createdafter = 0; |
} |
} |
if (defined($creationcontext)) { |
if ($creationcontext ne '') { |
$creationcontext = &unescape($creationcontext); |
$creationcontext = &unescape($creationcontext); |
} else { |
} else { |
$creationcontext = '.'; |
$creationcontext = '.'; |
Line 3827 sub dump_course_id_handler {
|
Line 3837 sub dump_course_id_handler {
|
my $items = &Apache::lonnet::thaw_unescape($value); |
my $items = &Apache::lonnet::thaw_unescape($value); |
if (ref($items) eq 'HASH') { |
if (ref($items) eq 'HASH') { |
if ($hashref->{$lasttime_key} eq '') { |
if ($hashref->{$lasttime_key} eq '') { |
next if ($since > 0); |
next if ($since > 1); |
} |
} |
$is_hash = 1; |
$is_hash = 1; |
if (defined($clonerudom)) { |
if (defined($clonerudom)) { |
Line 6263 sub make_new_child {
|
Line 6273 sub make_new_child {
|
&ReadManagerTable(); |
&ReadManagerTable(); |
my $clientrec=defined(&Apache::lonnet::get_hosts_from_ip($outsideip)); |
my $clientrec=defined(&Apache::lonnet::get_hosts_from_ip($outsideip)); |
my $ismanager=($managers{$outsideip} ne undef); |
my $ismanager=($managers{$outsideip} ne undef); |
$clientname = "[unknonwn]"; |
$clientname = "[unknown]"; |
if($clientrec) { # Establish client type. |
if($clientrec) { # Establish client type. |
$ConnectionType = "client"; |
$ConnectionType = "client"; |
$clientname = (&Apache::lonnet::get_hosts_from_ip($outsideip))[-1]; |
$clientname = (&Apache::lonnet::get_hosts_from_ip($outsideip))[-1]; |
Line 6291 sub make_new_child {
|
Line 6301 sub make_new_child {
|
# |
# |
# If the remote is attempting a local init... give that a try: |
# If the remote is attempting a local init... give that a try: |
# |
# |
my ($i, $inittype) = split(/:/, $remotereq); |
(my $i, my $inittype, $clientversion) = split(/:/, $remotereq); |
|
|
# If the connection type is ssl, but I didn't get my |
# If the connection type is ssl, but I didn't get my |
# certificate files yet, then I'll drop back to |
# certificate files yet, then I'll drop back to |
Line 6311 sub make_new_child {
|
Line 6321 sub make_new_child {
|
} |
} |
|
|
if($inittype eq "local") { |
if($inittype eq "local") { |
|
$clientversion = $perlvar{'lonVersion'}; |
my $key = LocalConnection($client, $remotereq); |
my $key = LocalConnection($client, $remotereq); |
if($key) { |
if($key) { |
Debug("Got local key $key"); |
Debug("Got local key $key"); |