diff --git a/charting/mdui.pl b/charting/mdui.pl index fb2a6bfd..9f0e7791 100755 --- a/charting/mdui.pl +++ b/charting/mdui.pl @@ -4,8 +4,7 @@ # mdui.pl # use warnings; -use lib "../build"; -use Xalan; +use lib '.'; use Months; # Parse command line arguments @@ -29,7 +28,7 @@ foreach $month (@months) { print "Processing $month\n"; - my $command = xalanCall . " -IN cache/$month.xml -XSL statistics_mdui.xsl"; + my $command = "xsltproc statistics_mdui.xsl cache/$month.xml"; # print "command is $command\n"; system($command); # || print "ignoring claimed failure in sub command\n"; # print "Xalan run on $fn\n"; diff --git a/charting/saml2.pl b/charting/saml2.pl index fd790429..0542f210 100755 --- a/charting/saml2.pl +++ b/charting/saml2.pl @@ -6,8 +6,7 @@ # Extracts statistics about SAML 2 adoption from the published metadata. # use warnings; -use lib "../build"; -use Xalan; +use lib "."; use Months; # Parse command line arguments @@ -25,7 +24,7 @@ # ingest files foreach $month (@months) { my $fn = "cache/$month.xml"; - open(TXT, xalanCall . " -IN $fn -XSL saml2.xsl|") || die "could not open input file"; + open(TXT, "xsltproc saml2.xsl $fn|") || die "could not open input file"; $_ = ; chop; # print "$month: $_\n"; diff --git a/charting/sizes.pl b/charting/sizes.pl index 004c6e3f..2fc857b7 100755 --- a/charting/sizes.pl +++ b/charting/sizes.pl @@ -4,9 +4,8 @@ # sizes.pl # use warnings; -use lib "../build"; +use lib "."; use File::stat; -use Xalan; use Months; # Parse command line arguments @@ -47,7 +46,7 @@ # Now generate a reduced version of the archived # file that contains only UK federation registered entities. # - my $command = xalanCall . " -IN $fn -XSL just_ours.xsl -OUT temp.tmp"; + my $command = "xsltproc --output temp.tmp just_ours.xsl $fn"; # print "command is $command\n"; system($command); # || print "ignoring claimed failure in sub command\n"; # print "Xalan run on $fn\n";