[LON-CAPA-cvs] cvs: loncom /build xfml_parse.pl

[harris41]

harris41		Wed May 22 13:07:50 2002 EDT

  Modified files:              
    /loncom/build	xfml_parse.pl 
  Log:
  xfml_parse.pl already has been well-tested.  the changes in 1.6 are incorrect
  and are now reversed.
  
  
Index: loncom/build/xfml_parse.pl
diff -u loncom/build/xfml_parse.pl:1.6 loncom/build/xfml_parse.pl:1.7
--- loncom/build/xfml_parse.pl:1.6	Tue May 21 15:13:53 2002
+++ loncom/build/xfml_parse.pl	Wed May 22 13:07:50 2002
@@ -8,7 +8,7 @@
 # The LearningOnline Network with CAPA
 # piml_parse.pl - Linux Packaging Markup Language parser
 #
-# $Id: xfml_parse.pl,v 1.6 2002/05/21 19:13:53 matthew Exp $
+# $Id: xfml_parse.pl,v 1.7 2002/05/22 17:07:50 harris41 Exp $
 #
 # Written by Scott Harrison, codeharrison@yahoo.com
 #
@@ -147,11 +147,12 @@
 		$ttype='E';
 		$excludeflag=0;
 		$outcache.=$token->[2];
+		my $retval=&evalconditions($outcache);
 		if (&evalconditions($outcache)) {
-		    $output.='<!-- FILTERED OUT -->';
+		    $output.=$outcache;
 		}
 		else {
-		    $output.=$outcache;
+		    $output.='<!-- FILTERED OUT -->';
 		}
 		$outcache='';
 	    }
@@ -175,7 +176,7 @@
     my $eparser = HTML::TokeParser->new(\$parsetext);
     unless (@{$conditions{'name'}} or
 	    @{$conditions{'attribute'}}) {
-	return 1;
+	return 0;
     }
     my $nameflag=0;
     my $cdataflag=0;