version 1.204, 2006/01/11 20:35:19
|
version 1.211.2.2, 2006/10/02 19:57:35
|
Line 129 use Apache::loncfile;
|
Line 129 use Apache::loncfile;
|
use LONCAPA::lonmetadata; |
use LONCAPA::lonmetadata; |
use Apache::lonmsg; |
use Apache::lonmsg; |
use vars qw(%metadatafields %metadatakeys); |
use vars qw(%metadatafields %metadatakeys); |
|
use lib '/home/httpd/lib/perl/'; |
|
use LONCAPA; |
|
|
|
|
my %addid; |
my %addid; |
my %nokey; |
my %nokey; |
Line 547 sub get_max_ids_indices {
|
Line 550 sub get_max_ids_indices {
|
my %duplicatedids; |
my %duplicatedids; |
|
|
my $parser=HTML::LCParser->new($content); |
my $parser=HTML::LCParser->new($content); |
|
$parser->xml_mode(1); |
my $token; |
my $token; |
while ($token=$parser->get_token) { |
while ($token=$parser->get_token) { |
if ($token->[0] eq 'S') { |
if ($token->[0] eq 'S') { |
Line 686 sub fix_ids_and_indices {
|
Line 690 sub fix_ids_and_indices {
|
$parms{'id'}!~/^\s*$/) { |
$parms{'id'}!~/^\s*$/) { |
$maxid++; |
$maxid++; |
$parms{'id'}=$maxid; |
$parms{'id'}=$maxid; |
print $logfile 'ID: '.$tag.':'.$maxid."\n"; |
print $logfile 'ID(new) : '.$tag.':'.$maxid."\n"; |
|
} else { |
|
print $logfile 'ID(kept): '.$tag.':'.$parms{'id'}."\n"; |
} |
} |
} elsif ($counter eq 'index') { |
} elsif ($counter eq 'index') { |
unless (defined($parms{'index'}) && |
unless (defined($parms{'index'}) && |
Line 850 sub store_metadata {
|
Line 856 sub store_metadata {
|
&Apache::lonnet::logthis($status); |
&Apache::lonnet::logthis($status); |
return ($error,undef); |
return ($error,undef); |
} |
} |
return (undef,$status); |
return (undef,'success'); |
} |
} |
|
|
|
|
Line 936 sub publish {
|
Line 942 sub publish {
|
return ('<font color="red">'.&mt('No write permission to user directory, FAIL').'</font>',1); |
return ('<font color="red">'.&mt('No write permission to user directory, FAIL').'</font>',1); |
} |
} |
print $logfile |
print $logfile |
"\n\n================= Publish ".localtime()." Phase One ================\n".$env{'user.name'}.'@'.$env{'user.domain'}."\n"; |
"\n\n================= Publish ".localtime()." Phase One ================\n".$env{'user.name'}.':'.$env{'user.domain'}."\n"; |
|
|
if (($style eq 'ssi') || ($style eq 'rat') || ($style eq 'prv')) { |
if (($style eq 'ssi') || ($style eq 'rat') || ($style eq 'prv')) { |
# ------------------------------------------------------- This needs processing |
# ------------------------------------------------------- This needs processing |
Line 1030 sub publish {
|
Line 1036 sub publish {
|
$env{'environment.generation'}; |
$env{'environment.generation'}; |
$metadatafields{'author'}=~s/\s+/ /g; |
$metadatafields{'author'}=~s/\s+/ /g; |
$metadatafields{'author'}=~s/\s+$//; |
$metadatafields{'author'}=~s/\s+$//; |
$metadatafields{'owner'}=$cuname.'@'.$cudom; |
$metadatafields{'owner'}=$cuname.':'.$cudom; |
|
|
# ------------------------------------------------ Check out directory hierachy |
# ------------------------------------------------ Check out directory hierachy |
|
|
Line 1165 sub publish {
|
Line 1171 sub publish {
|
'<p>'.($env{'form.makeobsolete'}?'':'<input type="submit" value="'.&mt('Finalize Publication').'" />').'</p>'. |
'<p>'.($env{'form.makeobsolete'}?'':'<input type="submit" value="'.&mt('Finalize Publication').'" />').'</p>'. |
&hiddenfield('phase','two'). |
&hiddenfield('phase','two'). |
&hiddenfield('filename',$env{'form.filename'}). |
&hiddenfield('filename',$env{'form.filename'}). |
&hiddenfield('allmeta',&Apache::lonnet::escape($allmeta)). |
&hiddenfield('allmeta',&escape($allmeta)). |
&hiddenfield('dependencies',join(',',keys %allow)); |
&hiddenfield('dependencies',join(',',keys %allow)); |
unless ($env{'form.makeobsolete'}) { |
unless ($env{'form.makeobsolete'}) { |
$intr_scrout.= |
$intr_scrout.= |
Line 1433 sub phasetwo {
|
Line 1439 sub phasetwo {
|
return 0; |
return 0; |
} |
} |
print $logfile |
print $logfile |
"\n================= Publish ".localtime()." Phase Two ================\n".$env{'user.name'}.'@'.$env{'user.domain'}."\n"; |
"\n================= Publish ".localtime()." Phase Two ================\n".$env{'user.name'}.':'.$env{'user.domain'}."\n"; |
|
|
%metadatafields=(); |
%metadatafields=(); |
%metadatakeys=(); |
%metadatakeys=(); |
|
|
&metaeval(&Apache::lonnet::unescape($env{'form.allmeta'})); |
&metaeval(&unescape($env{'form.allmeta'})); |
|
|
$metadatafields{'title'}=$env{'form.title'}; |
$metadatafields{'title'}=$env{'form.title'}; |
$metadatafields{'author'}=$env{'form.author'}; |
$metadatafields{'author'}=$env{'form.author'}; |
Line 1461 sub phasetwo {
|
Line 1467 sub phasetwo {
|
$metadatafields{'obsoletereplacement'}= |
$metadatafields{'obsoletereplacement'}= |
$env{'form.obsoletereplacement'}; |
$env{'form.obsoletereplacement'}; |
$metadatafields{'dependencies'}=$env{'form.dependencies'}; |
$metadatafields{'dependencies'}=$env{'form.dependencies'}; |
$metadatafields{'modifyinguser'}=$env{'user.name'}.'@'. |
$metadatafields{'modifyinguser'}=$env{'user.name'}.':'. |
$env{'user.domain'}; |
$env{'user.domain'}; |
$metadatafields{'authorspace'}=$cuname.'@'.$cudom; |
$metadatafields{'authorspace'}=$cuname.':'.$cudom; |
|
$metadatafields{'domain'}=$cudom; |
|
|
my $allkeywords=$env{'form.addkey'}; |
my $allkeywords=$env{'form.addkey'}; |
if (exists($env{'form.keywords'})) { |
if (exists($env{'form.keywords'})) { |
Line 1782 sub publishdirectory {
|
Line 1789 sub publishdirectory {
|
&hiddenfield('filename',$env{'form.filename'}). |
&hiddenfield('filename',$env{'form.filename'}). |
&checkbox('pubrec','include subdirectories'). |
&checkbox('pubrec','include subdirectories'). |
&checkbox('forcerepub','force republication of previously published files'). |
&checkbox('forcerepub','force republication of previously published files'). |
&checkbox('forceobsolete','make file(s) obsolete'). |
&checkbox('obsolete','make file(s) obsolete'). |
&checkbox('forceoverride','force directory level catalog information over existing'). |
&checkbox('forceoverride','force directory level catalog information over existing'). |
'<br /><input type="submit" value="'.&mt('Publish Directory').'" /></form>'); |
'<br /><input type="submit" value="'.&mt('Publish Directory').'" /></form>'); |
} else { |
} else { |
Line 1846 sub defaultmetapublish {
|
Line 1853 sub defaultmetapublish {
|
&Apache::loncommon::content_type($r,'text/html'); |
&Apache::loncommon::content_type($r,'text/html'); |
$r->send_http_header; |
$r->send_http_header; |
|
|
$r->print('<html><head><title>LON-CAPA Publishing</title></head>'); |
$r->print(&Apache::loncommon::start_page('Catalog Information Publication')); |
$r->print(&Apache::loncommon::bodytag('Catalog Information Publication')); |
|
|
|
# ---------------------------------------------------------------- Write Source |
# ---------------------------------------------------------------- Write Source |
my $copyfile=$target; |
my $copyfile=$target; |
Line 1883 sub defaultmetapublish {
|
Line 1889 sub defaultmetapublish {
|
my $link=$fn; |
my $link=$fn; |
$link=~s/^\/home\/$cuname\/public_html\//\/priv\/$cuname\//; |
$link=~s/^\/home\/$cuname\/public_html\//\/priv\/$cuname\//; |
$r->print("<a href='$link'>".&mt('Back to Catalog Information').'</a>'); |
$r->print("<a href='$link'>".&mt('Back to Catalog Information').'</a>'); |
$r->print('</body></html>'); |
$r->print(&Apache::loncommon::end_page()); |
return OK; |
return OK; |
} |
} |
######################################### |
######################################### |
Line 1945 sub handler {
|
Line 1951 sub handler {
|
@{$modified_urls}=(); |
@{$modified_urls}=(); |
# -------------------------------------------------------------- Check filename |
# -------------------------------------------------------------- Check filename |
|
|
my $fn=&Apache::lonnet::unescape($env{'form.filename'}); |
my $fn=&unescape($env{'form.filename'}); |
|
|
($cuname,$cudom)= |
($cuname,$cudom)= |
&Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain')); |
&Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain')); |
Line 2006 sub handler {
|
Line 2012 sub handler {
|
return HTTP_NOT_FOUND; |
return HTTP_NOT_FOUND; |
} |
} |
|
|
unless ($env{'form.phase'} eq 'two') { |
|
|
|
# -------------------------------- File is there and owned, init lookup tables. |
# -------------------------------- File is there and owned, init lookup tables. |
|
|
%addid=(); |
%addid=(); |
|
|
{ |
{ |
my $fh=Apache::File->new($r->dir_config('lonTabDir').'/addid.tab'); |
my $fh=Apache::File->new($r->dir_config('lonTabDir').'/addid.tab'); |
while (<$fh>=~/(\w+)\s+(\w+)/) { |
while (<$fh>=~/(\w+)\s+(\w+)/) { |
$addid{$1}=$2; |
$addid{$1}=$2; |
} |
|
} |
} |
|
} |
|
|
%nokey=(); |
%nokey=(); |
|
|
{ |
{ |
my $fh=Apache::File->new($r->dir_config('lonIncludes').'/un_keyword.tab'); |
my $fh=Apache::File->new($r->dir_config('lonIncludes').'/un_keyword.tab'); |
while (<$fh>) { |
while (<$fh>) { |
my $word=$_; |
my $word=$_; |
chomp($word); |
chomp($word); |
$nokey{$word}=1; |
$nokey{$word}=1; |
} |
|
} |
} |
|
|
} |
} |
|
|
# ---------------------------------------------------------- Start page output. |
# ---------------------------------------------------------- Start page output. |
Line 2037 sub handler {
|
Line 2039 sub handler {
|
&Apache::loncommon::content_type($r,'text/html'); |
&Apache::loncommon::content_type($r,'text/html'); |
$r->send_http_header; |
$r->send_http_header; |
|
|
my $js=&Apache::loncommon::browser_and_searcher_javascript(); |
my $js='<script type="text/javascript">'. |
$r->print('<html><head><title>LON-CAPA Publishing</title> |
&Apache::loncommon::browser_and_searcher_javascript(). |
<script type="text/javascript">'.$js.' |
'</script>'; |
</script></head>'); |
$r->print(&Apache::loncommon::start_page('Resource Publication',$js)); |
$r->print(&Apache::loncommon::bodytag('Resource Publication')); |
|
|
|
|
|
my $thisfn=$fn; |
my $thisfn=$fn; |
Line 2116 ENDDIFF
|
Line 2117 ENDDIFF
|
$r->print('<hr />'); |
$r->print('<hr />'); |
} |
} |
} |
} |
$r->print('</body></html>'); |
$r->print(&Apache::loncommon::end_page()); |
|
|
return OK; |
return OK; |
} |
} |