--- loncom/build/lpml_parse.pl	2001/12/13 23:41:26	1.31
+++ loncom/build/lpml_parse.pl	2001/12/29 18:52:08	1.34
@@ -3,7 +3,7 @@
 # The LearningOnline Network with CAPA
 # lpml_parse.pl - Linux Packaging Markup Language parser
 #
-# $Id: lpml_parse.pl,v 1.31 2001/12/13 23:41:26 harris41 Exp $
+# $Id: lpml_parse.pl,v 1.34 2001/12/29 18:52:08 harris41 Exp $
 #
 # Written by Scott Harrison, harris41@msu.edu
 #
@@ -401,9 +401,12 @@ sub end {
 	    "<table border='1' cellpadding='5'>".
 	    "<caption>File Category Count</caption>".
 	    "<tr><th>Icon</th><th>Name</th><th>Number of Occurrences</th>".
+	    "<th>Number of Incorrect Counts</th>".
+	    "</tr>".
 	    join("\n",(map {"<tr><td><img src='$fab{$_}.gif' ".
 		 "alt='$_ icon' /></td>".
- 	         "<td>$_</td><td>$categorycount{$_}</td></tr>"}
+ 	         "<td>$_</td><td>$categorycount{$_}</td>".
+		 "<td><!-- POSTEVALINLINE $_ --></td></tr>"}
 		@categorynamelist)).
 	    "</table>".
 	    "</body></html>\n";
@@ -889,7 +892,7 @@ sub format_directory {
 	my ($chmod,$chown)=split(/\s/,$categoryhash{$categoryname});
 	return $directory="\n<tr><td rowspan='2' bgcolor='#ffffff'>".
 	    "$categoryname</td>".
-	    "<td rowspan='2' bgcolor='#ffffff'><!-- POSTEVAL verify.pl directory /$targetdir $categoryhash{$categoryname} -->&nbsp;</td>".
+	    "<td rowspan='2' bgcolor='#ffffff'><!-- POSTEVAL [$categoryname] verify.pl directory /$targetdir $categoryhash{$categoryname} -->&nbsp;</td>".
 	    "<td rowspan='2' bgcolor='#ffffff'>$chmod<br />$chown</td>".
 	    "<td bgcolor='#ffffff'>$thtml</td></tr>".
 	    "<tr><td bgcolor='#ffffff' colspan='[{{{{{DPATHLENGTH}}}}}]'>".
@@ -982,8 +985,14 @@ sub format_files {
 	foreach my $bi (@buildinfo) {
 	    my ($target,$source,$command,$trigger,@deps)=split(/\;/,$bi);
 	    $tword=''; $tword=' alwaysrun' if $trigger eq 'always run'; 
-	    $command=~s/\/([^\/]*)$//;
-	    $command2="cd $command; sh ./$1;\\";
+	    if ($command!~/\s/) {
+		$command=~s/\/([^\/]*)$//;
+		$command2="cd $command; sh ./$1;\\";
+	    }
+	    else {
+		$command=~s/(.*?\/)([^\/]+\s+.*)$/$1/;
+		$command2="cd $command; sh ./$2;\\";
+	    }
 	    my $depstring;
 	    my $depstring2="\t\t\@echo '';\\\n";
 	    my $olddep;
@@ -1063,7 +1072,7 @@ sub format_file {
 	if ($mode eq 'html') {
 	    return ($file="\n<!-- FILESORT:$target -->".
 		    "<tr>".
-		    "<td><!-- POSTEVAL verify.pl file '$sourcerootarg' ".
+		    "<td><!-- POSTEVAL [$categoryname] verify.pl file '$sourcerootarg' ".
 		    "'$targetrootarg' ".
 		    "'$source' '$target' ".
 		    "$categoryhash{$categoryname} -->&nbsp;</td><td>".
@@ -1092,10 +1101,10 @@ sub format_file {
 		foreach my $dep (@deps) {
 		    $depstring.=<<END;
 		ECODE=0; DEP=''; \\
-		test -e $command/$dep || (echo '**** WARNING **** cannot evaluate status of dependency $command/$dep (for building ${sourceroot}/${source} with)'$logcmd); DEP="1"; \\
-		[ -n DEP ] && { perl filecompare.pl -b2 $command/$dep ${targetroot}/${target} || ECODE=\$\$?; } || DEP="1"; \\
+		test -e $dep || (echo '**** WARNING **** cannot evaluate status of dependency $dep (for building ${sourceroot}/${source} with)'$logcmd); DEP="1"; \\
+		[ -n DEP ] && { perl filecompare.pl -b2 $dep ${targetroot}/${target} || ECODE=\$\$?; } || DEP="1"; \\
 		case "\$\$ECODE" in \\
-			2) echo "**** WARNING **** dependency $command/$dep is newer than target file ${targetroot}/${target}; you may want to run make build"$logcmd;; \\
+			2) echo "**** WARNING **** dependency $dep is newer than target file ${targetroot}/${target}; you may want to run make build"$logcmd;; \\
 		esac; \\
 END
 		}
@@ -1194,7 +1203,7 @@ sub format_link {
 		$categorycount{$categoryname}++;
 		push @links,("\n<!-- FILESORT:$tgt -->".
 		    "<tr>".
-		    "<td><!-- POSTEVAL verify.pl link ".
+		    "<td><!-- POSTEVAL [$categoryname] verify.pl link ".
 		    "'/$targetrootarg$linkto' '/$targetrootarg$tgt' ".
 		    "$categoryhash{$categoryname} -->&nbsp;</td><td>".
 		    "<img src='$fab{$categoryname}.gif' ".
@@ -1265,7 +1274,7 @@ sub format_fileglob {
 	$parser->get_tag('/fileglob');
 	if ($mode eq 'html') {
 	    return $fileglob="\n<tr>".
-		"<td><!-- POSTEVAL verify.pl fileglob '$sourcerootarg' ".
+		"<td><!-- POSTEVAL [$categoryname] verify.pl fileglob '$sourcerootarg' ".
 		"'$targetrootarg' ".
 		"'$glob' '$sourcedir' '$filenames2' '$targetdir' ".
 		"$categoryhash{$categoryname} -->&nbsp;</td>".