loncom/build/lpml_parse.pl - diff

Return to lpml_parse.pl CVS log

Up to [LON-CAPA] / loncom / build

Diff for /loncom/build/lpml_parse.pl between versions 1.23 and 1.30

version 1.23, 2001/11/29 15:01:04	version 1.30, 2001/12/12 23:20:47
Line 1	Line 1
#!/usr/bin/perl	#!/usr/bin/perl

# Scott Harrison	# The LearningOnline Network with CAPA
	# lpml_parse.pl - Linux Packaging Markup Language parser
	#
	# $Id$
	#
	# Written by Scott Harrison, harris41@msu.edu
	#
	# Copyright Michigan State University Board of Trustees
	#
	# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
	#
	# LON-CAPA is free software; you can redistribute it and/or modify
	# it under the terms of the GNU General Public License as published by
	# the Free Software Foundation; either version 2 of the License, or
	# (at your option) any later version.
	#
	# LON-CAPA is distributed in the hope that it will be useful,
	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	# GNU General Public License for more details.
	#
	# You should have received a copy of the GNU General Public License
	# along with LON-CAPA; if not, write to the Free Software
	# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	#
	# /home/httpd/html/adm/gpl.txt
	#
	# http://www.lon-capa.org/
	#
# YEAR=2001	# YEAR=2001
# May 2001	# May 2001
# 06/19/2001,06/20,06/24 - Scott Harrison	# 06/19/2001,06/20,06/24 - Scott Harrison
# 9/5/2001,9/6,9/7,9/8 - Scott Harrison	# 9/5/2001,9/6,9/7,9/8 - Scott Harrison
# 9/17,9/18 - Scott Harrison	# 9/17,9/18 - Scott Harrison
# 11/4,11/5,11/6,11/7,11/16,11/17 - 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
#	#
# $Id$
###	###

###############################################################################	###############################################################################
Line 49 Only the 1st argument is mandatory for t	Line 77 Only the 1st argument is mandatory for t
Example:	Example:

cat ../../doc/loncapafiles.lpml \|\\	cat ../../doc/loncapafiles.lpml \|\\
perl lpml_parse.pl html default /home/sherbert/loncapa /tmp/install	perl lpml_parse.pl html development default /home/sherbert/loncapa /tmp/install
END	END

# ------------------------------------------------- Grab command line arguments	# ------------------------------------------------- Grab command line arguments
Line 77 if (@ARGV) {	Line 105 if (@ARGV) {

my $targetroot;	my $targetroot;
my $sourceroot;	my $sourceroot;
	my $targetrootarg;
	my $sourcerootarg;
if (@ARGV) {	if (@ARGV) {
$sourceroot = shift @ARGV;	$sourceroot = shift @ARGV;
}	}
Line 85 if (@ARGV) {	Line 115 if (@ARGV) {
}	}
$sourceroot=~s/\/$//;	$sourceroot=~s/\/$//;
$targetroot=~s/\/$//;	$targetroot=~s/\/$//;
	$sourcerootarg=$sourceroot;
	$targetrootarg=$targetroot;

my $logcmd='\| tee -a WARNINGS';	my $logcmd='\| tee -a WARNINGS';

Line 193 $cleanstring=~s/\>\s\n\s\</\>\</g;	Line 225 $cleanstring=~s/\>\s\n\s\</\>\</g;
# storage variables	# storage variables
my $lpml;	my $lpml;
my $categories;	my $categories;
	my @categorynamelist;
my $category;	my $category;
my $category_att_name;	my $category_att_name;
my $category_att_type;	my $category_att_type;
my $chown;	my $chown;
my $chmod;	my $chmod;
	my $abbreviation; # space-free abbreviation; esp. for image names
my $rpm;	my $rpm;
my $rpmSummary;	my $rpmSummary;
my $rpmName;	my $rpmName;
Line 237 my $dependencies;	Line 271 my $dependencies;
my $dependency;	my $dependency;
my @links;	my @links;
my %categoryhash;	my %categoryhash;
	my $dpathlength;
	my %fab; # file category abbreviation
	my $directory_count;
	my $file_count;
	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 @buildall;
my @buildinfo;	my @buildinfo;
Line 250 $parser = HTML::TokeParser->new(\$cleans	Line 296 $parser = HTML::TokeParser->new(\$cleans
$parser->xml_mode('1');	$parser->xml_mode('1');

# Define handling methods for mode-dependent text rendering	# Define handling methods for mode-dependent text rendering

$parser->{textify}={	$parser->{textify}={
targetroot => \&format_targetroot,	targetroot => \&format_targetroot,
sourceroot => \&format_sourceroot,	sourceroot => \&format_sourceroot,
categories => \&format_categories,	categories => \&format_categories,
category => \&format_category,	category => \&format_category,
	abbreviation => \&format_abbreviation,
targetdir => \&format_targetdir,	targetdir => \&format_targetdir,
chown => \&format_chown,	chown => \&format_chown,
chmod => \&format_chmod,	chmod => \&format_chmod,
Line 317 exit;	Line 365 exit;
# ------------------------ Final output at end of markup parsing and formatting	# ------------------------ Final output at end of markup parsing and formatting
sub end {	sub end {
if ($mode eq 'html') {	if ($mode eq 'html') {
return "<br />THE END\n";	# START TEMP WAY
	# my $totallinecount;
	# my $totalbytecount;
	# map {$totallinecount+=$linecount{$_};
	# $totalbytecount+=$bytecount{$_}}
	# @categorynamelist;
	# END TEMP WAY
	return "<br /> <br />".
	"<a name='summary' /><font size='+2'>Summary of Source Repository".
	"</font>".
	"<br /> <br />".
	"<table border='1' cellpadding='5'>".
	"<caption>Files, Directories, and Symbolic Links</caption>".
	"<tr><td>Files (not referenced by globs)</td><td>$file_count</td>".
	"</tr>".
	"<tr><td>Files (referenced by globs)</td>".
	"<td>$fileglobnames_count</td>".
	"</tr>".
	"<tr><td>Total Files</td>".
	"<td>".($fileglobnames_count+$file_count)."</td>".
	"</tr>".
	"<tr><td>File globs</td>".
	"<td>".$fileglob_count."</td>".
	"</tr>".
	"<tr><td>Directories</td>".
	"<td>".$directory_count."</td>".
	"</tr>".
	"<tr><td>Symbolic links</td>".
	"<td>".$link_count."</td>".
	"</tr>".
	"</table>".
	"<table border='1' cellpadding='5'>".
	"<caption>File Category Count</caption>".
	"<tr><th>Icon</th><th>Name</th><th>Number of Occurrences</th>".
	join("\n",(map {"<tr><td><img src='$fab{$_}.gif' ".
	"alt='$_ icon' /></td>".
	"<td>$_</td><td>$categorycount{$_}</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 /> <br />".
	# "Total Lines of Code: $totallinecount".
	# "<br /> <br />".
	# "Total Bytes: $totalbytecount".
	# END TEMP WAY
}	}
if ($mode eq 'install') {	if ($mode eq 'install') {
return '';	return '';
Line 336 sub format_lpml {	Line 434 sub format_lpml {
my (@tokeninfo)=@_;	my (@tokeninfo)=@_;
my $date=`date`; chop $date;	my $date=`date`; chop $date;
if ($mode eq 'html') {	if ($mode eq 'html') {
$lpml = "<br /><font size='+2'>LPML Description Page (dist=$dist, ".	$lpml=<<END;
"$date)".	<html>
	<head>
	<title>LPML Description Page
	(dist=$dist, categorytype=$categorytype, $date)</title>
	</head>
	<body>
	END
	$lpml .= "<br /><font size='+2'>LPML Description Page (dist=$dist, ".
	"categorytype=$categorytype, $date)".
"</font>";	"</font>";
$lpml .=<<END;	$lpml .=<<END;
<ul>	<ul>
<li>About this file</li>	<li><a href='#about'>About this file</a></li>
<li>Software Package Description</li>	<li><a href='#ownperms'>File Type Ownership and Permissions
<li>Directory Structure</li>	Descriptions</a></li>
<li>File Type Ownership and Permissions</li>	<li><a href='#package'>Software Package Description</a></li>
<li>File and Directory Structure</li>	<li><a href='#directories'>Directory Structure</a></li>
	<li><a href='#files'>Files</a></li>
	<li><a href='#summary'>Summary of Source Repository</a></li>
</ul>	</ul>
END	END
$lpml .=<<END;	$lpml .=<<END;
	<br /> <br /><a name='about' />
<font size='+2'>About this file</font>	<font size='+2'>About this file</font>
<p>	<p>
This file is generated dynamically by <tt>lpml_parse.pl</tt> as	This file is generated dynamically by <tt>lpml_parse.pl</tt> as
part of a development compilation process. Author: Scott	part of a development compilation process.</p>
Harrison (harris41\@msu.edu).	<p>LPML written by Scott Harrison (harris41\@msu.edu).
</p>	</p>
END	END
}	}
Line 365 END	Line 474 END
* Software Package Description	* Software Package Description
* Directory Structure	* Directory Structure
* File Type Ownership and Permissions	* File Type Ownership and Permissions
* File and Directory Structure	* Files
END	END
$lpml .=<<END;	$lpml .=<<END;

Line 440 sub format_categories {	Line 549 sub format_categories {
my $text=&trim($parser->get_text('/categories'));	my $text=&trim($parser->get_text('/categories'));
$parser->get_tag('/categories');	$parser->get_tag('/categories');
if ($mode eq 'html') {	if ($mode eq 'html') {
return $categories="\n<br />BEGIN CATEGORIES\n$text\n".	return $categories="\n<br /> <br />".
"<br />END CATEGORIES\n";	"\n<a name='ownperms'>".
	"\n<font size='+2'>File Type Ownership and Permissions".
	" Descriptions</font>".
	"\n<p>This table shows what permissions and ownership settings ".
	"correspond to each category.</p>".
	"\n<table border='1' cellpadding='5' width='60%'>\n".
	"<tr>".
	"<th align='left' bgcolor='#ffffff'>Icon</th>".
	"<th align='left' bgcolor='#ffffff'>Category Name</th>".
	"<th align='left' bgcolor='#ffffff'>Permissions ".
	"($categorytype)</th>".
	"</tr>".
	"\n$text\n".
	"</table>\n";
	}
	elsif ($mode eq 'text') {
	return $categories="\n".
	"\nFile Type Ownership and Permissions".
	" Descriptions".
	"\n$text".
	"\n";
}	}
else {	else {
return '';	return '';
Line 452 sub format_category {	Line 581 sub format_category {
my (@tokeninfo)=@_;	my (@tokeninfo)=@_;
$category_att_name=$tokeninfo[2]->{'name'};	$category_att_name=$tokeninfo[2]->{'name'};
$category_att_type=$tokeninfo[2]->{'type'};	$category_att_type=$tokeninfo[2]->{'type'};
$chmod='';$chown='';	$abbreviation=''; $chmod='';$chown='';
$parser->get_text('/category');	$parser->get_text('/category');
$parser->get_tag('/category');	$parser->get_tag('/category');
	$fab{$category_att_name}=$abbreviation;
if ($mode eq 'html') {	if ($mode eq 'html') {
return $category="\n<br />CATEGORY $category_att_name ".	if ($category_att_type eq $categorytype) {
"$category_att_type $chmod $chown";	push @categorynamelist,$category_att_name;
	$categoryhash{$category_att_name}="$chmod $chown";
	return $category="<tr>".
	"<td><img src='$abbreviation.gif' ".
	"alt='${category_att_name}' /></td>\n".
	"<td>${category_att_name}</td>\n".
	"<td>$chmod $chown</td>\n".
	"</tr>".
	"\n";
	# return $category="\n<br />CATEGORY $category_att_name ".
	# "$category_att_type $chmod $chown";
	}
}	}
else {	else {
if ($category_att_type eq $categorytype) {	if ($category_att_type eq $categorytype) {
Line 468 sub format_category {	Line 609 sub format_category {
return '';	return '';
}	}
}	}
	# --------------------------------------------------- Format categories section
	sub format_abbreviation {
	my @tokeninfo=@_;
	$abbreviation='';
	my $text=&trim($parser->get_text('/abbreviation'));
	if ($text) {
	$parser->get_tag('/abbreviation');
	$abbreviation=$text;
	}
	return '';
	}
# -------------------------------------------------------- Format chown section	# -------------------------------------------------------- Format chown section
sub format_chown {	sub format_chown {
my @tokeninfo=@_;	my @tokeninfo=@_;
Line 496 sub format_rpm {	Line 648 sub format_rpm {
$parser->get_tag('/rpm');	$parser->get_tag('/rpm');
if ($mode eq 'html') {	if ($mode eq 'html') {
return $rpm=<<END;	return $rpm=<<END;
	<br /> <br />
	<a name='package' />
<font size='+2'>Software Package Description</font>	<font size='+2'>Software Package Description</font>
<p>	<p>
<table bgcolor='#ffffff' border='0' cellpadding='10' cellspacing='0'>	<table bgcolor='#ffffff' border='0' cellpadding='10' cellspacing='0'>
Line 535 sub format_rpmName {	Line 689 sub format_rpmName {
my $text=&trim($parser->get_text('/rpmName'));	my $text=&trim($parser->get_text('/rpmName'));
$parser->get_tag('/rpmName');	$parser->get_tag('/rpmName');
if ($mode eq 'html') {	if ($mode eq 'html') {
return $rpmName="\n<br />RPMNAME $text";	return $rpmName="\nName : $text";
	}
	elsif ($mode eq 'text') {
	return $rpmName="\nName : $text";
}	}
else {	else {
return '';	return '';
Line 546 sub format_rpmVersion {	Line 703 sub format_rpmVersion {
my $text=$parser->get_text('/rpmVersion');	my $text=$parser->get_text('/rpmVersion');
$parser->get_tag('/rpmVersion');	$parser->get_tag('/rpmVersion');
if ($mode eq 'html') {	if ($mode eq 'html') {
return $rpmVersion="\n<br />RPMVERSION $text";	return $rpmVersion="\nVersion : $text";
	}
	elsif ($mode eq 'text') {
	return $rpmVersion="\nVersion : $text";
}	}
else {	else {
return '';	return '';
Line 557 sub format_rpmRelease {	Line 717 sub format_rpmRelease {
my $text=$parser->get_text('/rpmRelease');	my $text=$parser->get_text('/rpmRelease');
$parser->get_tag('/rpmRelease');	$parser->get_tag('/rpmRelease');
if ($mode eq 'html') {	if ($mode eq 'html') {
return $rpmRelease="\n<br />RPMRELEASE $text";	return $rpmRelease="\nRelease : $text";
	}
	elsif ($mode eq 'text') {
	return $rpmRelease="\nRelease : $text";
}	}
else {	else {
return '';	return '';
Line 568 sub format_rpmVendor {	Line 731 sub format_rpmVendor {
my $text=$parser->get_text('/rpmVendor');	my $text=$parser->get_text('/rpmVendor');
$parser->get_tag('/rpmVendor');	$parser->get_tag('/rpmVendor');
if ($mode eq 'html') {	if ($mode eq 'html') {
return $rpmVendor="\n<br />RPMVENDOR $text";	return $rpmVendor="\nVendor : $text";
	}
	elsif ($mode eq 'text') {
	return $rpmVendor="\nVendor : $text";
}	}
else {	else {
return '';	return '';
Line 579 sub format_rpmBuildRoot {	Line 745 sub format_rpmBuildRoot {
my $text=$parser->get_text('/rpmBuildRoot');	my $text=$parser->get_text('/rpmBuildRoot');
$parser->get_tag('/rpmBuildRoot');	$parser->get_tag('/rpmBuildRoot');
if ($mode eq 'html') {	if ($mode eq 'html') {
return $rpmBuildRoot="\n<br />RPMBUILDROOT $text";	return $rpmBuildRoot="\nBuild Root : $text";
	}
	elsif ($mode eq 'text') {
	return $rpmBuildRoot="\nBuild Root : $text";
}	}
else {	else {
return '';	return '';
Line 590 sub format_rpmCopyright {	Line 759 sub format_rpmCopyright {
my $text=$parser->get_text('/rpmCopyright');	my $text=$parser->get_text('/rpmCopyright');
$parser->get_tag('/rpmCopyright');	$parser->get_tag('/rpmCopyright');
if ($mode eq 'html') {	if ($mode eq 'html') {
return $rpmCopyright="\n<br />RPMCOPYRIGHT $text";	return $rpmCopyright="\nLicense : $text";
	}
	elsif ($mode eq 'text') {
	return $rpmCopyright="\nLicense : $text";
}	}
else {	else {
return '';	return '';
Line 601 sub format_rpmGroup {	Line 773 sub format_rpmGroup {
my $text=$parser->get_text('/rpmGroup');	my $text=$parser->get_text('/rpmGroup');
$parser->get_tag('/rpmGroup');	$parser->get_tag('/rpmGroup');
if ($mode eq 'html') {	if ($mode eq 'html') {
return $rpmGroup="\n<br />RPMGROUP $text";	return $rpmGroup="\nGroup : $text";
	}
	elsif ($mode eq 'text') {
	return $rpmGroup="\nGroup : $text";
}	}
else {	else {
return '';	return '';
Line 612 sub format_rpmSource {	Line 787 sub format_rpmSource {
my $text=$parser->get_text('/rpmSource');	my $text=$parser->get_text('/rpmSource');
$parser->get_tag('/rpmSource');	$parser->get_tag('/rpmSource');
if ($mode eq 'html') {	if ($mode eq 'html') {
return $rpmSource="\n<br />RPMSOURCE $text";	return $rpmSource="\nSource : $text";
	}
	elsif ($mode eq 'text') {
	return $rpmSource="\nSource : $text";
}	}
else {	else {
return '';	return '';
Line 623 sub format_rpmAutoReqProv {	Line 801 sub format_rpmAutoReqProv {
my $text=$parser->get_text('/rpmAutoReqProv');	my $text=$parser->get_text('/rpmAutoReqProv');
$parser->get_tag('/rpmAutoReqProv');	$parser->get_tag('/rpmAutoReqProv');
if ($mode eq 'html') {	if ($mode eq 'html') {
return $rpmAutoReqProv="\n<br />RPMAUTOREQPROV $text";	return $rpmAutoReqProv="\nAutoReqProv : $text";
	}
	if ($mode eq 'text') {
	return $rpmAutoReqProv="\nAutoReqProv : $text";
}	}
else {	else {
return '';	return '';
Line 634 sub format_rpmdescription {	Line 815 sub format_rpmdescription {
my $text=$parser->get_text('/rpmdescription');	my $text=$parser->get_text('/rpmdescription');
$parser->get_tag('/rpmdescription');	$parser->get_tag('/rpmdescription');
if ($mode eq 'html') {	if ($mode eq 'html') {
return $rpmdescription="\n<br />RPMDESCRIPTION $text";	$text=~s/\n//g;
	$text=~s/\\n/\n/g;
	return $rpmdescription="\nDescription : $text";
	}
	elsif ($mode eq 'text') {
	$text=~s/\n//g;
	$text=~s/\\n/\n/g;
	return $rpmdescription="\nDescription : $text";
}	}
else {	else {
return '';	return '';
Line 645 sub format_rpmpre {	Line 833 sub format_rpmpre {
my $text=$parser->get_text('/rpmpre');	my $text=$parser->get_text('/rpmpre');
$parser->get_tag('/rpmpre');	$parser->get_tag('/rpmpre');
if ($mode eq 'html') {	if ($mode eq 'html') {
return $rpmpre="\n<br />RPMPRE $text";	# return $rpmpre="\n<br />RPMPRE $text";
	return '';
}	}
else {	else {
return '';	return '';
Line 656 sub format_directories {	Line 845 sub format_directories {
my $text=$parser->get_text('/directories');	my $text=$parser->get_text('/directories');
$parser->get_tag('/directories');	$parser->get_tag('/directories');
if ($mode eq 'html') {	if ($mode eq 'html') {
return $directories="\n<br />BEGIN DIRECTORIES\n$text\n<br />".	$text=~s/\[\{\{\{\{\{DPATHLENGTH\}\}\}\}\}\]/$dpathlength/g;
"END DIRECTORIES\n";	return $directories="\n<br /> <br />".
	"<a name='directories' />".
	"<font size='+2'>Directory Structure</font>".
	"\n<br /> <br />".
	"<table border='1' cellpadding='3' cellspacing='0'>\n".
	"<tr><th bgcolor='#ffffff'>Category</th>".
	"<th bgcolor='#ffffff'>Status</th>\n".
	"<th bgcolor='#ffffff'>Expected Permissions & Ownership</th>\n".
	"<th bgcolor='#ffffff' colspan='$dpathlength'>Target Directory ".
	"Path</th></tr>\n".
	"\n$text\n</table><br />"."\n";
	}
	elsif ($mode eq 'text') {
	return $directories="\nDirectory Structure\n$text\n".
	"\n";
}	}
elsif ($mode eq 'install') {	elsif ($mode eq 'install') {
return "\n".'directories:'."\n".$text;	return "\n".'directories:'."\n".$text;
Line 672 sub format_directory {	Line 875 sub format_directory {
$targetdir='';$categoryname='';$description='';	$targetdir='';$categoryname='';$description='';
$parser->get_text('/directory');	$parser->get_text('/directory');
$parser->get_tag('/directory');	$parser->get_tag('/directory');
	$directory_count++;
	$categorycount{$categoryname}++;
if ($mode eq 'html') {	if ($mode eq 'html') {
return $directory="\n<br />DIRECTORY $targetdir $categoryname ".	my @a;
	@a=($targetdir=~/\//g);
	my $d=scalar(@a)+1;
	$dpathlength=$d if $d>$dpathlength;
	my $thtml=$targetdir;
	$thtml=~s/\//\<\/td\>\<td bgcolor='#ffffff'\>/g;
	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} --> </td>".
	"<td rowspan='2' bgcolor='#ffffff'>$chmod<br />$chown</td>".
	"<td bgcolor='#ffffff'>$thtml</td></tr>".
	"<tr><td bgcolor='#ffffff' colspan='[{{{{{DPATHLENGTH}}}}}]'>".
	"$description</td></tr>";
	}
	if ($mode eq 'text') {
	return $directory="\nDIRECTORY $targetdir $categoryname ".
"$description";	"$description";
}	}
elsif ($mode eq 'install') {	elsif ($mode eq 'install') {
Line 722 sub format_files {	Line 943 sub format_files {
my $text=$parser->get_text('/files');	my $text=$parser->get_text('/files');
$parser->get_tag('/files');	$parser->get_tag('/files');
if ($mode eq 'html') {	if ($mode eq 'html') {
return $directories="\n<br />BEGIN FILES\n$text\n<br />END FILES\n";	return $directories="\n<br /> <br />".
	"<a name='files' />".
	"<font size='+2'>Files</font><br /> <br />".
	"<p>All source and target locations are relative to the ".
	"sourceroot and targetroot values at the beginning of this ".
	"document.</p>".
	"\n<table border='1' cellpadding='5'>".
	"<tr><th>Status</th><th colspan='2'>Category</th>".
	"<th>Name/Location</th>".
	"<th>Description</th><th>Notes</th></tr>".
	"$text</table>\n".
	"\n";
	}
	elsif ($mode eq 'text') {
	return $directories="\n".
	"File and Directory Structure".
	"\n$text\n".
	"\n";
}	}
elsif ($mode eq 'install') {	elsif ($mode eq 'install') {
return "\n".'files:'."\n".$text.	return "\n".'files:'."\n".$text.
Line 809 sub format_file {	Line 1047 sub format_file {
$note=''; $build=''; $status=''; $dependencies='';	$note=''; $build=''; $status=''; $dependencies='';
my $text=&trim($parser->get_text('/file'));	my $text=&trim($parser->get_text('/file'));
my $buildtest;	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) {	if ($source) {
$parser->get_tag('/file');	$parser->get_tag('/file');
if ($mode eq 'html') {	if ($mode eq 'html') {
return ($file="\n<br />BEGIN FILE\n".	return ($file="\n<!-- FILESORT:$target -->".
"$source $target $categoryname $description $note " .	"<tr>".
"$build $status $dependencies" .	"<td><!-- POSTEVAL verify.pl file '$sourcerootarg' ".
"\nEND FILE");	"'$targetrootarg' ".
	"'$source' '$target' ".
	"$categoryhash{$categoryname} --> </td><td>".
	"<img src='$fab{$categoryname}.gif' ".
	"alt='$categoryname icon' /></td>".
	"<td>$categoryname<br /><font size='-1'>".
	$categoryhash{$categoryname}."</font></td>".
	"<td>SOURCE: $source<br />TARGET: $target</td>".
	"<td>$description</td>".
	"<td>$note</td>".
	"</tr>");
	# return ($file="\n<br />BEGIN FILE\n".
	# "$source $target $categoryname $description $note " .
	# "$build $status $dependencies" .
	# "\nEND FILE");
}	}
elsif ($mode eq 'install' && $categoryname ne 'conf') {	elsif ($mode eq 'install' && $categoryname ne 'conf') {
if ($build) {	if ($build) {
Line 863 $buildtest \@if !(test -e "${sourceroot}	Line 1124 $buildtest \@if !(test -e "${sourceroot}
case "\$\$ECODE" in \\	case "\$\$ECODE" in \\
1) echo "${targetroot}/${target} is unchanged";; \\	1) echo "${targetroot}/${target} is unchanged";; \\
2) echo "** WARNING ** target file ${targetroot}/${target} is newer than CVS source; saving current (old) target file to ${targetroot}/${target}.lpmlsave and then overwriting"$logcmd && install -o www -g www -m 0600 ${targetroot}/${target} ${targetroot}/${target}.lpmlsave && install $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target};; \\	2) echo "** WARNING ** target file ${targetroot}/${target} is newer than CVS source; saving current (old) target file to ${targetroot}/${target}.lpmlsave and then overwriting"$logcmd && install -o www -g www -m 0600 ${targetroot}/${target} ${targetroot}/${target}.lpmlsave && install $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target};; \\
0) echo "install $categoryhash{$categorname} ${sourceroot}/${source} ${targetroot}/${target}" && install $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target};; \\	0) echo "install $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target}" && install $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target};; \\
esac; \\	esac; \\
perl verifymodown.pl ${targetroot}/${target} "$categoryhash{$categoryname}"$logcmd; \\	perl verifymodown.pl ${targetroot}/${target} "$categoryhash{$categoryname}"$logcmd; \\
fi	fi
END	END
# return "\t".'@test -e '.$sourceroot.'/'.$source.
# ' && perl filecompare.pl -b '.$sourceroot.'/'.$source.' '.
# $targetroot.'/'.$target.
# ' && install '.
# $categoryhash{$categoryname}.' '.
# $sourceroot.'/'.$source.' '.
# $targetroot.'/'.$target.
# ' \|\| echo "**** WARNING '.
# '**** CVS source file does not exist: '.$sourceroot.'/'.
# $source.'"'."\n";
}	}
elsif ($mode eq 'configinstall' && $categoryname eq 'conf') {	elsif ($mode eq 'configinstall' && $categoryname eq 'conf') {
push @configall,$targetroot.'/'.$target;	push @configall,$targetroot.'/'.$target;
Line 928 END	Line 1179 END
# --------------------------------------------------------- Format link section	# --------------------------------------------------------- Format link section
sub format_link {	sub format_link {
my @tokeninfo=@_;	my @tokeninfo=@_;
$link=''; $linkto=''; $target=''; $categoryname=''; $description='';	$link=''; $linkto=''; $source=''; $target=''; $categoryname='';
$note=''; $build=''; $status=''; $dependencies='';	$description=''; $note=''; $build=''; $status=''; $dependencies='';
my $text=&trim($parser->get_text('/link'));	my $text=&trim($parser->get_text('/link'));
	my @links;
if ($linkto) {	if ($linkto) {
$parser->get_tag('/link');	$parser->get_tag('/link');
if ($mode eq 'html') {	if ($mode eq 'html') {
return $link="\n<br />BEGIN LINK\n".	my @targets=map {s/^\s*//;s/\s$//;$_} split(/\;/,$target);
"$linkto $target $categoryname $description $note " .	$link_count+=scalar(@targets);
"$build $status $dependencies" .	foreach my $tgt (@targets) {
"\nEND LINK";	$categorycount{$categoryname}++;
	push @links,("\n<!-- FILESORT:$tgt -->".
	"<tr>".
	"<td><!-- POSTEVAL verify.pl link ".
	"'/$targetrootarg$linkto' '/$targetrootarg$tgt' ".
	"$categoryhash{$categoryname} --> </td><td>".
	"<img src='$fab{$categoryname}.gif' ".
	"alt='$categoryname icon' /></td>".
	"<td><font size='-1'>$categoryname</font></td>".
	"<td>LINKTO: $linkto<br />TARGET: $tgt</td>".
	"<td>$description</td>".
	"<td>$note</td>".
	"</tr>");
	# push @links,"\t".'ln -fs /'.$linkto.' /'.$targetroot.$tgt.
	# "\n";
	}
	return join('',@links);
	# return ($link="\n<!-- FILESORT:$target -->".
	# "<tr>".
	# "<td> </td><td><img src='$fab{$categoryname}.gif' ".
	# "alt='$categoryname icon' /></td>".
	# "<td>$categoryname</td>".
	# "<td>LINKTO: $linkto<br />TARGET: $target</td>".
	# "<td>$description</td>".
	# "<td>$note</td>".
	# "</tr>");
	# return $link="\n<tr><td colspan='6'>BEGIN LINK\n".
	# "$linkto $target $categoryname $description $note " .
	# "$build $status $dependencies" .
	# "\nEND LINK</td></tr>";
}	}
elsif ($mode eq 'install') {	elsif ($mode eq 'install') {
my @targets=map {s/^\s*//;s/\s$//;$_} split(/\;/,$target);	my @targets=map {s/^\s*//;s/\s$//;$_} split(/\;/,$target);
Line 961 sub format_fileglob {	Line 1242 sub format_fileglob {
$note=''; $build=''; $status=''; $dependencies='';	$note=''; $build=''; $status=''; $dependencies='';
$filenames='';	$filenames='';
my $text=&trim($parser->get_text('/fileglob'));	my $text=&trim($parser->get_text('/fileglob'));
	my $filenames2=$filenames;$filenames2=~s/\s//g;
	$fileglob_count++;
	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) {	if ($sourcedir) {
$parser->get_tag('/fileglob');	$parser->get_tag('/fileglob');
if ($mode eq 'html') {	if ($mode eq 'html') {
return $fileglob="\n<br />BEGIN FILEGLOB\n".	return $fileglob="\n<tr>".
"$glob sourcedir $targetdir $categoryname $description $note ".	"<td><!-- POSTEVAL verify.pl fileglob '$sourcerootarg' ".
"$build $status $dependencies $filenames" .	"'$targetrootarg' ".
"\nEND FILEGLOB";	"'$glob' '$sourcedir' '$filenames2' '$targetdir' ".
	"$categoryhash{$categoryname} --> </td>".
	"<td>"."<img src='$fab{$categoryname}.gif' ".
	"alt='$categoryname icon' /></td>".
	"<td>$categoryname<br />".
	"<font size='-1'>".$categoryhash{$categoryname}."</font></td>".
	"<td>SOURCEDIR: $sourcedir<br />".
	"TARGETDIR: $targetdir<br />".
	"GLOB: $glob<br />".
	"FILENAMES: $filenames".
	"</td>".
	"<td>$description</td>".
	"<td>$note</td>".
	"</tr>";
	# return $fileglob="\n<tr><td colspan='6'>BEGIN FILEGLOB\n".
	# "$glob sourcedir $targetdir $categoryname $description $note ".
	# "$build $status $dependencies $filenames" .
	# "\nEND FILEGLOB</td></tr>";
}	}
elsif ($mode eq 'install') {	elsif ($mode eq 'install') {
	my $eglob=$glob;
	if ($glob eq '*') {
	$eglob='[^C][^V][^S]'.$glob;
	}
return "\t".'install '.	return "\t".'install '.
$categoryhash{$categoryname}.' '.	$categoryhash{$categoryname}.' '.
$sourceroot.'/'.$sourcedir.'[^C][^V][^S]'.$glob.' '.	$sourceroot.'/'.$sourcedir.$eglob.' '.
$targetroot.'/'.$targetdir.'.'."\n";	$targetroot.'/'.$targetdir.'.'."\n";
}	}
else {	else {
Line 1018 sub format_source {	Line 1337 sub format_source {
sub format_note {	sub format_note {
my @tokeninfo=@_;	my @tokeninfo=@_;
$note='';	$note='';
my $text=&trim($parser->get_text('/note'));	# my $text=&trim($parser->get_text('/note'));
	my $aref;
	my $text;
	while ($aref=$parser->get_token()) {
	if ($aref->[0] eq 'E' && $aref->[1] eq 'note') {
	last;
	}
	elsif ($aref->[0] eq 'S') {
	$text.=$aref->[4];
	}
	elsif ($aref->[0] eq 'E') {
	$text.=$aref->[2];
	}
	else {
	$text.=$aref->[1];
	}
	}
if ($text) {	if ($text) {
$parser->get_tag('/note');	# $parser->get_tag('/note');
$note=$text;	$note=$text;
}	}
return '';	return '';

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.23
changed lines
	Added in v.1.30