--- loncom/publisher/lonpublisher.pm 2000/12/01 16:17:46 1.9 +++ loncom/publisher/lonpublisher.pm 2000/12/04 12:27:58 1.12 @@ -5,7 +5,7 @@ # # 05/29/00,05/30,10/11 Gerd Kortemeyer) # -# 11/28,11/29,11/30,12/01 Gerd Kortemeyer +# 11/28,11/29,11/30,12/01,12/02,12/04 Gerd Kortemeyer package Apache::lonpublisher; @@ -14,14 +14,22 @@ use Apache::File; use Apache::Constants qw(:common :http :methods); use HTML::TokeParser; use Apache::lonxml; -use Apache::lonhomework; +use Apache::structuretags; +use Apache::inputtags; +use Apache::response; my %addid; my %nokey; my %language; +my %cprtag; + my %metadatafields; my %metadatakeys; +my $docroot; + +# ----------------------------------------------- Evaluate string with metadata + sub metaeval { my $metastring=shift; @@ -57,6 +65,8 @@ sub metaeval { } } +# -------------------------------------------------------- Read a metadata file + sub metaread { my ($logfile,$fn)=@_; unless (-e $fn) { @@ -73,16 +83,32 @@ sub metaread { return '
Processed file: '.$fn.''; } +# --------------------------------------------------------- Various form fields + sub textfield { - my ($title,$value)=@_; + my ($title,$name,$value)=@_; return "\n

$title:
". - ''; + ''; +} + +sub hiddenfield { + my ($name,$value)=@_; + return "\n".''; } sub selectbox { - my ($title,$value,%options)=@_; + my ($title,$name,$value,%options)=@_; + my $selout="\n

$title:
".''; } +# -------------------------------------------------------- Publication Step One + sub publish { my ($source,$target,$style)=@_; @@ -94,7 +120,7 @@ sub publish { 'No write permission to user directory, FAIL'; } print $logfile -"\n\n================== Publish ".localtime()." =================\n"; +"\n\n================= Publish ".localtime()." Phase One ================\n"; if (($style eq 'ssi') || ($style eq 'rat')) { # ------------------------------------------------------- This needs processing @@ -227,6 +253,7 @@ sub publish { $ENV{'environment.generation'}; $metadatafields{'author'}=~s/\s+/ /g; $metadatafields{'author'}=~s/\s+$//; + $metadatafields{'owner'}=$ENV{'user.name'}.'@'.$ENV{'user.domain'}; # ------------------------------------------------ Check out directory hierachy @@ -267,12 +294,7 @@ sub publish { # -------------------------------------------------- Parse content for metadata - my $allmeta=''; - if ($source=~/\.problem$/) { - $allmeta=Apache::lonhomework::subhandler('meta',$content); - } else { - $allmeta=Apache::lonxml::xmlparse('meta',$content); - } + my $allmeta=Apache::lonxml::xmlparse('meta',$content); &metaeval($allmeta); # ---------------- Find and document discrepancies in the parameters and stores @@ -296,7 +318,7 @@ sub publish { my $chparms=''; map { if (($_=~/^parameter/) || ($_=~/^stores/)) { - unless (($metadatafields{$_}) || ($_=~/\.\w+$/)) { + unless (($metadatafields{$_.'.name'}) || ($_=~/\.\w+$/)) { print $logfile 'Obsolete: '.$_."\n"; $chparms.=$_.' '; } @@ -311,11 +333,12 @@ sub publish { $scrout.= '

'. - ''. - ''. - &textfield('Title',$metadatafields{'title'}). - &textfield('Author(s)',$metadatafields{'author'}). - &textfield('Subject',$metadatafields{'subject'}); + &hiddenfield('phase','two'). + &hiddenfield('filename',$ENV{'form.filename'}). + &hiddenfield('allmeta',&Apache::lonnet::escape($allmeta)). + &textfield('Title','title',$metadatafields{'title'}). + &textfield('Author(s)','author',$metadatafields{'author'}). + &textfield('Subject','subject',$metadatafields{'subject'}); # --------------------------------------------------- Scan content for keywords @@ -338,9 +361,12 @@ sub publish { } } ($textonly=~m/(\w+)/g); + map { + $keywords{$_}=1; + } split(/\W+/,$metadatafields{'keywords'}); map { - $keywordout.=''; - $scrout.=&selectbox('Language',$metadatafields{'language'},%language); + $source=~/\.(\w+)$/; + + $scrout.=&hiddenfield('mime',$1); + + $scrout.=&selectbox('Language','language', + $metadatafields{'language'},%language); + + unless ($metadatafields{'creationdate'}) { + $metadatafields{'creationdate'}=time; + } + $scrout.=&hiddenfield('creationdate',$metadatafields{'creationdate'}); + + $scrout.=&hiddenfield('lastrevisiondate',time); + - $scrout.=&textfield('Publisher/Owner',$metadatafields{'owner'}); + $scrout.=&textfield('Publisher/Owner','owner', + $metadatafields{'owner'}); + + $scrout.=&selectbox('Copyright/Distribution','copyright', + $metadatafields{'copyright'},%cprtag); } return $scrout. '

'; } +# -------------------------------------------------------- Publication Step Two + +sub phasetwo { + + my ($source,$target,$style)=@_; + my $logfile; + my $scrout=''; + + unless ($logfile=Apache::File->new('>>'.$source.'.log')) { + return + 'No write permission to user directory, FAIL'; + } + print $logfile +"\n================= Publish ".localtime()." Phase Two ================\n"; + + %metadatafields=(); + %metadatakeys=(); + + &metaeval(&Apache::lonnet::unescape($ENV{'form.allmeta'})); + + $metadatafields{'title'}=$ENV{'form.title'}; + $metadatafields{'author'}=$ENV{'form.author'}; + $metadatafields{'subject'}=$ENV{'form.subject'}; + $metadatafields{'notes'}=$ENV{'form.notes'}; + $metadatafields{'abstract'}=$ENV{'form.abstract'}; + $metadatafields{'mime'}=$ENV{'form.mime'}; + $metadatafields{'language'}=$ENV{'form.language'}; + $metadatafields{'creationdate'}=$ENV{'form.creationdate'}; + $metadatafields{'lastrevisiondate'}=$ENV{'form.lastrevisiondate'}; + $metadatafields{'owner'}=$ENV{'form.owner'}; + $metadatafields{'copyright'}=$ENV{'form.copyright'}; + + my $allkeywords=$ENV{'form.addkey'}; + map { + if ($_=~/^form\.key\.(\w+)/) { + $allkeywords.=','.$1; + } + } keys %ENV; + $allkeywords=~s/\W+/\,/; + $allkeywords=~s/^\,//; + $metadatafields{'keywords'}=$allkeywords; + + { + print $logfile "\nWrite metadata file for ".$source; + my $mfh; + unless ($mfh=Apache::File->new('>'.$source.'.meta')) { + return + 'Could not write metadata, FAIL'; + } + map { + unless ($_=~/\./) { + my $unikey=$_; + $unikey=~/^([A-Za-z]+)/; + my $tag=$1; + $tag=~tr/A-Z/a-z/; + print $mfh "\n\<$tag"; + map { + my $value=$metadatafields{$unikey.'.'.$_}; + $value=~s/\"/\'\'/g; + print $mfh ' '.$_.'="'.$value.'"'; + } split(/\,/,$metadatakeys{$unikey}); + print $mfh '>'.$metadatafields{$unikey}.''; + } + } sort keys %metadatafields; + $scrout.='

Wrote Metadata'; + print $logfile "\nWrote metadata"; + } + +# ----------------------------------------------------------- Copy old versions + +if (-e $target) { + my $filename; + my $maxversion=0; + $target=~/(.*)\/([^\/]+)\.(\w+)$/; + my $srcf=$2; + my $srct=$3; + my $srcd=$1; + unless ($srcd=~/^\/home\/httpd\/html\/res/) { + print $logfile "\nPANIC: Target dir is ".$srcd; + return "Invalid target directory, FAIL"; + } + opendir(DIR,$srcd); + while ($filename=readdir(DIR)) { + if ($filename=~/$srcf\.(\d+)\.$srct$/) { + $maxversion=($1>$maxversion)?$1:$maxversion; + } + } + closedir(DIR); + $maxversion++; + $scrout.='

Creating old version '.$maxversion; + print $logfile "\nCreating old version ".$maxversion; + + my $copyfile=$srcd.'/'.$srcf.'.'.$maxversion.'.'.$srct; + + { + my $org=Apache::File->new($target); + my $cop; + unless ($cop=Apache::File->new('>'.$copyfile)) { + print $logfile "Unable to open for write ".$copyfile."\n"; + return "Failed to open '.$copyfile. + ', FAIL"; + } + while (my $line=<$org>) { print $cop $line; } + } + if (-e $copyfile) { + print $logfile "Copied old target to ".$copyfile."\n"; + $scrout.='

Copied old target file'; + } else { + print $logfile "Unable to write ".$copyfile."\n"; + return "Failed to copy old target, FAIL"; + } + +# --------------------------------------------------------------- Copy Metadata + + $copyfile=$copyfile.'.meta'; + { + my $org=Apache::File->new($target.'.meta'); + my $cop=Apache::File->new('>'.$copyfile); + while (my $line=<$org>) { print $cop $line; } + } + if (-e $copyfile) { + print $logfile "Copied old target metadata to ".$copyfile."\n"; + $scrout.='

Copied old metadata'; + } else { + print $logfile "Unable to write metadata ".$copyfile."\n"; + return + "Failed to write old metadata copy, FAIL"; + } + + +} else { + $scrout.='

Initial version'; + print $logfile "\nInitial version"; +} + +# ---------------------------------------------------------------- Write Source + my $copyfile=$target; + + my @parts=split(/\//,$copyfile); + my $path="/$parts[1]/$parts[2]/$parts[3]/$parts[4]"; + + my $count; + for ($count=5;$count<$#parts;$count++) { + $path.="/$parts[$count]"; + if ((-e $path)!=1) { + print $logfile "\nCreating directory ".$path; + $scrout.='

Created directory '.$parts[$count]; + mkdir($path,0777); + } + } + + { + my $org=Apache::File->new($source); + my $cop; + unless ($cop=Apache::File->new('>'.$copyfile)) { + print $logfile "Unable to open for write ".$copyfile."\n"; + return "Failed to open '.$copyfile. + ', FAIL"; + } + while (my $line=<$org>) { print $cop $line; } + } + if (-e $copyfile) { + print $logfile "Copied original source to ".$copyfile."\n"; + $scrout.='

Copied source file'; + } else { + print $logfile "Unable to write ".$copyfile."\n"; + return "Failed to copy source, FAIL"; + } + +# --------------------------------------------------------------- Copy Metadata + + my $copyfile=$target.'.meta'; + { + my $org=Apache::File->new($source.'.meta'); + my $cop=Apache::File->new('>'.$copyfile); + while (my $line=<$org>) { print $cop $line; } + } + if (-e $copyfile) { + print $logfile "Copied original metadata to ".$copyfile."\n"; + $scrout.='

Copied metadata'; + } else { + print $logfile "Unable to write metadata ".$copyfile."\n"; + return + "Failed to write metadata copy, FAIL"; + } + +# --------------------------------------------------- Send update notifications + +{ + + my $filename; + + $target=~/(.*)\/([^\/]+)$/; + my $srcf=$2; + opendir(DIR,$1); + while ($filename=readdir(DIR)) { + if ($filename=~/$srcf\.(\w+)$/) { + my $subhost=$1; + if ($subhost ne 'meta') { + $scrout.='

Notifying host '.$subhost.':'; + print $logfile "\nNotifying host '.$subhost.':'"; + my $reply=&Apache::lonnet::critical('update:'.$target,$subhost); + $scrout.=$reply; + print $logfile $reply; + } + } + } + closedir(DIR); + +} + +# ------------------------------------------------ Provide link to new resource + + my $thisdistarget=$target; + $thisdistarget=~s/^$docroot//; + + return $scrout. + '

View Target'; +} + # ================================================================ Main Handler sub handler { @@ -404,7 +669,7 @@ sub handler { $fn=~s/^http\:\/\/[^\/]+\/\~(\w+)/\/home\/$1\/public_html/; my $targetdir=''; - my $docroot=$r->dir_config('lonDocRoot'); + $docroot=$r->dir_config('lonDocRoot'); if ($1 ne $ENV{'user.name'}) { $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}. ' trying to publish unowned file '.$ENV{'form.filename'}. @@ -424,6 +689,8 @@ sub handler { return HTTP_NOT_FOUND; } +unless ($ENV{'form.phase'} eq 'two') { + # --------------------------------- File is there and owned, init lookup tables %addid=(); @@ -451,10 +718,23 @@ sub handler { { my $fh=Apache::File->new($r->dir_config('lonTabDir').'/language.tab'); map { - $_=~/(\w+)\s+([\w\s]+)/; + $_=~/(\w+)\s+([\w\s\-]+)/; $language{$1}=$2; } <$fh>; } + + %cprtag=(); + + { + my $fh=Apache::File->new($r->dir_config('lonIncludes').'/copyright.tab'); + map { + $_=~/(\w+)\s+([\w\s\-]+)/; + $cprtag{$1}=$2; + } <$fh>; + } + +} + # ----------------------------------------------------------- Start page output $r->content_type('text/html'); @@ -484,13 +764,16 @@ sub handler { $r->print('

Publishing '. &Apache::lonnet::filedescription($thistype).' '. $thisdisfn.'

Target: '.$thisdistarget.'

'); - + # ------------ We are publishing from $thisfn to $thistarget with $thisembstyle - $r->print('

'.&publish($thisfn,$thistarget,$thisembstyle)); - - } + unless ($ENV{'form.phase'} eq 'two') { + $r->print('
'.&publish($thisfn,$thistarget,$thisembstyle)); + } else { + $r->print('
'.&phasetwo($thisfn,$thistarget,$thisembstyle)); + } + } $r->print(''); return OK;