--- loncom/publisher/lonpublisher.pm	2002/10/10 15:05:36	1.102
+++ loncom/publisher/lonpublisher.pm	2003/02/18 13:20:13	1.109
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.102 2002/10/10 15:05:36 www Exp $
+# $Id: lonpublisher.pm,v 1.109 2003/02/18 13:20:13 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,18 +33,14 @@
 # 11/28,11/29,11/30,12/01,12/02,12/04,12/23 Gerd Kortemeyer
 # 03/23 Guy Albertelli
 # 03/24,03/29,04/03 Gerd Kortemeyer
-# 04/16/2001 Scott Harrison
 # 05/03,05/05,05/07 Gerd Kortemeyer
-# 05/28/2001 Scott Harrison
 # 06/23,08/07,08/11,8/13,8/17,8/18,8/24,9/26,10/16 Gerd Kortemeyer
 # 12/04,12/05 Guy Albertelli
 # 12/05 Gerd Kortemeyer
 # 12/05 Guy Albertelli
 # 12/06,12/07 Gerd Kortemeyer
-# 12/15,12/16 Scott Harrison
 # 12/25 Gerd Kortemeyer
 # YEAR=2002
-# 1/16,1/17 Scott Harrison
 # 1/17 Gerd Kortemeyer
 #
 ###
@@ -127,21 +123,16 @@ use DBI;
 use Apache::lonnet();
 use Apache::loncommon();
 use Apache::lonmysql;
+use vars qw(%metadatafields %metadatakeys);
 
 my %addid;
 my %nokey;
 
-my %metadatafields;
-my %metadatakeys;
-
 my $docroot;
 
 my $cuname;
 my $cudom;
 
-#########################################
-#########################################
-
 =pod
 
 =item B<metaeval>
@@ -267,48 +258,6 @@ sub metaread {
 #########################################
 #########################################
 
-=pod
-
-=item B<sqltime>
-
-Convert 'time' format into a datetime sql format
-
-Parameters:
-
-=over 4
-
-=item I<$timef>
-
-Seconds since 00:00:00 UTC, January 1, 1970.
-
-=back
-
-Returns:
-
-=over 4
-
-=item Scalar string
-
-MySQL-compatible datetime string.
-
-=back
-
-=cut
-
-#########################################
-#########################################
-sub sqltime {
-    my $timef=shift @_;
-    my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) =
-	localtime($timef);
-    $mon++; $year+=1900;
-    return "$year-$mon-$mday $hour:$min:$sec";
-}
-
-
-#########################################
-#########################################
-
 sub coursedependencies {
     my $url=&Apache::lonnet::declutter(shift);
     $url=~s/\.meta$//;
@@ -535,6 +484,10 @@ sub get_max_ids_indices {
     my $maxindex=10;
     my $maxid=10;
     my $needsfixup=0;
+    my $duplicateids=0;
+
+    my %allids;
+    my %duplicatedids;
 
     my $parser=HTML::LCParser->new($content);
     my $token;
@@ -545,6 +498,12 @@ sub get_max_ids_indices {
 		if ($counter eq 'id') {
 		    if (defined($token->[2]->{'id'})) {
 			$maxid=($token->[2]->{'id'}>$maxid)?$token->[2]->{'id'}:$maxid;
+			if (exists($allids{$token->[2]->{'id'}})) {
+			    $duplicateids=1;
+			    $duplicatedids{$token->[2]->{'id'}}=1;
+			} else {
+			    $allids{$token->[2]->{'id'}}=1;
+			}
 		    } else {
 			$needsfixup=1;
 		    }
@@ -558,7 +517,8 @@ sub get_max_ids_indices {
 	    }
 	}
     }
-    return ($needsfixup,$maxid,$maxindex);
+    return ($needsfixup,$maxid,$maxindex,$duplicateids,
+	    (keys(%duplicatedids)));
 }
 
 #########################################
@@ -590,7 +550,7 @@ sub get_all_text_unbalanced {
 	} elsif ($token->[0] eq 'E')  {
 	    $result.=$token->[2];
 	}
-	if ($result =~ /(.*)$tag(.*)/) {
+	if ($result =~ /(.*)\Q$tag\E(.*)/s) {
 	    #&Apache::lonnet::logthis('Got a winner with leftovers ::'.$2);
 	    #&Apache::lonnet::logthis('Result is :'.$1);
 	    $result=$1;
@@ -627,8 +587,16 @@ sub fix_ids_and_indices {
 	$content=join('',<$org>);
     }
 
-    my ($needsfixup,$maxid,$maxindex)=&get_max_ids_indices(\$content);
+    my ($needsfixup,$maxid,$maxindex,$duplicateids,@duplicatedids)=
+	&get_max_ids_indices(\$content);
 
+    print $logfile ("Got $needsfixup,$maxid,$maxindex,$duplicateids--".
+			   join(', ',@duplicatedids));
+    if ($duplicateids) {
+	print $logfile "Duplicate ID(s) exist, ".join(', ',@duplicatedids)."\n";
+	my $outstring='<font color="red">Unable to publish file, it contains duplicated ID(s), ID(s) need to be unique. The duplicated ID(s) are: '.join(', ',@duplicatedids).'</font>';
+	return ($outstring,1);
+    }
     if ($needsfixup) {
 	print $logfile "Needs ID and/or index fixup\n".
 	    "Max ID   : $maxid (min 10)\n".
@@ -752,7 +720,7 @@ sub fix_ids_and_indices {
 	print $logfile "Does not need ID and/or index fixup\n";
     }
 
-    return ($outstring,%allow);
+    return ($outstring,0,%allow);
 }
 
 #########################################
@@ -857,8 +825,10 @@ sub publish {
         }
 # ------------------------------------------------------------- IDs and indices
 	
-	my $outstring;
-	($outstring,%allow)=&fix_ids_and_indices($logfile,$source,$target);
+	my ($outstring,$error);
+	($outstring,$error,%allow)=&fix_ids_and_indices($logfile,$source,
+							$target);
+	if ($error) { return $outstring; }
 # ------------------------------------------------------------ Construct Allows
     
 	$scrout.='<h3>Dependencies</h3>';
@@ -1124,7 +1094,8 @@ END
         unless ($metadatafields{'creationdate'}) {
 	    $metadatafields{'creationdate'}=time;
         }
-        $scrout.=&hiddenfield('creationdate',$metadatafields{'creationdate'});
+        $scrout.=&hiddenfield('creationdate',
+              &Apache::loncommon::unsqltime($metadatafields{'creationdate'}));
 
         $scrout.=&hiddenfield('lastrevisiondate',time);
 
@@ -1228,6 +1199,11 @@ sub phasetwo {
     my ($r,$source,$target,$style,$distarget,$batch)=@_;
     $source=~s/\/+/\//g;
     $target=~s/\/+/\//g;
+
+    if ($target=~/\_\_\_/) {
+	return 
+ '<font color=red>Unsupported character combination "<tt>___</tt>" in filename, FAIL</font>';
+    }
     $distarget=~s/\/+/\//g;
     my $logfile;
     unless ($logfile=Apache::File->new('>>'.$source.'.log')) {
@@ -1249,10 +1225,8 @@ sub phasetwo {
     $metadatafields{'abstract'}=$ENV{'form.abstract'};
     $metadatafields{'mime'}=$ENV{'form.mime'};
     $metadatafields{'language'}=$ENV{'form.language'};
-    $metadatafields{'creationdate'}=
-        &sqltime($ENV{'form.creationdate'});
-    $metadatafields{'lastrevisiondate'}=
-        &sqltime($ENV{'form.lastrevisiondate'});
+    $metadatafields{'creationdate'}=$ENV{'form.creationdate'};
+    $metadatafields{'lastrevisiondate'}=$ENV{'form.lastrevisiondate'};
     $metadatafields{'owner'}=$ENV{'form.owner'};
     $metadatafields{'copyright'}=$ENV{'form.copyright'};
     $metadatafields{'dependencies'}=$ENV{'form.dependencies'};
@@ -1742,7 +1716,7 @@ unless ($ENV{'form.phase'} eq 'two') {
       if (&Apache::loncommon::fileembstyle($thistype) eq 'ssi') {
           $r->print('<br /><a href="/adm/diff?filename=/~'.$cuname.'/'.
                     $thisdisfn.
-  	  '&versionone=priv" target="cat">Diffs with Current Version</a><p>');
+  	  '&versiontwo=priv" target="cat">Diffs with Current Version</a><p>');
       }
   
 # ------------------ Publishing from $thisfn to $thistarget with $thisembstyle.