--- loncom/publisher/lonpublisher.pm	2002/10/20 18:39:36	1.105
+++ loncom/publisher/lonpublisher.pm	2003/02/18 23:18:50	1.112
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.105 2002/10/20 18:39:36 www Exp $
+# $Id: lonpublisher.pm,v 1.112 2003/02/18 23:18:50 albertel 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
 #
 ###
@@ -121,7 +117,6 @@ use File::Copy;
 use Apache::Constants qw(:common :http :methods);
 use HTML::LCParser;
 use Apache::lonxml;
-use Apache::lonhomework;
 use Apache::loncacc;
 use DBI;
 use Apache::lonnet();
@@ -488,6 +483,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;
@@ -498,6 +497,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;
 		    }
@@ -511,7 +516,8 @@ sub get_max_ids_indices {
 	    }
 	}
     }
-    return ($needsfixup,$maxid,$maxindex);
+    return ($needsfixup,$maxid,$maxindex,$duplicateids,
+	    (keys(%duplicatedids)));
 }
 
 #########################################
@@ -543,7 +549,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;
@@ -580,8 +586,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".
@@ -705,7 +719,7 @@ sub fix_ids_and_indices {
 	print $logfile "Does not need ID and/or index fixup\n";
     }
 
-    return ($outstring,%allow);
+    return ($outstring,0,%allow);
 }
 
 #########################################
@@ -810,8 +824,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>';
@@ -1182,11 +1198,18 @@ sub phasetwo {
     my ($r,$source,$target,$style,$distarget,$batch)=@_;
     $source=~s/\/+/\//g;
     $target=~s/\/+/\//g;
+
+    if ($target=~/\_\_\_/) {
+	$r->print(
+ '<font color=red>Unsupported character combination "<tt>___</tt>" in filename, FAIL</font>');
+        return 0;
+    }
     $distarget=~s/\/+/\//g;
     my $logfile;
     unless ($logfile=Apache::File->new('>>'.$source.'.log')) {
-	return 
-            '<font color=red>No write permission to user directory, FAIL</font>';
+	$r->print(
+        '<font color=red>No write permission to user directory, FAIL</font>');
+        return 0;
     }
     print $logfile 
         "\n================= Publish ".localtime()." Phase Two  ================\n";