[LON-CAPA-cvs] cvs: loncom /publisher lonpublisher.pm /xml lonxml.pm

[albertel]

albertel		Wed Nov  6 17:36:08 2002 EDT

  Modified files:              
    /loncom/xml	lonxml.pm 
    /loncom/publisher	lonpublisher.pm 
  Log:
  - fixes BUG#918
  - allows \n inside <m> 
  
  
Index: loncom/xml/lonxml.pm
diff -u loncom/xml/lonxml.pm:1.210 loncom/xml/lonxml.pm:1.211
--- loncom/xml/lonxml.pm:1.210	Sun Nov  3 14:16:20 2002
+++ loncom/xml/lonxml.pm	Wed Nov  6 17:36:08 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.210 2002/11/03 19:16:20 www Exp $
+# $Id: lonxml.pm,v 1.211 2002/11/06 22:36:08 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1046,7 +1046,7 @@
    } elsif ($token->[0] eq 'E')  {
      $result.=$token->[2];
    }
-   if ($result =~ /(.*)$tag(.*)/) {
+   if ($result =~ /(.*)\Q$tag\E(.*)/s) {
      &Apache::lonxml::debug('Got a winner with leftovers ::'.$2);
      &Apache::lonxml::debug('Result is :'.$1);
      $result=$1;
Index: loncom/publisher/lonpublisher.pm
diff -u loncom/publisher/lonpublisher.pm:1.106 loncom/publisher/lonpublisher.pm:1.107
--- loncom/publisher/lonpublisher.pm:1.106	Mon Oct 21 12:58:21 2002
+++ loncom/publisher/lonpublisher.pm	Wed Nov  6 17:36:08 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.106 2002/10/21 16:58:21 albertel Exp $
+# $Id: lonpublisher.pm,v 1.107 2002/11/06 22:36:08 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -554,7 +554,7 @@
 	} 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;