--- loncom/build/lpml_parse.pl 2001/12/13 23:41:26 1.31
+++ 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.31 2001/12/13 23:41:26 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,12/13 - 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;
@@ -321,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,
@@ -367,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 "
".
"Summary of Source Repository".
"".
@@ -401,23 +392,16 @@ sub end {
"
Icon | Name | Number of Occurrences | ". + "Number of Incorrect Counts | ". + "
---|---|---|---|
". - " | $_ | $categorycount{$_} | $_ | $categorycount{$_} | ". + ""} @categorynamelist)). " |