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

[raeburn]

raeburn		Wed Sep 29 16:09:20 2010 EDT

  Modified files:              
    /loncom/xml	lonxml.pm 
  Log:
  - Complete editing of regexp started in 1.516. 
  
  
Index: loncom/xml/lonxml.pm
diff -u loncom/xml/lonxml.pm:1.517 loncom/xml/lonxml.pm:1.518
--- loncom/xml/lonxml.pm:1.517	Wed Sep 29 15:56:03 2010
+++ loncom/xml/lonxml.pm	Wed Sep 29 16:09:20 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.517 2010/09/29 15:56:03 raeburn Exp $
+# $Id: lonxml.pm,v 1.518 2010/09/29 16:09:20 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1437,7 +1437,7 @@
     my ($is_html,$is_xml);
     if ($filecontents =~/(?:\<|\&lt\;)\?xml[^\<]*\?(?:\>|\&gt\;)/is) {
         $is_xml = 1;
-    } elsif ($filecontents =~/(?:\<|\&lt\;)html(?:\s+[^\<]+|\s*)[^\<]*(?:\>|\&gt\;)/is) {
+    } elsif ($filecontents =~/(?:\<|\&lt\;)html(?:\s+[^\<]+|\s*)(?:\>|\&gt\;)/is) {
         $is_html = 1;
     }
     unless ($is_xml || $is_html) {