Use xsltproc instead of Xalan

See ukf/ukf-meta#159.
InCommon · Mar 22, 2018 · dd671fe · dd671fe
1 parent 1dbd1a0
commit dd671fe
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git 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
@@ -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";
 	$_ = <TXT>;
 	chop;
 	# print "$month: $_\n";

diff --git 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";