Filemanagement: DEBUG2 herausgenommen

diff --git a/SL/Controller/File.pm b/SL/Controller/File.pm
index ee41dd3c86e10c29c373af96452f0142baf9f21d..1b2c0285e011fc68a47f9090837f8340fbca6610 100644 (file)
--- a/SL/Controller/File.pm
+++ b/SL/Controller/File.pm
@@ -140,11 +140,8 @@ sub action_ajax_rename {
     $self->js->flash('error',$::locale->text('File not exists !'))->render();
     return;
   }
     $self->js->flash('error',$::locale->text('File not exists !'))->render();
     return;
   }

-  $main::lxdebug->message(LXDebug->DEBUG2(), "object_id=".$file->object_id." object_type=".$file->object_type." dbfile=".$file);

   my $sessionfile = $::form->{sessionfile};
   my $sessionfile = $::form->{sessionfile};

-      $main::lxdebug->message(LXDebug->DEBUG2(), "sessionfile=".$sessionfile);

   if ( $sessionfile && -f $sessionfile ) {
   if ( $sessionfile && -f $sessionfile ) {

-     $main::lxdebug->message(LXDebug->DEBUG2(), "file=".$file->file_name." to=".$::form->{to}." sessionfile=".$sessionfile);

     # new uploaded file
     if ( $::form->{to} eq $file->file_name ) {
       # no rename so use as new version
     # new uploaded file
     if ( $::form->{to} eq $file->file_name ) {
       # no rename so use as new version


@@ -177,7 +174,6 @@ sub action_ajax_rename {
 
     eval {
       $res = $file->rename($::form->{to});
 
     eval {
       $res = $file->rename($::form->{to});

-      $main::lxdebug->message(LXDebug->DEBUG2(), "rename result=".$res);

       1;
     } or do {
       $self->js->flash(       'error', t8('internal error (see details)'))
       1;
     } or do {
       $self->js->flash(       'error', t8('internal error (see details)'))


@@ -222,14 +218,12 @@ sub action_ajax_files_uploaded {
   my ($self) = @_;
 
   my $source = 'uploaded';
   my ($self) = @_;
 
   my $source = 'uploaded';

-  $main::lxdebug->message(LXDebug->DEBUG2(), "file_upload UPLOAD=".$::form->{ATTACHMENTS}->{uploadfiles});

   my @existing;
   if ( $::form->{ATTACHMENTS}->{uploadfiles} ) {
     my @upfiles = @{ $::form->{ATTACHMENTS}->{uploadfiles} };
     foreach my $idx (0 .. scalar(@upfiles) - 1) {
       eval {
         my $fname = uri_unescape($upfiles[$idx]->{filename});
   my @existing;
   if ( $::form->{ATTACHMENTS}->{uploadfiles} ) {
     my @upfiles = @{ $::form->{ATTACHMENTS}->{uploadfiles} };
     foreach my $idx (0 .. scalar(@upfiles) - 1) {
       eval {
         my $fname = uri_unescape($upfiles[$idx]->{filename});

-        $main::lxdebug->message(LXDebug->DEBUG2(), "file_upload name=".$fname);

         ## normalize and find basename
         # first split with unix rules
         # after that split with windows rules
         ## normalize and find basename
         # first split with unix rules
         # after that split with windows rules


@@ -250,7 +244,6 @@ sub action_ajax_files_uploaded {
           $mime_type = File::MimeInfo::Magic::mimetype($basefile);
           $mime_type = 'application/octet-stream' if $mime_type eq 'application/pdf' || !$mime_type;
         }
           $mime_type = File::MimeInfo::Magic::mimetype($basefile);
           $mime_type = 'application/octet-stream' if $mime_type eq 'application/pdf' || !$mime_type;
         }

-        $main::lxdebug->message(LXDebug->DEBUG2(), "mime_type=".$mime_type);

         if ( $self->file_type eq 'image' && $self->file_probe_image_type($mime_type, $basefile)) {
           next;
         }
         if ( $self->file_type eq 'image' && $self->file_probe_image_type($mime_type, $basefile)) {
           next;
         }


@@ -262,9 +255,7 @@ sub action_ajax_files_uploaded {
                                         file_name     => $basefile,
                                       );
 
                                         file_name     => $basefile,
                                       );
 

-        $main::lxdebug->message(LXDebug->DEBUG2(), "store1 exist=".$existobj);

         if ($existobj) {
         if ($existobj) {

-  $main::lxdebug->message(LXDebug->DEBUG2(), "id=".$existobj->id." sessionfile=". $sfile->file_name);

           push @existing, $existobj->id.'_'.$sfile->file_name;
         } else {
           my $fileobj = SL::File->save(object_id     => $self->object_id,
           push @existing, $existobj->id.'_'.$sfile->file_name;
         } else {
           my $fileobj = SL::File->save(object_id     => $self->object_id,


@@ -277,7 +268,6 @@ sub action_ajax_files_uploaded {
                                        #file_contents => ${$upfiles[$idx]->{data}},
                                        file_path     => $sfile->file_name
                                      );
                                        #file_contents => ${$upfiles[$idx]->{data}},
                                        file_path     => $sfile->file_name
                                      );

-          $main::lxdebug->message(LXDebug->DEBUG2(), "obj=".$fileobj);

           unlink($sfile->file_name);
         }
         1;
           unlink($sfile->file_name);
         }
         1;


@@ -338,7 +328,6 @@ sub check_object_params {
   $self->object_id($id);
   $self->object_model($file_types{$type}->{model});
   $self->object_right($file_types{$type}->{right});
   $self->object_id($id);
   $self->object_model($file_types{$type}->{model});
   $self->object_right($file_types{$type}->{right});

-  $main::lxdebug->message(LXDebug->DEBUG2(), "checked: object_id=".$self->object_id." object_type=".$self->object_type." is_global=".$self->is_global);

 
  # $::auth->assert($self->object_right);
 
 
  # $::auth->assert($self->object_right);
 


@@ -371,7 +360,6 @@ sub _delete_all {
 sub _do_list {
   my ($self,$json) = @_;
   my @files;
 sub _do_list {
   my ($self,$json) = @_;
   my @files;

-  $main::lxdebug->message(LXDebug->DEBUG2(), "do_list: object_id=".$self->object_id." object_type=".$self->object_type." file_type=".$self->file_type." json=".$json);

   if ( $self->file_type eq 'document' ) {
     my @object_types;
     push @object_types, $self->object_type;
   if ( $self->file_type eq 'document' ) {
     my @object_types;
     push @object_types, $self->object_type;


@@ -380,13 +368,11 @@ sub _do_list {
                                           object_type => \@object_types,
                                           file_type   => $self->file_type  );
 
                                           object_type => \@object_types,
                                           file_type   => $self->file_type  );
 

-    $main::lxdebug->message(LXDebug->DEBUG2(), "cnt1=".scalar(@files));

   }
   elsif ( $self->file_type eq 'attachment' ||  $self->file_type eq 'image' ) {
     @files   = SL::File->get_all(object_id   => $self->object_id  ,
                                  object_type => $self->object_type,
                                  file_type   => $self->file_type  );
   }
   elsif ( $self->file_type eq 'attachment' ||  $self->file_type eq 'image' ) {
     @files   = SL::File->get_all(object_id   => $self->object_id  ,
                                  object_type => $self->object_type,
                                  file_type   => $self->file_type  );

-    $main::lxdebug->message(LXDebug->DEBUG2(), "cnt2=".scalar(@files));

   }
   $self->files(\@files);
   $self->_mk_render('file/list',1,0,$json);
   }
   $self->files(\@files);
   $self->_mk_render('file/list',1,0,$json);


@@ -396,7 +382,6 @@ sub _get_from_import {
   my ($self,$path) = @_;
   my @foundfiles ;
 
   my ($self,$path) = @_;
   my @foundfiles ;
 

-  $main::lxdebug->message(LXDebug->DEBUG2(), "import path=".$path);

   my $language = $::lx_office_conf{system}->{language};
   my $timezone = $::locale->get_local_time_zone()->name;
   if (opendir my $dir, $path) {
   my $language = $::lx_office_conf{system}->{language};
   my $timezone = $::locale->get_local_time_zone()->name;
   if (opendir my $dir, $path) {


@@ -404,12 +389,10 @@ sub _get_from_import {
     foreach my $file ( @files) {
       next if (($file eq '.') || ($file eq '..'));
       $file = Encode::decode('utf-8', $file);
     foreach my $file ( @files) {
       next if (($file eq '.') || ($file eq '..'));
       $file = Encode::decode('utf-8', $file);

-      $main::lxdebug->message(LXDebug->DEBUG2(), "file=".$file);

 
       next if( -d "$path/$file");
 
       my $tmppath = File::Spec->catfile( $path, $file );
 
       next if( -d "$path/$file");
 
       my $tmppath = File::Spec->catfile( $path, $file );

-      $main::lxdebug->message(LXDebug->DEBUG2(), "tmppath=".$tmppath." file=".$file);

       next if( ! -f $tmppath);
 
       my $st = stat($tmppath);
       next if( ! -f $tmppath);
 
       my $st = stat($tmppath);


@@ -425,7 +408,6 @@ sub _get_from_import {
 
     }
   }
 
     }
   }

-  $main::lxdebug->message(LXDebug->DEBUG2(), "return ".scalar(@foundfiles)." files");

   return @foundfiles;
 }
 
   return @foundfiles;
 }
 


@@ -436,11 +418,8 @@ sub _mk_render {
     ##TODO  here a configurable code must be implemented
 
     my $title;
     ##TODO  here a configurable code must be implemented
 
     my $title;

-    $main::lxdebug->message(LXDebug->DEBUG2(), "mk_render: object_id=".$self->object_id." object_type=".$self->object_type.
-                              " file_type=".$self->file_type." json=".$json." filecount=".scalar(@{ $self->files })." is_global=".$self->is_global);

     my @sources = $self->_get_sources();
     foreach my $source ( @sources ) {
     my @sources = $self->_get_sources();
     foreach my $source ( @sources ) {

-      $main::lxdebug->message(LXDebug->DEBUG2(), "mk_render: source name=".$source->{name});

       @{$source->{files}} = grep { $_->source eq $source->{name}} @{ $self->files };
     }
     if ( $self->file_type eq 'document' ) {
       @{$source->{files}} = grep { $_->source eq $source->{name}} @{ $self->files };
     }
     if ( $self->file_type eq 'document' ) {


@@ -467,7 +446,6 @@ sub _mk_render {
       if ( $self->existing && scalar(@{$self->existing}) > 0) {
         my $first = shift @{$self->existing};
         my ($first_id,$sfile) = split('_',$first,2);
       if ( $self->existing && scalar(@{$self->existing}) > 0) {
         my $first = shift @{$self->existing};
         my ($first_id,$sfile) = split('_',$first,2);

-        #$main::lxdebug->message(LXDebug->DEBUG2(), "id=".$first_id." sessionfile=". $sfile);

         my $file = SL::File->get(id => $first_id );
         $self->js->run('kivi.File.askForRename',$first_id,$file->file_name,$sfile,join (',', @{$self->existing}), $self->is_global);
       }
         my $file = SL::File->get(id => $first_id );
         $self->js->run('kivi.File.askForRename',$first_id,$file->file_name,$sfile,join (',', @{$self->existing}), $self->is_global);
       }


@@ -490,7 +468,6 @@ sub _mk_render {
 sub _get_sources {
   my ($self) = @_;
   my @sources;
 sub _get_sources {
   my ($self) = @_;
   my @sources;

-  $main::lxdebug->message(LXDebug->DEBUG2(), "get_sources file_type=". $self->file_type);

   if ( $self->file_type eq 'document' ) {
     ##TODO statt gen neue attribute in filetypes :
     if (($file_types{$self->object_type}->{gen}*1 & 1)==1) {
   if ( $self->file_type eq 'document' ) {
     ##TODO statt gen neue attribute in filetypes :
     if (($file_types{$self->object_type}->{gen}*1 & 1)==1) {


@@ -510,7 +487,6 @@ sub _get_sources {
     }
     if (($file_types{$self->object_type}->{gen}*1 & 2)==2) {
       my @others =  SL::File->get_other_sources();
     }
     if (($file_types{$self->object_type}->{gen}*1 & 2)==2) {
       my @others =  SL::File->get_other_sources();

-      $main::lxdebug->message(LXDebug->DEBUG2(), "other cnt=". scalar(@others));

       foreach my $scanner_or_mailrx (@others) {
         my $other = {
           'name'         => $scanner_or_mailrx->{name},
       foreach my $scanner_or_mailrx (@others) {
         my $other = {
           'name'         => $scanner_or_mailrx->{name},


@@ -567,7 +543,6 @@ sub _get_sources {
     };
     push @sources , $attdata;
   }
     };
     push @sources , $attdata;
   }

-  $main::lxdebug->message(LXDebug->DEBUG2(), "get_sources count=".scalar(@sources));

   return @sources;
 }
 
   return @sources;
 }
 

diff --git a/SL/File/Backend/Filesystem.pm b/SL/File/Backend/Filesystem.pm
index e2216f4c8a7eab643b7ae13cf6fa83db319e8ccb..fe8604c0be6163bc2940513808a92c9944614a47 100644 (file)
--- a/SL/File/Backend/Filesystem.pm
+++ b/SL/File/Backend/Filesystem.pm
@@ -14,19 +14,14 @@ use File::Path qw(make_path);
 
 sub delete {
   my ($self, %params) = @_;
 
 sub delete {
   my ($self, %params) = @_;

-  $main::lxdebug->message(LXDebug->DEBUG2(), "del in backend " . $self . "  file " . $params{dbfile});
-  $main::lxdebug->message(LXDebug->DEBUG2(), "file id=" . ($params{dbfile}->id * 1));
-  $main::lxdebug->message(LXDebug->DEBUG2(), "last=" .  $params{last}." all_bnl=". $params{all_but_notlast});

   die "no dbfile in backend delete" unless $params{dbfile};
   my $backend_data = $params{dbfile}->backend_data;
   $backend_data    = 0                               if $params{last};
   $backend_data    = $params{dbfile}->backend_data-1 if $params{all_but_notlast};
 
   if ($backend_data > 0 ) {
   die "no dbfile in backend delete" unless $params{dbfile};
   my $backend_data = $params{dbfile}->backend_data;
   $backend_data    = 0                               if $params{last};
   $backend_data    = $params{dbfile}->backend_data-1 if $params{all_but_notlast};
 
   if ($backend_data > 0 ) {

-    $main::lxdebug->message(LXDebug->DEBUG2(), "backend_data=" .$backend_data);

     for my $version ( 1..$backend_data) {
       my $file_path = $self->_filesystem_path($params{dbfile},$version);
     for my $version ( 1..$backend_data) {
       my $file_path = $self->_filesystem_path($params{dbfile},$version);

-      $main::lxdebug->message(LXDebug->DEBUG2(), "unlink " .$file_path);

       unlink($file_path);
     }
     if ($params{all_but_notlast}) {
       unlink($file_path);
     }
     if ($params{all_but_notlast}) {


@@ -39,7 +34,6 @@ sub delete {
       $params{dbfile}->backend_data(0);
       my $dir_path = $self->_filesystem_path($params{dbfile});
       rmdir($dir_path);
       $params{dbfile}->backend_data(0);
       my $dir_path = $self->_filesystem_path($params{dbfile});
       rmdir($dir_path);

-      $main::lxdebug->message(LXDebug->DEBUG2(), "rmdir " .$dir_path);

     }
   } else {
     my $file_path = $self->_filesystem_path($params{dbfile},$params{dbfile}->backend_data);
     }
   } else {
     my $file_path = $self->_filesystem_path($params{dbfile},$params{dbfile}->backend_data);


@@ -83,14 +77,12 @@ sub get_version_count {
 sub get_mtime {
   my ($self, %params) = @_;
   die "no dbfile" unless $params{dbfile};
 sub get_mtime {
   my ($self, %params) = @_;
   die "no dbfile" unless $params{dbfile};

-  $main::lxdebug->message(LXDebug->DEBUG2(), "version=" .$params{version});

   die "unknown version" if $params{version} &&
                           ($params{version} < 0 || $params{version} > $params{dbfile}->backend_data) ;
   my $path = $self->_filesystem_path($params{dbfile},$params{version});
   die "no file found in backend get_mtime" if !-f $path;
   my @st = stat($path);
   my $dt = DateTime->from_epoch(epoch => $st[9])->clone();
   die "unknown version" if $params{version} &&
                           ($params{version} < 0 || $params{version} > $params{dbfile}->backend_data) ;
   my $path = $self->_filesystem_path($params{dbfile},$params{version});
   die "no file found in backend get_mtime" if !-f $path;
   my @st = stat($path);
   my $dt = DateTime->from_epoch(epoch => $st[9])->clone();

-  $main::lxdebug->message(LXDebug->DEBUG2(), "dt=" .$dt);

   return $dt;
 }
 
   return $dt;
 }
 


@@ -131,7 +123,6 @@ sub _filesystem_path {
   $version    = $dbfile->backend_data if !$version || $version < 1 || $version > $dbfile->backend_data;
   my $iddir   = sprintf("%04d", $dbfile->id % 1000);
   my $path    = File::Spec->catdir($::lx_office_conf{paths}->{document_path}, $::auth->client->{id}, $iddir, $dbfile->id);
   $version    = $dbfile->backend_data if !$version || $version < 1 || $version > $dbfile->backend_data;
   my $iddir   = sprintf("%04d", $dbfile->id % 1000);
   my $path    = File::Spec->catdir($::lx_office_conf{paths}->{document_path}, $::auth->client->{id}, $iddir, $dbfile->id);

-  $main::lxdebug->message(LXDebug->DEBUG2(), "file path=" .$path." id=" .$dbfile->id." version=".$version." basename=".$dbfile->id . '_' . $version);

   if (!-d $path) {
     File::Path::make_path($path, { chmod => 0770 });
   }
   if (!-d $path) {
     File::Path::make_path($path, { chmod => 0770 });
   }