--- loncom/publisher/lonpublisher.pm	2008/08/01 18:09:38	1.243
+++ loncom/publisher/lonpublisher.pm	2009/04/03 16:41:13	1.255
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.243 2008/08/01 18:09:38 bisitz Exp $
+# $Id: lonpublisher.pm,v 1.255 2009/04/03 16:41:13 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -118,6 +118,8 @@ use Apache::File;
 use File::Copy;
 use Apache::Constants qw(:common :http :methods);
 use HTML::LCParser;
+use HTML::Entities;
+use Encode::Encoder;
 use Apache::lonxml;
 use Apache::loncacc;
 use DBI;
@@ -264,8 +266,9 @@ sub metaread {
     my ($logfile,$fn,$prefix)=@_;
     unless (-e $fn) {
 	print($logfile 'No file '.$fn."\n");
-        return '<br /><b>'.&mt('No file').':</b> <tt>'.
-	    &Apache::loncfile::display($fn).'</tt>';
+        return '<div><b>'
+              .&mt('No file: [_1]'
+                  ,'</b> <tt>'.&Apache::loncfile::display($fn).'</tt></div>');
     }
     print($logfile 'Processing '.$fn."\n");
     my $metastring;
@@ -274,8 +277,9 @@ sub metaread {
 	$metastring=join('',<$metafh>);
     }
     &metaeval($metastring,$prefix);
-    return '<br /><b>'.&mt('Processed file').':</b> <tt>'.
-	&Apache::loncfile::display($fn).'</tt><br />';
+    return '<div><b>'
+          .&mt('Processed file: [_1]'
+              ,'</b> <tt>'.&Apache::loncfile::display($fn).'</tt></div>');
 }
 
 #########################################
@@ -691,6 +695,7 @@ sub fix_ids_and_indices {
                     $responsecounter=0;
                 }
                 if ($lctag=~/response$/) { $responsecounter++; }
+                if ($lctag eq 'import') { $responsecounter++; }
 		my %parms=%{$token->[2]};
 		$counter=$addid{$tag};
 		if (!$counter) { $counter=$addid{$lctag}; }
@@ -843,15 +848,17 @@ sub store_metadata {
     # Determine if the table exists
     my $status = &Apache::lonmysql::check_table('metadata');
     if (! defined($status)) {
-        $error='<span class="LC_error">WARNING: Cannot connect to '.
-            'database!</span>';
+        $error='<span class="LC_error">'
+              .&mt('WARNING: Cannot connect to database!')
+              .'</span>';
         &Apache::lonnet::logthis($error);
         return ($error,undef);
     }
     if ($status == 0) {
         # It would be nice to actually create the table....
-        $error ='<span class="LC_error">WARNING: The metadata table does not '.
-            'exist in the LON-CAPA database.</span>';
+        $error ='<span class="LC_error">'
+               .&mt('WARNING: The metadata table does not exist in the LON-CAPA database!')
+               .'</span>';
         &Apache::lonnet::logthis($error);
         return ($error,undef);
     }
@@ -866,8 +873,9 @@ sub store_metadata {
                                                          \%metadata);
     }
     if (defined($status) && $status ne '') {
-        $error='<span class="LC_error">Error occured saving new values in '.
-            'metadata table in LON-CAPA database</span>';
+        $error='<span class="LC_error">'
+              .&mt('Error occurred saving new values in metadata table in LON-CAPA database!')
+              .'</span>';
         &Apache::lonnet::logthis($error);
         &Apache::lonnet::logthis($status);
         return ($error,undef);
@@ -940,7 +948,7 @@ backup copies, performs any automatic pr
 especially for rat and ssi files),
 
 Returns a 2 element array, the first is the string to be shown to the
-user, the second is an error code, either 1 (an error occured) or 0
+user, the second is an error code, either 1 (an error occurred) or 0
 (no error occurred)
 
 I<Additional documentation needed.>
@@ -983,30 +991,30 @@ sub publish {
 	if ($error) { return ($outstring,$error); }
 # ------------------------------------------------------------ Construct Allows
     
-	$scrout.='<h3>'.&mt('Dependencies').'</h3>';
+        my $outdep=''; # Collect dependencies output data
         my $allowstr='';
         foreach my $thisdep (sort(keys(%allow))) {
 	   if ($thisdep !~ /[^\s]/) { next; }
            if ($thisdep =~/\$/) {
-              $scrout.='<br /><span class="LC_warning">'
+              $outdep.='<div class="LC_warning">'
                        .&mt('The resource depends on another resource with variable filename, i.e., [_1].','<tt>'.$thisdep.'</tt>').'<br />'
                        .&mt('You likely need to explicitly allow access to all possible dependencies using the [_1]-tag.','<tt>&lt;allow&gt;</tt>')
-                       .'</span><br />';
+                       ."</div>\n";
            }
            unless ($style eq 'rat') { 
               $allowstr.="\n".'<allow src="'.$thisdep.'" />';
 	   }
-           $scrout.='<br />';
+          $outdep.='<div>';
            if ($thisdep!~/[\*\$]/ && $thisdep!~m|^/adm/|) {
-	       $scrout.='<a href="'.$thisdep.'">';
+	       $outdep.='<a href="'.$thisdep.'">';
            }
-           $scrout.='<tt>'.$thisdep.'</tt>';
+           $outdep.='<tt>'.$thisdep.'</tt>';
            if ($thisdep!~/[\*\$]/ && $thisdep!~m|^/adm/|) {
-	       $scrout.='</a>';
+	       $outdep.='</a>';
                if (
        &Apache::lonnet::getfile($Apache::lonnet::perlvar{'lonDocRoot'}.'/'.
                                             $thisdep.'.meta') eq '-1') {
-		   $scrout.= ' - <span class="LC_error">'.&mt('Currently not available').
+		   $outdep.= ' - <span class="LC_error">'.&mt('Currently not available').
 		       '</span>';
                } else {
                    my %temphash=(&Apache::lonnet::declutter($target).'___'.
@@ -1019,6 +1027,12 @@ sub publish {
 		   }
 	       }
            }
+           $outdep.='</div><br />';
+        }
+
+        if ($outdep) {
+            $scrout.='<h3>'.&mt('Dependencies').'</h3>'
+                    .$outdep
         }
         $outstring=~s/\n*(\<\/[^\>]+\>[^<]*)$/$allowstr\n$1\n/s;
 
@@ -1048,7 +1062,7 @@ sub publish {
      my %oldparmstores=();
      
     unless ($batch) {
-     $scrout.='<h3>'.&mt('Metadata Information').' ' .
+     $scrout.='<h3>'.&mt('Metadata').' ' .
        &Apache::loncommon::help_open_topic("Metadata_Description")
        . '</h3>';
     }
@@ -1172,17 +1186,22 @@ sub publish {
 	$textonly=~s/\<script[^\<]+\<\/script\>//g;
 	$textonly=~s/\<m\>[^\<]+\<\/m\>//g;
 	$textonly=~s/\<[^\>]*\>//g;
-	$textonly=~tr/A-Z/a-z/;
-	$textonly=~s/[\$\&][a-z]\w*//g;
-	$textonly=~s/[^a-z\s]//g;
-	
-	foreach ($textonly=~m/(\w+)/g) {
-	    unless ($nokey{$_}) {
-		$keywords{$_}=1;
-	    } 
-	}
-    }
 
+        #this is a work simplification for german authors for present
+        $textonly=HTML::Entities::decode($textonly);           #decode HTML-character
+        $textonly=Encode::Encoder::encode('utf8', $textonly);  #encode to perl internal unicode
+        $textonly=~tr/A-ZÜÄÖ/a-züäö/;      #add lowercase rule for german "Umlaute"
+        $textonly=~s/[\$\&][a-z]\w*//g;
+        $textonly=~s/[^a-z^ü^ä^ö^ß\s]//g;  #dont delete german "Umlaute"
+
+        foreach ($textonly=~m/[^\s]+/g) {  #match all but whitespaces
+            unless ($nokey{$_}) {
+                $keywords{$_}=1;
+            }
+        }
+
+
+    }
             
     foreach my $addkey (split(/[\"\'\,\;]/,$metadatafields{'keywords'})) {
 	$addkey=~s/\s+/ /g;
@@ -1203,7 +1222,7 @@ sub publish {
     my $intr_scrout.='<br />'
                     .'<form name="pubform" action="/adm/publish" method="post">';
     unless ($env{'form.makeobsolete'}) {
-       $intr_scrout.='<p>'
+       $intr_scrout.='<p class="LC_warning">'
                     .&mt('Searching for your resource will be based on the following metadata. Please provide as much data as possible.')
                     .'</p>'
                     .'<p><input type="submit" value="'
@@ -1242,37 +1261,43 @@ END
                 .'<input type="button" value="'.&mt('check all').'" onclick="javascript:checkAll(document.pubform.keywords)" />'
                 .'<input type="button" value="'.&mt('uncheck all').'" onclick="javascript:uncheckAll(document.pubform.keywords)" />'
                 .'</p><br />'
-                .&Apache::loncommon::start_data_table()
-                .&Apache::loncommon::start_data_table_row();
-
+                .&Apache::loncommon::start_data_table();
+    my $cols_per_row = 10;
     my $colcount=0;
+    my $wordcount=0;
+    my $numkeywords = scalar(keys(%keywords));
 
-    foreach (sort keys %keywords) {
-	$colcount++;
-	$keywordout.='<td><label>'.$colcount.'<input type="checkbox" name="keywords" value="'.$_.'"';
-	if ($metadatafields{'keywords'}) {
-	    if ($metadatafields{'keywords'}=~/\Q$_\E/) {
-		$keywordout.=' checked="on"';
-		$env{'form.keywords'}.=$_.',';
-	    }
-	} elsif (&Apache::loncommon::keyword($_)) {
-	    $keywordout.=' checked="on"';
-	    $env{'form.keywords'}.=$_.',';
-	}
-	$keywordout.=' />'.$_.'</label></td>';
-	if ($colcount>=10) {
-	    $keywordout.=&Apache::loncommon::end_data_table_row()
-                        .&Apache::loncommon::start_data_table_row();
-	    $colcount=0;
-	}
-    }
-    # Proper end of started table row:
-    if ($colcount != 0) { # has still to be improved: if amount of keywords mod 10 == 0, then do not start another table row
-        while ($colcount<10) {
-            $keywordout.='<td>&nbsp;</td>';
-            $colcount++;
+    foreach my $word (sort(keys(%keywords))) {
+        if ($colcount == 0) {
+            $keywordout .= &Apache::loncommon::start_data_table_row();
+        }
+        $colcount++;
+        $wordcount++;
+        if (($wordcount == $numkeywords) && ($colcount < $cols_per_row)) {
+            my $colspan = 1+$cols_per_row-$colcount;
+            $keywordout .= '<td colspan="'.$colspan.'">';
+        } else {
+            $keywordout .= '<td>';
+        }
+        $keywordout.='<label><input type="checkbox" name="keywords" value="'.$word.'"';
+        if ($metadatafields{'keywords'}) {
+            if ($metadatafields{'keywords'}=~/\Q$word\E/) {
+                $keywordout.=' checked="checked"';
+                $env{'form.keywords'}.=$word.',';
+            }
+        } elsif (&Apache::loncommon::keyword($word)) {
+            $keywordout.=' checked="checked"';
+            $env{'form.keywords'}.=$word.',';
+        }
+        $keywordout.=' />'.$word.'</label></td>';
+        if ($colcount == $cols_per_row) {
+            $keywordout.=&Apache::loncommon::end_data_table_row();
+            $colcount=0;
         }
     }
+    if ($colcount > 0) {
+        $keywordout .= &Apache::loncommon::end_data_table_row();
+    }
 
     $env{'form.keywords'}=~s/\,$//;
 
@@ -1479,7 +1504,7 @@ sub phasetwo {
 	    return 0;
 	}
 	if ($target=~/\.(\d+)\.(\w+)$/) {
-	    $r->print('<span class="LC_error">'.&mt('Cannot publish versioned resource, FAIL').'</span>');
+	    $r->print('<span class="LC_error">'.&mt('Filename of resource contains internal version number. Cannot publish such resources, FAIL').'</span>');
 	    return 0;
 	}
     }
@@ -1627,14 +1652,14 @@ sub phasetwo {
                 unlink($srcd.'/'.$filename);
                 unlink($srcd.'/'.$filename.'.meta');
             } else {
-                if ($filename=~/\Q$srcf\E\.(\d+)\.\Q$srct\E$/) {
+                if ($filename=~/^\Q$srcf\E\.(\d+)\.\Q$srct\E$/) {
                     $maxversion=($1>$maxversion)?$1:$maxversion;
                 }
             }
         }
         closedir(DIR);
         $maxversion++;
-        $r->print('<p>Creating old version '.$maxversion.'</p>');
+        $r->print('<p>'.&mt('Creating old version [_1]',$maxversion).'</p>');
         print $logfile "\nCreating old version ".$maxversion."\n";
         
         my $copyfile=$srcd.'/'.$srcf.'.'.$maxversion.'.'.$srct;
@@ -1683,8 +1708,12 @@ sub phasetwo {
         $path.="/$parts[$count]";
         if ((-e $path)!=1) {
             print $logfile "\nCreating directory ".$path;
-            $r->print('<p>'.&mt('Created directory').' '.$parts[$count].'</p>');
             mkdir($path,0777);
+            $r->print('<p>'
+                     .&mt('Created directory [_1]'
+                         ,'<span class="LC_filename">'.$parts[$count].'</span>')
+                     .'</p>'
+            );
         }
     }
     
@@ -1727,9 +1756,12 @@ sub phasetwo {
     &Apache::lonnet::devalidate_cache_new('meta',
 			 &Apache::lonnet::declutter($thisdistarget));
 
+# ------------------------------------------------------------- Everything done
+    $logfile->close();
+    $r->print('<p class="LC_success">'.&mt('Done').'</p>');
+
 # ------------------------------------------------ Provide link to new resource
     unless ($batch) {
-        
         my $thissrc=$source;
         $thissrc=~s{^/home/($match_username)/public_html}{/priv/$1};
         
@@ -1746,8 +1778,6 @@ sub phasetwo {
                    '"><font size="+2">'.
 		  &mt('Back to Source Directory').'</font></a></p>');
     }
-    $logfile->close();
-    $r->print('<p><font color="green">'.&mt('Done').'</font></p>');
     return 1;
 }
 
@@ -1814,7 +1844,11 @@ sub batchpublish {
 
     my $thisembstyle=&Apache::loncommon::fileembstyle($thistype);
      
-    $r->print('<h2>'.&mt('Publishing').' <tt>'.$thisdisfn.'</tt></h2>');
+    $r->print('<h2>'
+             .&mt('Publishing [_1]'
+                 ,'<span class="LC_filename">'.$thisdisfn.'</span>')
+             .'</h2>'
+    );
 
 # phase one takes
 #  my ($source,$target,$style,$batch)=@_;
@@ -1853,7 +1887,7 @@ sub publishdirectory {
 		  &checkbox('pubrec','include subdirectories').
 		  &checkbox('forcerepub','force republication of previously published files').
                   &checkbox('obsolete','make file(s) obsolete').
-		  &checkbox('forceoverride','force directory level catalog information over existing').
+		  &checkbox('forceoverride','force directory level metadata over existing').
 		  '<br /><input type="submit" value="'.&mt('Publish Directory').'" /></form>');
         $lock=0;
     } else {
@@ -1924,7 +1958,7 @@ sub defaultmetapublish {
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
 
-    $r->print(&Apache::loncommon::start_page('Catalog Information Publication'));
+    $r->print(&Apache::loncommon::start_page('Metadata Publication'));
 
 # ---------------------------------------------------------------- Write Source
     my $copyfile=$target;
@@ -1936,8 +1970,12 @@ sub defaultmetapublish {
     for ($count=5;$count<$#parts;$count++) {
         $path.="/$parts[$count]";
         if ((-e $path)!=1) {
-            $r->print('<p>'.&mt('Created directory').' '.$parts[$count].'</p>');
             mkdir($path,0777);
+            $r->print('<p>'
+                     .&mt('Created directory [_1]'
+                         ,'<span class="LC_filename">'.$parts[$count].'</span>')
+                     .'</p>'
+            );
         }
     }
     
@@ -1959,7 +1997,7 @@ sub defaultmetapublish {
 # ------------------------------------------------------------------- Link back
     my $link=$fn;
     $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 Metadata').'</a>');
     $r->print(&Apache::loncommon::end_page());
     return OK;
 }
@@ -2144,7 +2182,11 @@ sub handler {
 	my $thisembstyle=&Apache::loncommon::fileembstyle($thistype);
         if ($thistype eq 'page') {  $thisembstyle = 'rat'; }
 
-	$r->print('<h2>'.&mt('Publishing [_1]','<tt>'.$thisdisfn.'</tt>').'</h2>');
+        $r->print('<h2>'
+                 .&mt('Publishing [_1]'
+                     ,'<span class="LC_filename">'.$thisdisfn.'</span>')
+                 .'</h2>'
+        );
 
         $r->print('<h3>'.&mt('Resource Details').'</h3>');
 
@@ -2169,9 +2211,7 @@ ENDCAPTION
         $r->print(&Apache::lonhtmlcommon::row_title(&mt('Target'))
                  .'<tt>'.$thisdistarget.'</tt>'
                  );
-# SB - ToDo:   
 	if (($cuname ne $env{'user.name'})||($cudom ne $env{'user.domain'})) {
-#           $r->print(&Apache::lonhtmlcommon::row_title('<span class="LC_warning">'.&mt('Co-Author').'</span>')
             $r->print(&Apache::lonhtmlcommon::row_closure()
                      .&Apache::lonhtmlcommon::row_title(&mt('Co-Author'))
                      .'<span class="LC_warning">'
@@ -2204,7 +2244,7 @@ ENDDIFF
 	    unless ($errorcount) {
 		my ($outstring,$error)=
 		    &publish($thisfn,$thistarget,$thisembstyle);
-		$r->print('<hr />'.$outstring);
+		$r->print($outstring);
 	    } else {
 		$r->print('<h3 class="LC_error">'.
 			  &mt('The document contains errors and cannot be published.').