fixing xslt

archivesspace-labs · Aug 4, 2015 · 6a34256 · 6a34256
1 parent 5e65466
commit 6a34256
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/ead2pdf.jar b/ead2pdf.jar
diff --git 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!('<xsl:include href="as-helper-functions.xsl"/>', "<xsl:include href='#{File.join(File.dirname(__FILE__), '../lib', 'as-helper-functions.xsl')}'/>" ) 
+
+   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