--- loncom/build/lpml_parse.pl	2001/12/12 23:20:47	1.30
+++ loncom/build/lpml_parse.pl	2002/03/22 02:09:41	1.42
@@ -3,7 +3,7 @@
 # The LearningOnline Network with CAPA
 # lpml_parse.pl - Linux Packaging Markup Language parser
 #
-# $Id: lpml_parse.pl,v 1.30 2001/12/12 23:20:47 harris41 Exp $
+# $Id: lpml_parse.pl,v 1.42 2002/03/22 02:09:41 harris41 Exp $
 #
 # Written by Scott Harrison, harris41@msu.edu
 #
@@ -35,8 +35,9 @@
 # 9/5/2001,9/6,9/7,9/8 - Scott Harrison
 # 9/17,9/18 - Scott Harrison
 # 11/4,11/5,11/6,11/7,11/16,11/17 - Scott Harrison
-# 12/2,12/3,12/4,12/5,12/6 - Scott Harrison
-#
+# 12/2,12/3,12/4,12/5,12/6,12/13,12/19,12/29 - Scott Harrison
+# YEAR=2002
+# 1/8,1/9,1/29,1/31,2/5,3/21 - Scott Harrison
 ###
 
 ###############################################################################
@@ -128,8 +129,8 @@ if ($mode eq 'install' or $mode eq 'conf
 #             1st argument (mode) is: $mode
 #             2nd argument (category type) is: $categorytype
 #             3rd argument (distribution) is: $dist
-#             4th argument (targetroot) is: described below
-#             5th argument (sourceroot) is: described below
+#             4th argument (sourceroot) is: described below
+#             5th argument (targetroot) is: described below
 END
 }
 
@@ -206,7 +207,7 @@ while ($token = $parser->get_token()) {
 	    $cleanstring.=$token->[4];
 	}
 	if ($token->[4]=~/\/>$/) {
-	    $hloc--;
+#	    $hloc--;
 	}
     }
     if ($token->[0] eq 'E') {
@@ -279,10 +280,6 @@ my $link_count;
 my $fileglob_count;
 my $fileglobnames_count;
 my %categorycount;
-# START TEMP WAY
-#my %bytecount;  # TEMP WAY TO COUNT INFORMATION
-#my %linecount;  # TEMP WAY TO COUNT INFORMATION
-# END TEMP WAY
 
 my @buildall;
 my @buildinfo;
@@ -298,6 +295,8 @@ $parser->xml_mode('1');
 # Define handling methods for mode-dependent text rendering
 
 $parser->{textify}={
+    specialnotices => \&format_specialnotices,
+    specialnotice => \&format_specialnotice,
     targetroot => \&format_targetroot,
     sourceroot => \&format_sourceroot,
     categories => \&format_categories,
@@ -319,6 +318,7 @@ $parser->{textify}={
     rpmAutoReqProv => \&format_rpmAutoReqProv,
     rpmdescription => \&format_rpmdescription,
     rpmpre => \&format_rpmpre,
+    rpmRequires => \&format_rpmRequires,
     directories => \&format_directories,
     directory => \&format_directory,
     categoryname => \&format_categoryname,
@@ -365,13 +365,6 @@ exit;
 # ------------------------ Final output at end of markup parsing and formatting
 sub end {
     if ($mode eq 'html') {
-	# START TEMP WAY
-#	my $totallinecount;
-#	my $totalbytecount;
-#	map {$totallinecount+=$linecount{$_};
-#	     $totalbytecount+=$bytecount{$_}}
-# 	  @categorynamelist;
-        # END TEMP WAY
 	return "<br />&nbsp;<br />".
 	    "<a name='summary' /><font size='+2'>Summary of Source Repository".
 	    "</font>".
@@ -399,23 +392,16 @@ 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";
 
-# START TEMP WAY
-#	    join("\n",(map {"<tr><td><img src='$fab{$_}.gif' ".
-#		 "alt='$_ icon' /></td>".
-# 	         "<td>$_</td><td>$categorycount{$_}</td><td>$linecount{$_}</td><td>$bytecount{$_}</td></tr>"}
-#		@categorynamelist)).
-#	    "<br />&nbsp;<br />".
-#	    "Total Lines of Code: $totallinecount".
-#	    "<br />&nbsp;<br />".
-#	    "Total Bytes: $totalbytecount".
-# END TEMP WAY
     }
     if ($mode eq 'install') {
 	return '';
@@ -659,6 +645,9 @@ $text
 </table>
 END
     }
+    elsif ($mode eq 'make_rpm') {
+	return $text;
+    }
     elsif ($mode eq 'text') {
 	return $rpm=<<END;
 Software Package Description
@@ -680,6 +669,11 @@ sub format_rpmSummary {
     elsif ($mode eq 'text') {
 	return $rpmSummary="\nSummary     : $text";
     }
+    elsif ($mode eq 'make_rpm') {
+	return <<END;
+<summary>$text</summary>
+END
+    }
     else {
 	return '';
     }
@@ -694,6 +688,11 @@ sub format_rpmName {
     elsif ($mode eq 'text') {
 	return $rpmName="\nName        : $text";
     }
+    elsif ($mode eq 'make_rpm') {
+	return <<END;
+<name>$text</name>
+END
+    }
     else {
 	return '';
     }
@@ -736,6 +735,11 @@ sub format_rpmVendor {
     elsif ($mode eq 'text') {
 	return $rpmVendor="\nVendor      : $text";
     }
+    elsif ($mode eq 'make_rpm') {
+	return <<END;
+<vendor>$text</vendor>
+END
+    }
     else {
 	return '';
     }
@@ -764,6 +768,11 @@ sub format_rpmCopyright {
     elsif ($mode eq 'text') {
 	return $rpmCopyright="\nLicense     : $text";
     }
+    elsif ($mode eq 'make_rpm') {
+	return <<END;
+<copyright>$text</copyright>
+END
+    }
     else {
 	return '';
     }
@@ -778,6 +787,11 @@ sub format_rpmGroup {
     elsif ($mode eq 'text') {
 	return $rpmGroup="\nGroup       : $text";
     }
+    elsif ($mode eq 'make_rpm') {
+	return <<END;
+<group>Utilities/System</group>
+END
+    }
     else {
 	return '';
     }
@@ -803,9 +817,14 @@ sub format_rpmAutoReqProv {
     if ($mode eq 'html') {
 	return $rpmAutoReqProv="\nAutoReqProv : $text";
     }
-    if ($mode eq 'text') {
+    elsif ($mode eq 'text') {
 	return $rpmAutoReqProv="\nAutoReqProv : $text";
     }
+    elsif ($mode eq 'make_rpm') {
+	return <<END;
+<AutoReqProv>$text</AutoReqProv>
+END
+    }
     else {
 	return '';
     }
@@ -824,6 +843,13 @@ sub format_rpmdescription {
 	$text=~s/\\n/\n/g;
 	return $rpmdescription="\nDescription : $text";
     }
+    elsif ($mode eq 'make_rpm') {
+	$text=~s/\n//g;
+	$text=~s/\\n/\n/g;
+	return <<END;
+<description>$text</description>
+END
+    }
     else {
 	return '';
     }
@@ -836,10 +862,42 @@ sub format_rpmpre {
 #	return $rpmpre="\n<br />RPMPRE $text";
 	return '';
     }
+    elsif ($mode eq 'make_rpm') {
+	return <<END;
+<pre>$text</pre>
+END
+    }
     else {
 	return '';
     }
 }
+# -------------------------------------------------- Format requires section
+sub format_rpmRequires {
+    my @tokeninfo=@_;
+    my $aref;
+    my $text;
+    if ($mode eq 'make_rpm') {
+	while ($aref=$parser->get_token()) {
+	    if ($aref->[0] eq 'E' && $aref->[1] eq 'rpmRequires') {
+		last;
+	    }
+	    elsif ($aref->[0] eq 'S') {
+		$text.=$aref->[4];
+	    }
+	    elsif ($aref->[0] eq 'E') {
+		$text.=$aref->[2];
+	    }
+	    else {
+		$text.=$aref->[1];
+	    }
+	}
+    }
+    else {
+	$parser->get_tag('/rpmRequires');
+	return '';
+    }
+    return '<rpmRequires>'.$text.'</rpmRequires>';
+}
 # -------------------------------------------------- Format directories section
 sub format_directories {
     my $text=$parser->get_text('/directories');
@@ -864,7 +922,10 @@ sub format_directories {
     }
     elsif ($mode eq 'install') {
 	return "\n".'directories:'."\n".$text;
-   }
+    }
+    elsif ($mode eq 'rpm_file_list') {
+	return $text;
+    }
     else {
 	return '';
     }
@@ -887,7 +948,9 @@ 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}}}}}]'>".
@@ -901,6 +964,9 @@ sub format_directory {
 	return "\t".'install '.$categoryhash{$categoryname}.' -d '.
 	    $targetroot.'/'.$targetdir."\n";
     }
+    elsif ($mode eq 'rpm_file_list') {
+	return $targetroot.'/'.$targetdir."\n";
+    }
     else {
 	return '';
     }
@@ -980,8 +1046,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;
@@ -1017,6 +1089,9 @@ sub format_files {
 		$binfo."\n".
 		"alwaysrun:\n\n";
     }
+    elsif ($mode eq 'rpm_file_list') {
+	return $text;
+    }
     else {
 	return '';
     }
@@ -1049,19 +1124,12 @@ sub format_file {
     my $buildtest;
     $file_count++;
     $categorycount{$categoryname}++;
-    # START TEMP WAY
-#    if (-T "$sourcerootarg/$source") {
-#	$linecount{$categoryname}+=`wc -l $sourcerootarg/$source`;
-#    }
-#    my $bytesize=(-s "$sourcerootarg/$source");
-#    $bytecount{$categoryname}+=$bytesize;
-    # END TEMP WAY
     if ($source) {
 	$parser->get_tag('/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>".
@@ -1090,10 +1158,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
 		}
@@ -1161,7 +1229,8 @@ END
 		$logcmd.' && echo "'.
 		'Configuration source file does not exist '.
 		''.$sourceroot.'/'.$source.'"'.
-		"$logcmd); } && perl verifymodown.pl ${targetroot}/${target} \"$categoryhash{$categoryname}\"$logcmd;\n\n";
+	      "$logcmd); } && perl verifymodown.pl ${targetroot}/${target} \"".
+		"$categoryhash{$categoryname}\"$logcmd;\n\n";
 	}
 	elsif ($mode eq 'build' && $build) {
 	    push @buildall,$sourceroot.'/'.$source;
@@ -1170,6 +1239,17 @@ END
 		$dependencies;
 #	    return '# need to build '.$source.";
 	}
+        elsif ($mode eq 'rpm_file_list') {
+	    if ($categoryname eq 'doc') {
+		return $targetroot.'/'.$target.' # doc'."\n";
+	    }
+	    elsif ($categoryname eq 'conf') {
+		return $targetroot.'/'.$target.' # config'."\n";
+	    }
+	    else {
+		return $targetroot.'/'.$target."\n";
+	    }
+	}
 	else {
 	    return '';
 	}
@@ -1182,7 +1262,6 @@ sub format_link {
     $link=''; $linkto=''; $source=''; $target=''; $categoryname=''; 
     $description=''; $note=''; $build=''; $status=''; $dependencies='';
     my $text=&trim($parser->get_text('/link'));
-    my @links;
     if ($linkto) {
 	$parser->get_tag('/link');
 	if ($mode eq 'html') {
@@ -1192,7 +1271,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' ".
@@ -1223,11 +1302,20 @@ sub format_link {
 	elsif ($mode eq 'install') {
 	    my @targets=map {s/^\s*//;s/\s$//;$_} split(/\;/,$target);
 	    foreach my $tgt (@targets) {
-		push @links,"\t".'ln -fs /'.$linkto.' /'.$targetroot.$tgt.
+		push @links,"\t".'ln -fs /'.$linkto.' '.$targetroot.'/'.$tgt.
 		    "\n";
 	    }
+#	    return join('',@links);
 	    return '';
 	}
+	elsif ($mode eq 'rpm_file_list') {
+	    my @linklocs;
+	    my @targets=map {s/^\s*//;s/\s$//;$_} split(/\;/,$target);
+	    foreach my $tgt (@targets) {
+		push @linklocs,''.$targetroot.'/'.$tgt."\n";
+	    }
+	    return join('',@linklocs);
+	}
 	else {
 	    return '';
 	}
@@ -1247,23 +1335,11 @@ sub format_fileglob {
     my @semi=($filenames2=~/(\;)/g);
     $fileglobnames_count+=scalar(@semi)+1;
     $categorycount{$categoryname}+=scalar(@semi)+1;
-    # START TEMP WAY
-#    for my $f (split(/\;/,$filenames2)) {
-#	if (-T "$sourcerootarg/$sourcedir/$f") {
-#	    $linecount{$categoryname}+=`wc -l $sourcerootarg/$sourcedir/$f`;
-#	    open OUT,">>/tmp/junk123";
-#	    print OUT "$linecount{$categoryname} $categoryname $sourcerootarg/$sourcedir/$f\n";
-#	    close OUT;
-#	}
-#	my $bytesize=(-s "$sourcerootarg/$sourcedir/$f");
-#	$bytecount{$categoryname}+=$bytesize;
-#    }
-    # END TEMP WAY
     if ($sourcedir) {
 	$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>".
@@ -1294,6 +1370,16 @@ sub format_fileglob {
 		$sourceroot.'/'.$sourcedir.$eglob.' '.
 		$targetroot.'/'.$targetdir.'.'."\n";
 	}
+	elsif ($mode eq 'rpm_file_list') {
+	    my $eglob=$glob;
+	    if ($glob eq '*') {
+		$eglob='[^C][^V][^S]'.$glob;
+	    }
+	    my $targetdir2=$targetdir;$targetdir2=~s/\/$//;
+	    my @gfiles=map {s/^.*\///;"$targetroot/$targetdir2/$_\n"}
+	               glob("$sourceroot/$sourcedir/$eglob");
+	    return join('',@gfiles);
+	}
 	else {
 	    return '';
 	}
@@ -1369,6 +1455,7 @@ sub format_build {
     if ($text) {
 	$parser->get_tag('/build');
 	$build=$sourceroot.'/'.$text.';'.$tokeninfo[2]{'trigger'};
+	$build=~s/([^\\])\\\s+/$1/g; # allow for lines split onto new lines
     }
     return '';
 }
@@ -1427,6 +1514,16 @@ sub format_filenames {
     }
     return '';
 }
+# ----------------------------------------------- Format specialnotices section
+sub format_specialnotices {
+    $parser->get_tag('/specialnotices');
+    return '';
+}
+# ------------------------------------------------ Format specialnotice section
+sub format_specialnotice {
+    $parser->get_tag('/specialnotice');
+    return '';
+}
 # ------------------------------------------------------- Format linkto section
 sub format_linkto {
     my @tokeninfo=@_;