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 -N -r1.4.2.1 -r1.4.2.2 --- openacs-4/packages/acs-tcl/tcl/pdf-procs.tcl 6 Sep 2019 15:58:06 -0000 1.4.2.1 +++ openacs-4/packages/acs-tcl/tcl/pdf-procs.tcl 6 Sep 2019 16:00:31 -0000 1.4.2.2 @@ -21,11 +21,11 @@ @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 } { @@ -41,14 +41,14 @@ 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 Error "Error during conversion from html to pdf: $err" + ns_log Error "Error during conversion from html to pdf: $err" } file delete -- $tmp_html_filename if {[file exists $tmp_pdf_filename]} { - return $tmp_pdf_filename + return $tmp_pdf_filename } else { - return "" + return "" } } @@ -57,7 +57,7 @@ {-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 } { @@ -71,12 +71,12 @@ 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 Error "Error during conversion from html to pdf: $err" + ns_log Error "Error during conversion from html to pdf: $err" } if {[file exists $tmp_pdf_filename]} { - return $tmp_pdf_filename + return $tmp_pdf_filename } else { - return "" + return "" } } @@ -87,15 +87,15 @@ {-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 item_id [cr_import_content -title $title -description $description $folder_id $pdf_file $file_size application/pdf $title] @@ -118,7 +118,7 @@ } { {*}$set_var_call - + # retrieve template and write to tmpfile # set content [content::get_content_value $template_id] set file [open $filename]