diff --git a/ead2pdf.jar b/ead2pdf.jar index da12ec8..3f1a728 100644 Binary files a/ead2pdf.jar and b/ead2pdf.jar differ diff --git a/lib/AS_fop.rb b/lib/AS_fop.rb index 7e95203..1f97f0e 100644 --- a/lib/AS_fop.rb +++ b/lib/AS_fop.rb @@ -23,17 +23,21 @@ class ASFop attr_accessor :source attr_accessor :xslt - def initialize(source, output= nil, xslt = File.join( File.dirname(__FILE__), '../lib' ,'as-ead-pdf.xsl') ) - abort("#{source} not found") unless File.exists?(source) + def initialize(source, output= nil, xslt = nil ) + abort("#{source} not found") unless File.exists?(source) puts source puts output @source = source @xml = IO.read(source) @output = output.nil? ? "#{source}.pdf" : output - file =File.join( File.dirname(__FILE__), '../lib' ,'as-ead-pdf.xsl').gsub("\\", "/" ) - @xslt = File.read( xslt, system_id: file ) - # WHAT A HACK! but you can't pass in a URI as a variable? jeezus. - # @xslt.gsub!('', "" ) + + if xslt.nil? + file =File.join( File.dirname(__FILE__), '../lib' ,'as-ead-pdf.xsl').gsub("\\", "/" ) + @xslt = File.read( file, system_id: file ) + else + @xslt = File.read( xslt ) + end + end