Index: openacs-4/packages/acs-tcl/tcl/pdf-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/pdf-procs.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-tcl/tcl/pdf-procs.tcl	7 Aug 2017 23:47:59 -0000	1.4
+++ openacs-4/packages/acs-tcl/tcl/pdf-procs.tcl	3 Sep 2024 15:37:34 -0000	1.5
@@ -21,63 +21,55 @@
     @creation-date 2005-07-07
 
     @param template_id The template to use for the preview. It is \
-	assumed that the template_id is the same as the revision_id to \
-	be used for the template.
+    assumed that the template_id is the same as the revision_id to \
+    be used for the template.
 
     @param set_var_call procedure-name which sets the variables used
-								    
+
     @return the pdf-file-name
 } {
-
-    set tmp_filename [ad_tmpnam]
     # create html.file
     set html_content [create_html_content -template_id $template_id -set_var_call $set_var_call]
-    set tmp_html_filename "${tmp_filename}.html"
-    set fp [open $tmp_html_filename w]
-    puts $fp $html_content
-    close $fp
 
-    # create pdf-file
-    set tmp_pdf_filename "${tmp_filename}.pdf"
-    set htmldoc_bin [parameter::get -parameter "HtmlDocBin" -default "/usr/bin/htmldoc"]
-    if {[catch {exec $htmldoc_bin --webpage --quiet -t pdf -f $tmp_pdf_filename $tmp_html_filename} err]} {
-	ns_log Notice "Error during conversion from html to pdf: $err"
-    }
-    file delete -- $tmp_html_filename
-
-    if {[file exists $tmp_pdf_filename]} {
-	return $tmp_pdf_filename
-    } else {
-	return ""
-    }
+    return [text_templates::create_pdf_from_html $html_content]
 }
 
 
 ad_proc -public text_templates::create_pdf_from_html {
     {-html_content:required}
 } {
     The HTML Content is transformed into a PDF file
-    
+
     @param html_content HTML Content that is transformed into PDF
     @return filename of the pdf file
 } {
-    set tmp_filename [ad_tmpnam]
-    set tmp_html_filename "${tmp_filename}.html"
-    set fp [open $tmp_html_filename w]
-    puts $fp $html_content
-    close $fp
 
-    # create pdf-file
-    set tmp_pdf_filename "${tmp_filename}.pdf"
-    set htmldoc_bin [parameter::get -parameter "HtmlDocBin" -default "/usr/bin/htmldoc"]
-    if {[catch {exec $htmldoc_bin --webpage --quiet -t pdf -f $tmp_pdf_filename $tmp_html_filename} err]} {
-	ns_log Notice "Error during conversion from html to pdf: $err"
+    set progname [parameter::get -parameter "HtmlDocBin" -default "htmldoc"]
+    set htmldoc_bin [::util::which $progname]
+    if {$htmldoc_bin eq ""} {
+        error "text_templates::create_pdf_from_html: HTML converter 'progname' not found"
     }
-    if {[file exists $tmp_pdf_filename]} {
-	return $tmp_pdf_filename
-    } else {
-	return ""
+
+    ad_try {
+        set fp [file tempfile tmp_html_filename [ad_tmpdir]/pdf-XXXXXX.html]
+        puts $fp $html_content
+        close $fp
+
+        # create pdf-file
+        set tmp_pdf_filename "${tmp_html_filename}.pdf"
+        exec $htmldoc_bin --webpage --quiet -t pdf -f $tmp_pdf_filename $tmp_html_filename
+
+        # return the result file command was successful
+        if {[ad_file exists $tmp_pdf_filename]} {
+            return $tmp_pdf_filename
+        }
+
+    } on error {errorMsg} {
+        ns_log Error "Error during conversion from html to pdf: $errorMsg"
+    } finally {
+        file delete -- $tmp_html_filename
     }
+    return ""
 }
 
 ad_proc -public text_templates::store_final_document {
@@ -87,17 +79,17 @@
     {-description:required}
 } {
     The document is stored in the given folder.
-    
+
     @author Christian Langmann (C_Langmann@gmx.de)
     @creation-date 2005-07-07
     @param pdf_file the pdf-file to save
     @param folder_id the folder the document is stored in
     @param title Title or name of the document
     @param description Description of the document
     @return item_id
-    
+
 } {
-    set file_size [file size $pdf_file]
+    set file_size [ad_file size $pdf_file]
     set item_id [cr_import_content -title $title -description $description $folder_id $pdf_file $file_size application/pdf $title]
     return $item_id
 }
@@ -118,7 +110,7 @@
 } {
 
     {*}$set_var_call
-    
+
     # retrieve template and write to tmpfile
     # set content [content::get_content_value $template_id]
     set file [open $filename]