Artikelsuche: Suche nach in Erzeugnis verbauten Artikeln

[mfinanz.git] / SL / Helper / CreatePDF.pm

diff --git a/SL/Helper/CreatePDF.pm b/SL/Helper/CreatePDF.pm
index c5c02e2cab98a8573b4c43a3048b80bc30b90e23..6a570fa92226e005335ddb4c9d9b105f53cc8ad4 100644 (file)
--- a/SL/Helper/CreatePDF.pm
+++ b/SL/Helper/CreatePDF.pm
@@ -17,6 +17,7 @@ use SL::Common;
 use SL::DB::Language;
 use SL::DB::Printer;
 use SL::MoreCommon;
 use SL::DB::Language;
 use SL::DB::Printer;
 use SL::MoreCommon;

+use SL::System::Process;

 use SL::Template;
 use SL::Template::LaTeX;
 
 use SL::Template;
 use SL::Template::LaTeX;
 


@@ -39,15 +40,22 @@ sub create_pdf {
 sub create_parsed_file {
   my ($class, %params) = @_;
 
 sub create_parsed_file {
   my ($class, %params) = @_;
 

-  my $userspath      = $::lx_office_conf{paths}->{userspath};
+  my $keep_temp_files = $::lx_office_conf{debug} && $::lx_office_conf{debug}->{keep_temp_files};
+  my $userspath       = SL::System::Process::exe_dir() . "/" . $::lx_office_conf{paths}->{userspath};
+  my $temp_dir        = File::Temp->newdir(
+    "kivitendo-print-XXXXXX",
+    DIR     => $userspath,
+    CLEANUP => !$keep_temp_files,
+  );
+

   my $vars           = $params{variables} || {};
   my $form           = Form->new('');
   $form->{$_}        = $vars->{$_} for keys %{$vars};
   $form->{format}    = lc($params{format} || 'pdf');
   my $vars           = $params{variables} || {};
   my $form           = Form->new('');
   $form->{$_}        = $vars->{$_} for keys %{$vars};
   $form->{format}    = lc($params{format} || 'pdf');

-  $form->{cwd}       = getcwd();
+  $form->{cwd}       = SL::System::Process::exe_dir();

   $form->{templates} = $::instance_conf->get_templates;
   $form->{IN}        = $params{template};
   $form->{templates} = $::instance_conf->get_templates;
   $form->{IN}        = $params{template};

-  $form->{tmpdir}    = $form->{cwd} . '/' . $userspath;
+  $form->{tmpdir}    = $temp_dir->dirname;

   my $tmpdir         = $form->{tmpdir};
   my ($suffix)       = $params{template} =~ m{\.(.+)};
 
   my $tmpdir         = $form->{tmpdir};
   my ($suffix)       = $params{template} =~ m{\.(.+)};
 


@@ -55,7 +63,7 @@ sub create_parsed_file {
     'kivitendo-printXXXXXX',
     SUFFIX => ".${suffix}",
     DIR    => $form->{tmpdir},
     'kivitendo-printXXXXXX',
     SUFFIX => ".${suffix}",
     DIR    => $form->{tmpdir},

-    UNLINK => $::lx_office_conf{debug} && $::lx_office_conf{debug}->{keep_temp_files},
+    UNLINK => !$keep_temp_files,

   );
 
   $form->{tmpfile} = $tmpfile;
   );
 
   $form->{tmpfile} = $tmpfile;


@@ -87,7 +95,7 @@ sub create_parsed_file {
   my ($volume, $directory, $file_name) = File::Spec->splitpath($form->{tmpfile});
   my $full_file_name                   = File::Spec->catfile($tmpdir, $file_name);
   if (($params{return} || 'content') eq 'file_name') {
   my ($volume, $directory, $file_name) = File::Spec->splitpath($form->{tmpfile});
   my $full_file_name                   = File::Spec->catfile($tmpdir, $file_name);
   if (($params{return} || 'content') eq 'file_name') {

-    my $new_name = File::Spec->catfile($tmpdir, 'keep-' . $form->{tmpfile});
+    my $new_name = File::Spec->catfile($userspath, 'keep-' . $form->{tmpfile});

     rename $full_file_name, $new_name;
 
     $form->cleanup;
     rename $full_file_name, $new_name;
 
     $form->cleanup;


@@ -144,7 +152,7 @@ sub merge_pdfs {
     'kivitendo-printXXXXXX',
     SUFFIX => '.pdf',
     DIR    => $::lx_office_conf{paths}->{userspath},
     'kivitendo-printXXXXXX',
     SUFFIX => '.pdf',
     DIR    => $::lx_office_conf{paths}->{userspath},

-    UNLINK => $::lx_office_conf{debug} && $::lx_office_conf{debug}->{keep_temp_files},
+    UNLINK => ($::lx_office_conf{debug} && $::lx_office_conf{debug}->{keep_temp_files})? 0 : 1,

   );
   close $temp_fh;
 
   );
   close $temp_fh;
 


@@ -163,7 +171,7 @@ sub merge_pdfs {
       'kivitendo-contentXXXXXX',
       SUFFIX => '.pdf',
       DIR    => $::lx_office_conf{paths}->{userspath},
       'kivitendo-contentXXXXXX',
       SUFFIX => '.pdf',
       DIR    => $::lx_office_conf{paths}->{userspath},

-      UNLINK => $::lx_office_conf{debug} && $::lx_office_conf{debug}->{keep_temp_files},
+      UNLINK => ($::lx_office_conf{debug} && $::lx_office_conf{debug}->{keep_temp_files})? 0 : 1,

     );
     binmode $temp_fh;
     print $temp_fh $params{inp_content};
     );
     binmode $temp_fh;
     print $temp_fh $params{inp_content};