Merge branch 'master' of http://wagnertech.de/git/mfinanz

[mfinanz.git] / SL / File / Object.pm

diff --git a/SL/File/Object.pm b/SL/File/Object.pm
index fd1052861150d32b36286e298d20782bc61e9343..dc009e99fcfd5a2bfc4d16a6a52569eeeec5e04f 100644 (file)
--- a/SL/File/Object.pm
+++ b/SL/File/Object.pm
@@ -6,7 +6,7 @@ use DateTime;
 
 use Rose::Object::MakeMethods::Generic (
   scalar => [ qw() ],
 
 use Rose::Object::MakeMethods::Generic (
   scalar => [ qw() ],

-  'scalar --get_set_init' => [ qw(db_file loaded id version newest) ],
+  'scalar --get_set_init' => [ qw(db_file loaded id file_version version newest) ],

 );
 
 #use SL::DB::Helper::Attr;
 );
 
 #use SL::DB::Helper::Attr;


@@ -31,10 +31,6 @@ sub file_type {
   $_[0]->loaded_db_file->file_type;
 }
 
   $_[0]->loaded_db_file->file_type;
 }
 

-sub file_name {
-  $_[0]->loaded_db_file->file_name;
-}
-

 sub object_type {
   $_[0]->loaded_db_file->object_type;
 }
 sub object_type {
   $_[0]->loaded_db_file->object_type;
 }


@@ -101,6 +97,10 @@ sub delete_last_version {
   SL::File->delete(dbfile => $_[0]->loaded_db_file, last => 1 )
 }
 
   SL::File->delete(dbfile => $_[0]->loaded_db_file, last => 1 )
 }
 

+sub delete_file_version {
+  SL::File->delete(dbfile => $_[0]->loaded_db_file, file_version => $_[0]->file_version )
+}
+

 sub purge {
   SL::File->delete(dbfile => $_[0]->loaded_db_file, all_but_notlast => 1 )
 }
 sub purge {
   SL::File->delete(dbfile => $_[0]->loaded_db_file, all_but_notlast => 1 )
 }


@@ -124,12 +124,17 @@ sub loaded_db_file {  # so, dass wir die nur einmal laden.
   $_[0]->db_file;
 }
 
   $_[0]->db_file;
 }
 

+sub clone {
+  bless +{ %{ $_[0] } }, __PACKAGE__;
+}
+

 
 

-sub init_db_file { die 'must always have a db file'; }
-sub init_loaded  { 0 }
-sub init_id      { 0 }
-sub init_version { 0 }
-sub init_newest  { 1 }
+sub init_db_file      { die 'must always have a db file'; }
+sub init_loaded       { 0 }
+sub init_id           { 0 }
+sub init_version      { 0 }
+sub init_file_version { undef }
+sub init_newest       { 1 }

 
 1;
 
 
 1;
 


@@ -147,7 +152,7 @@ SL::File::Object - a filemangement object wrapper
 
   my ($object) = SL::File->get_all(object_id   => $object_id,
                                    object_type => $object_type,
 
   my ($object) = SL::File->get_all(object_id   => $object_id,
                                    object_type => $object_type,

-                                   file_type   => 'images',  # may be optional
+                                   file_type   => 'image',   # may be optional

                                    source      => 'uploaded' # may be optional
                                   );
 # read attributes
                                    source      => 'uploaded' # may be optional
                                   );
 # read attributes


@@ -214,9 +219,11 @@ Following methods are wrapper to read the attributes of L<SL::DB::File> :
 
 =back
 
 
 =back
 

-Additional are there special methods. If the Object is created by SL::File::get_all_versions()
-or by "$object->versions"
-it has a version number. So the different mtime, filepath or content can be retrieved:
+Additional are there special methods. If the Object is created by
+C<SL::File::get_all_versions()> or by C<$object->versions>. It has a version
+number in C<version> and a version object in C<file_version> of type
+C<SL::DB::FileVersion>. So the different mtime, filepath or content can be
+retrieved:

 
 =over 4
 
 
 =over 4