version 1.1372, 2018/03/30 23:50:29
|
version 1.1375, 2018/04/14 02:30:01
|
Line 708 sub check_for_valid_session {
|
Line 708 sub check_for_valid_session {
|
$userhashref->{'name'} = $disk_env{'user.name'}; |
$userhashref->{'name'} = $disk_env{'user.name'}; |
$userhashref->{'domain'} = $disk_env{'user.domain'}; |
$userhashref->{'domain'} = $disk_env{'user.domain'}; |
$userhashref->{'lti'} = $disk_env{'request.lti.login'}; |
$userhashref->{'lti'} = $disk_env{'request.lti.login'}; |
|
if ($userhashref->{'lti'}) { |
|
$userhashref->{'ltitarget'} = $disk_env{'request.lti.target'}; |
|
$userhashref->{'ltiuri'} = $disk_env{'request.lti.uri'}; |
|
} |
} |
} |
|
|
return $handle; |
return $handle; |
Line 11940 sub metadata {
|
Line 11944 sub metadata {
|
undef(%importedrespids); |
undef(%importedrespids); |
undef(%importedpartids); |
undef(%importedpartids); |
} |
} |
@{$importedrespids{$importid}} = split(/\s*,\s*/,$libresponseorder); |
my @respids = split(/\s*,\s*/,$libresponseorder); |
if (@{$importedrespids{$importid}} > 0) { |
if (@respids) { |
|
$importedrespids{$importid} = join(',',map { $importid.'_'.$_ } @respids); |
|
} |
|
if ($importedrespids{$importid} ne '') { |
$importedresponses = 1; |
$importedresponses = 1; |
# We need to get the original file and the imported file to get the response order correct |
# We need to get the original file and the imported file to get the response order correct |
# Load and inspect original file |
# Load and inspect original file |
Line 11957 sub metadata {
|
Line 11964 sub metadata {
|
# hash populated for imported library file |
# hash populated for imported library file |
%metaentry = %currmetaentry; |
%metaentry = %currmetaentry; |
undef(%currmetaentry); |
undef(%currmetaentry); |
if ($importmode eq 'problem') { |
if ($importmode eq 'part') { |
# Import as problem/response |
|
$unikey=&add_prefix_and_part($prefix,$token->[2]->{'part'}); |
|
} elsif ($importmode eq 'part') { |
|
# Import as part(s) |
# Import as part(s) |
$importedparts=1; |
$importedparts=1; |
# We need to get the original file and the imported file to get the part order correct |
# We need to get the original file and the imported file to get the part order correct |
Line 12002 sub metadata {
|
Line 12006 sub metadata {
|
$importedpartids{$token->[2]->{'id'}}=$token->[2]->{'id'}; |
$importedpartids{$token->[2]->{'id'}}=$token->[2]->{'id'}; |
} |
} |
} else { |
} else { |
|
# Import as problem or as normal import |
|
$unikey=&add_prefix_and_part($prefix,$token->[2]->{'part'}); |
|
unless ($importmode eq 'problem') { |
# Normal import |
# Normal import |
$unikey=&add_prefix_and_part($prefix,$token->[2]->{'part'}); |
if (defined($token->[2]->{'id'})) { |
if (defined($token->[2]->{'id'})) { |
$unikey.='_'.$token->[2]->{'id'}; |
$unikey.='_'.$token->[2]->{'id'}; |
} |
} |
} |
|
# Check metadata for imported file to |
|
# see if it contained parts |
|
if (grep(/^partorder$/,@libfilekeys)) { |
|
%currmetaentry = %metaentry; |
|
my $libpartorder = &metadata($location,'partorder',undef,undef,undef, |
|
$depthcount+1); |
|
%metaentry = %currmetaentry; |
|
undef(%currmetaentry); |
|
if ($libpartorder ne '') { |
|
$importedparts = 1; |
|
$importedpartids{$token->[2]->{'id'}}=$libpartorder; |
|
} |
|
} |
} |
} |
|
|
if ($depthcount<20) { |
if ($depthcount<20) { |
my $metadata = |
my $metadata = |
&metadata($uri,'keys',$toolsymb,$location,$unikey, |
&metadata($uri,'keys',$toolsymb,$location,$unikey, |
Line 12120 sub metadata {
|
Line 12139 sub metadata {
|
} elsif ($origfiletagids[$index] eq 'import') { |
} elsif ($origfiletagids[$index] eq 'import') { |
if ($importedparts) { |
if ($importedparts) { |
# We have imported parts at this position |
# We have imported parts at this position |
$metaentry{':partorder'}.=','.$importedpartids{$origid}; |
if ($importedpartids{$origid} ne '') { |
|
$metaentry{':partorder'}.=','.$importedpartids{$origid}; |
|
} |
} |
} |
if ($importedresponses) { |
if ($importedresponses) { |
# We have imported responses at this position |
# We have imported responses at this position |
if (ref($importedrespids{$origid}) eq 'ARRAY') { |
if ($importedrespids{$origid} ne '') { |
$metaentry{':responseorder'}.=','.join(',',map { $origid.'_'.$_ } @{$importedrespids{$origid}}); |
$metaentry{':responseorder'}.=','.$importedrespids{$origid}; |
} |
} |
} |
} |
} else { |
} else { |