version 1.69, 2006/09/26 15:15:19
|
version 1.77, 2007/07/25 23:17:43
|
Line 68 use strict;
|
Line 68 use strict;
|
use DBI; |
use DBI; |
use lib '/home/httpd/lib/perl/'; |
use lib '/home/httpd/lib/perl/'; |
use LONCAPA::lonmetadata; |
use LONCAPA::lonmetadata; |
|
use LONCAPA; |
use Getopt::Long; |
use Getopt::Long; |
use IO::File; |
use IO::File; |
use HTML::TokeParser; |
use HTML::TokeParser; |
Line 123 my %oldnames = (
|
Line 123 my %oldnames = (
|
'portfolio' => 'portfolio_metadata', |
'portfolio' => 'portfolio_metadata', |
'access' => 'portfolio_access', |
'access' => 'portfolio_access', |
'addedfields' => 'portfolio_addedfields', |
'addedfields' => 'portfolio_addedfields', |
|
'allusers' => 'allusers', |
); |
); |
|
|
my %newnames; |
my %newnames; |
Line 172 foreach my $key (keys(%newnames)) {
|
Line 173 foreach my $key (keys(%newnames)) {
|
} |
} |
|
|
# |
# |
# Create the new metadata and portfolio tables |
# Create the new metadata, portfolio and allusers tables |
foreach my $key (keys(%newnames)) { |
foreach my $key (keys(%newnames)) { |
if ($newnames{$key} ne '') { |
if ($newnames{$key} ne '') { |
my $request = |
my $request = |
Line 221 foreach my $dom (@domains) {
|
Line 222 foreach my $dom (@domains) {
|
no_chdir => 1, |
no_chdir => 1, |
}, join('/',($Apache::lonnet::perlvar{'lonDocRoot'},'res',$dom,$user)) ); |
}, join('/',($Apache::lonnet::perlvar{'lonDocRoot'},'res',$dom,$user)) ); |
} |
} |
# Search for public portfolio files |
# Search for all users and public portfolio files |
my %portusers; |
my (%allusers,%portusers); |
if ($oneuser) { |
if ($oneuser) { |
%portusers = ( |
%portusers = ( |
$oneuser => '', |
$oneuser => '', |
); |
); |
|
%allusers = ( |
|
$oneuser => '', |
|
); |
} else { |
} else { |
my $dir = $Apache::lonnet::perlvar{lonUsersDir}.'/'.$dom; |
my $dir = $Apache::lonnet::perlvar{lonUsersDir}.'/'.$dom; |
&descend_tree($dir,0,\%portusers); |
&descend_tree($dom,$dir,0,\%portusers,\%allusers); |
} |
} |
foreach my $uname (keys(%portusers)) { |
foreach my $uname (keys(%portusers)) { |
my $urlstart = '/uploaded/'.$dom.'/'.$uname; |
my $urlstart = '/uploaded/'.$dom.'/'.$uname; |
my $pathstart = &propath($dom,$uname).'/userfiles'; |
my $pathstart = &propath($dom,$uname).'/userfiles'; |
my $is_course = &check_for_course($dom,$uname); |
my $is_course = &Apache::lonnet::is_course($dom,$uname); |
my $curr_perm = &Apache::lonnet::get_portfile_permissions($dom,$uname); |
my $curr_perm = &Apache::lonnet::get_portfile_permissions($dom,$uname); |
my %access = &Apache::lonnet::get_access_controls($curr_perm); |
my %access = &Apache::lonnet::get_access_controls($curr_perm); |
foreach my $file (keys(%access)) { |
foreach my $file (keys(%access)) { |
my ($group,$url,$fullpath); |
my ($group,$url,$fullpath); |
if ($is_course) { |
if ($is_course) { |
($group, my ($path)) = ($file =~ /^(\w+)(\/.+)$/); |
($group, my ($path)) = ($file =~ /^(\w+)(\/.+)$/); |
$fullpath = $pathstart.'/groups/'.$group.'/portfolio/'.$path; |
$fullpath = $pathstart.'/groups/'.$group.'/portfolio'.$path; |
$url = $urlstart.'/groups/'.$group.'/portfolio'.$path; |
$url = $urlstart.'/groups/'.$group.'/portfolio'.$path; |
} else { |
} else { |
$fullpath = $pathstart.'/portfolio'.$file; |
$fullpath = $pathstart.'/portfolio'.$file; |
$url .= $urlstart.'/portfolio'.$file; |
$url = $urlstart.'/portfolio'.$file; |
} |
} |
if (ref($access{$file}) eq 'HASH') { |
if (ref($access{$file}) eq 'HASH') { |
&process_portfolio_access_data($url,$access{$file}); |
my %portaccesslog = |
} |
&LONCAPA::lonmetadata::process_portfolio_access_data($dbh, |
&process_portfolio_metadata($url,$fullpath,$is_course,$dom, |
$simulate,\%newnames,$url,$fullpath,$access{$file}); |
$uname,$group); |
&portfolio_logging(%portaccesslog); |
|
} |
|
my %portmetalog = &LONCAPA::lonmetadata::process_portfolio_metadata($dbh,$simulate,\%newnames,$url,$fullpath,$is_course,$dom,$uname,$group); |
|
&portfolio_logging(%portmetalog); |
|
} |
|
} |
|
# Update allusers |
|
foreach my $uname (keys(%allusers)) { |
|
my %userdata = |
|
&Apache::lonnet::get('environment',['firstname','lastname', |
|
'middlename','generation','id','permanentemail'],$dom,$uname); |
|
$userdata{'username'} = $uname; |
|
$userdata{'domain'} = $dom; |
|
my %alluserslog = |
|
&LONCAPA::lonmetadata::process_allusers_data($dbh,$simulate, |
|
\%newnames,$uname,$dom,\%userdata); |
|
foreach my $item (keys(%alluserslog)) { |
|
&log(0,$alluserslog{$item}); |
} |
} |
} |
} |
} |
} |
Line 302 sub log {
|
Line 323 sub log {
|
} |
} |
} |
} |
|
|
|
sub portfolio_logging { |
|
my (%portlog) = @_; |
|
foreach my $key (keys(%portlog)) { |
|
if (ref($portlog{$key}) eq 'HASH') { |
|
foreach my $item (keys(%{$portlog{$key}})) { |
|
&log(0,$portlog{$key}{$item}); |
|
} |
|
} |
|
} |
|
} |
|
|
sub descend_tree { |
sub descend_tree { |
my ($dir,$depth,$alldomusers) = @_; |
my ($dom,$dir,$depth,$allportusers,$alldomusers) = @_; |
if (-d $dir) { |
if (-d $dir) { |
opendir(DIR,$dir); |
opendir(DIR,$dir); |
my @contents = grep(!/^\./,readdir(DIR)); |
my @contents = grep(!/^\./,readdir(DIR)); |
Line 311 sub descend_tree {
|
Line 343 sub descend_tree {
|
$depth ++; |
$depth ++; |
foreach my $item (@contents) { |
foreach my $item (@contents) { |
if ($depth < 4) { |
if ($depth < 4) { |
&descend_tree($dir.'/'.$item,$depth,$alldomusers); |
&descend_tree($dom,$dir.'/'.$item,$depth,$allportusers,$alldomusers); |
} else { |
} else { |
if (-e $dir.'/'.$item.'/file_permissions.db') { |
if (-e $dir.'/'.$item.'/file_permissions.db') { |
|
$$allportusers{$item} = ''; |
|
} |
|
if (!&Apache::lonnet::is_course($dom,$item)) { |
$$alldomusers{$item} = ''; |
$$alldomusers{$item} = ''; |
} |
} |
} |
} |
Line 322 sub descend_tree {
|
Line 356 sub descend_tree {
|
} |
} |
} |
} |
|
|
sub check_for_course { |
|
my ($cdom,$cnum) = @_; |
|
my %courses = &Apache::lonnet::courseiddump($cdom,'.',1,'.','.',$cnum,undef, |
|
undef,'.'); |
|
if (exists($courses{$cdom.'_'.$cnum})) { |
|
return 1; |
|
} |
|
return 0; |
|
} |
|
|
|
|
|
sub process_portfolio_access_data { |
|
my ($url,$access_hash) = @_; |
|
foreach my $key (keys(%{$access_hash})) { |
|
my $acc_data; |
|
$acc_data->{url} = $url; |
|
$acc_data->{keynum} = $key; |
|
my ($num,$scope,$end,$start) = |
|
($key =~ /^([^:]+):([a-z]+)_(\d*)_?(\d*)$/); |
|
$acc_data->{scope} = $scope; |
|
if ($end != 0) { |
|
$acc_data->{end} = &sqltime($end); |
|
} |
|
$acc_data->{start} = &sqltime($start); |
|
if (! $simulate) { |
|
my ($count,$err) = |
|
&LONCAPA::lonmetadata::store_metadata($dbh, |
|
$newnames{'access'}, |
|
'portfolio_access',$acc_data); |
|
if ($err) { |
|
&log(0,"MySQL Error Insert: ".$err); |
|
} |
|
if ($count < 1) { |
|
&log(0,"Unable to insert record into MySQL database for $url"); |
|
} |
|
} |
|
} |
|
} |
|
|
|
sub process_portfolio_metadata { |
|
my ($url,$fullpath,$is_course,$dom,$uname,$group) = @_; |
|
my ($ref,$crs,$addedfields) = &portfolio_metadata($fullpath,$dom,$uname, |
|
$group); |
|
&getfiledates($ref,$fullpath); |
|
if ($is_course) { |
|
$ref->{'groupname'} = $group; |
|
} |
|
my %Data; |
|
if (ref($ref) eq 'HASH') { |
|
%Data = %{$ref}; |
|
} |
|
%Data = ( |
|
%Data, |
|
'url'=>$url, |
|
'version'=>'current', |
|
); |
|
if (! $simulate) { |
|
my ($count,$err) = |
|
&LONCAPA::lonmetadata::store_metadata($dbh, |
|
$newnames{'portfolio'}, |
|
'portfolio_metadata',\%Data); |
|
if ($err) { |
|
&log(0,"MySQL Error Insert: ".$err); |
|
} |
|
if ($count < 1) { |
|
&log(0,"Unable to insert record into MySQL portfolio_metadata database table for $url"); |
|
} |
|
if (ref($addedfields) eq 'HASH') { |
|
if (keys(%{$addedfields}) > 0) { |
|
foreach my $key (keys(%{$addedfields})) { |
|
my $added_data = { |
|
'url' => $url, |
|
'field' => $key, |
|
'value' => $addedfields->{$key}, |
|
'courserestricted' => $crs, |
|
}; |
|
($count,$err) = &LONCAPA::lonmetadata::store_metadata($dbh, |
|
$newnames{'addedfields'}, |
|
'portfolio_addedfields', |
|
$added_data); |
|
if ($err) { |
|
&log(0,"MySQL Error Insert: ".$err); |
|
} |
|
if ($count < 1) { |
|
&log(0,"Unable to insert record into MySQL portfolio_addedfields database table for url = $url and field = $key"); |
|
} |
|
} |
|
} |
|
} |
|
} |
|
return; |
|
} |
|
|
|
######################################################## |
######################################################## |
######################################################## |
######################################################## |
### ### |
### ### |
Line 518 sub process_meta_file {
|
Line 459 sub process_meta_file {
|
%dyn=&get_dynamic_metadata($url); |
%dyn=&get_dynamic_metadata($url); |
&count_type($url); |
&count_type($url); |
} |
} |
&getfiledates($ref,$target); |
&LONCAPA::lonmetadata::getfiledates($ref,$target); |
# |
# |
my %Data = ( |
my %Data = ( |
%$ref, |
%$ref, |
Line 559 sub metadata {
|
Line 500 sub metadata {
|
if ($filename !~ /\.meta$/) { |
if ($filename !~ /\.meta$/) { |
$filename.='.meta'; |
$filename.='.meta'; |
} |
} |
my $metastring=&getfile($Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$filename); |
my $metastring = |
|
&LONCAPA::lonmetadata::getfile($Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$filename); |
return undef if (! defined($metastring)); |
return undef if (! defined($metastring)); |
my $parser=HTML::TokeParser->new(\$metastring); |
my $parser=HTML::TokeParser->new(\$metastring); |
my $token; |
my $token; |
Line 590 sub metadata {
|
Line 532 sub metadata {
|
return \%metacache; |
return \%metacache; |
} |
} |
|
|
############################################################### |
|
############################################################### |
|
### ### |
|
### &portfolio_metadata($filepath,$dom,$uname,$group) ### |
|
### Retrieve metadata for the given file ### |
|
### Returns array - ### |
|
### contains reference to metadatahash and ### |
|
### optional reference to addedfields hash ### |
|
### ### |
|
############################################################### |
|
############################################################### |
|
sub portfolio_metadata { |
|
my ($fullpath,$dom,$uname,$group)=@_; |
|
my ($mime) = ( $fullpath=~/\.(\w+)$/ ); |
|
my %metacache=(); |
|
if ($fullpath !~ /\.meta$/) { |
|
$fullpath .= '.meta'; |
|
} |
|
my (@standard_fields,%addedfields); |
|
my $colsref = |
|
$LONCAPA::lonmetadata::Portfolio_metadata_table_description; |
|
if (ref($colsref) eq 'ARRAY') { |
|
my @columns = @{$colsref}; |
|
foreach my $coldata (@columns) { |
|
push(@standard_fields,$coldata->{'name'}); |
|
} |
|
} |
|
my $metastring=&getfile($fullpath); |
|
if (! defined($metastring)) { |
|
$metacache{'keys'}= 'owner,domain,mime'; |
|
$metacache{'owner'} = $uname.':'.$dom; |
|
$metacache{'domain'} = $dom; |
|
$metacache{'mime'} = $mime; |
|
if (defined($group)) { |
|
$metacache{'keys'} .= ',courserestricted'; |
|
$metacache{'courserestricted'} = 'course.'.$dom.'_'.$uname; |
|
} |
|
} else { |
|
my $parser=HTML::TokeParser->new(\$metastring); |
|
my $token; |
|
while ($token=$parser->get_token) { |
|
if ($token->[0] eq 'S') { |
|
my $entry=$token->[1]; |
|
if ($metacache{'keys'}) { |
|
$metacache{'keys'}.=','.$entry; |
|
} else { |
|
$metacache{'keys'}=$entry; |
|
} |
|
my $value = $parser->get_text('/'.$entry); |
|
if (!grep(/^\Q$entry\E$/,@standard_fields)) { |
|
my $clean_value = lc($value); |
|
$clean_value =~ s/\s/_/g; |
|
if ($clean_value ne $entry) { |
|
if (defined($addedfields{$entry})) { |
|
$addedfields{$entry} .=','.$value; |
|
} else { |
|
$addedfields{$entry} = $value; |
|
} |
|
} |
|
} else { |
|
$metacache{$entry} = $value; |
|
} |
|
} |
|
} # End of ($token->[0] eq 'S') |
|
} |
|
if (keys(%addedfields) > 0) { |
|
foreach my $key (sort keys(%addedfields)) { |
|
$metacache{'addedfieldnames'} .= $key.','; |
|
$metacache{'addedfieldvalues'} .= $addedfields{$key}.'&&&'; |
|
} |
|
$metacache{'addedfieldnames'} =~ s/,$//; |
|
$metacache{'addedfieldvalues'} =~ s/\&\&\&$//; |
|
if ($metacache{'keys'}) { |
|
$metacache{'keys'}.=',addedfieldnames'; |
|
} else { |
|
$metacache{'keys'}='addedfieldnames'; |
|
} |
|
$metacache{'keys'}.=',addedfieldvalues'; |
|
} |
|
return (\%metacache,$metacache{'courserestricted'},\%addedfields); |
|
} |
|
|
|
## |
|
## &getfile($filename) |
|
## Slurps up an entire file into a scalar. |
|
## Returns undef if the file does not exist |
|
sub getfile { |
|
my $file = shift(); |
|
if (! -e $file ) { |
|
return undef; |
|
} |
|
my $fh=IO::File->new($file); |
|
my $contents = ''; |
|
while (<$fh>) { |
|
$contents .= $_; |
|
} |
|
return $contents; |
|
} |
|
|
|
## |
|
## &getfiledates() |
|
## Converts creationdate and modifieddates to SQL format |
|
## Applies stat() to file to retrieve dates if missing |
|
sub getfiledates { |
|
my ($ref,$target) = @_; |
|
if (! defined($ref->{'creationdate'}) || |
|
$ref->{'creationdate'} =~ /^\s*$/) { |
|
$ref->{'creationdate'} = (stat($target))[9]; |
|
} |
|
if (! defined($ref->{'lastrevisiondate'}) || |
|
$ref->{'lastrevisiondate'} =~ /^\s*$/) { |
|
$ref->{'lastrevisiondate'} = (stat($target))[9]; |
|
} |
|
$ref->{'creationdate'} = &sqltime($ref->{'creationdate'}); |
|
$ref->{'lastrevisiondate'} = &sqltime($ref->{'lastrevisiondate'}); |
|
} |
|
|
|
######################################################## |
######################################################## |
######################################################## |
######################################################## |
### ### |
### ### |
Line 874 sub write_copyright_count {
|
Line 699 sub write_copyright_count {
|
## (copied from lond, modification of the return value) |
## (copied from lond, modification of the return value) |
sub ishome { |
sub ishome { |
my $author=shift; |
my $author=shift; |
$author=~s/\/home\/httpd\/html\/res\/([^\/]*)\/([^\/]*).*/$1\/$2/; |
$author=~s{/home/httpd/html/res/([^/]*)/([^/]*).*}{$1/$2}; |
my ($udom,$uname)=split(/\//,$author); |
my ($udom,$uname)=split(/\//,$author); |
my $proname=propath($udom,$uname); |
my $proname=propath($udom,$uname); |
if (-e $proname) { |
if (-e $proname) { |
Line 885 sub ishome {
|
Line 710 sub ishome {
|
} |
} |
|
|
## |
## |
## &propath($udom,$uname) |
|
## Returns the path to the users LON-CAPA 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="$Apache::lonnet::perlvar{'lonUsersDir'}/$udom/$subdir/$uname"; |
|
return $proname; |
|
} |
|
|
|
## |
|
## &sqltime($timestamp) |
|
## |
|
## Convert perl $timestamp to MySQL time. MySQL expects YYYY-MM-DD HH:MM:SS |
|
## |
|
sub sqltime { |
|
my ($time) = @_; |
|
my $mysqltime; |
|
if ($time =~ |
|
/(\d+)-(\d+)-(\d+) # YYYY-MM-DD |
|
\s # a space |
|
(\d+):(\d+):(\d+) # HH:MM::SS |
|
/x ) { |
|
# Some of the .meta files have the time in mysql |
|
# format already, so just make sure they are 0 padded and |
|
# pass them back. |
|
$mysqltime = sprintf('%04d-%02d-%02d %02d:%02d:%02d', |
|
$1,$2,$3,$4,$5,$6); |
|
} elsif ($time =~ /^\d+$/) { |
|
my @TimeData = gmtime($time); |
|
# Alter the month to be 1-12 instead of 0-11 |
|
$TimeData[4]++; |
|
# Alter the year to be from 0 instead of from 1900 |
|
$TimeData[5]+=1900; |
|
$mysqltime = sprintf('%04d-%02d-%02d %02d:%02d:%02d', |
|
@TimeData[5,4,3,2,1,0]); |
|
} elsif (! defined($time) || $time == 0) { |
|
$mysqltime = 0; |
|
} else { |
|
&log(0," sqltime:Unable to decode time ".$time); |
|
$mysqltime = 0; |
|
} |
|
return $mysqltime; |
|
} |
|
|
|
## |
|
## &declutter($filename) |
## &declutter($filename) |
## Given a filename, returns a url for the filename. |
## Given a filename, returns a url for the filename. |
sub declutter { |
sub declutter { |
Line 944 sub declutter {
|
Line 720 sub declutter {
|
return $thisfn; |
return $thisfn; |
} |
} |
|
|
## |
|
## Escape / Unescape special characters |
|
sub unescape { |
|
my $str=shift; |
|
$str =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg; |
|
return $str; |
|
} |
|
|
|
sub escape { |
|
my $str=shift; |
|
$str =~ s/(\W)/"%".unpack('H2',$1)/eg; |
|
return $str; |
|
} |
|