[otrs-cvs] ImportExport/Kernel/Modules AdminImportExport.pm, 1.12, 1.13

[cvs-log at otrs.org]

Comments:
Update of /home/cvs/ImportExport/Kernel/Modules
In directory lancelot:/tmp/cvs-serv30966/Kernel/Modules

Modified Files:
	AdminImportExport.pm 
Log Message:
Improved import/export features.

Author: mh

Index: AdminImportExport.pm
===================================================================
RCS file: /home/cvs/ImportExport/Kernel/Modules/AdminImportExport.pm,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** AdminImportExport.pm	5 Feb 2008 19:23:55 -0000	1.12
--- AdminImportExport.pm	6 Feb 2008 17:47:26 -0000	1.13
***************
*** 360,363 ****
--- 360,364 ----
          }
  
+         # save the object data
          $Self->{ImportExportObject}->ObjectDataSave(
              TemplateID => $TemplateID,
***************
*** 533,536 ****
--- 534,538 ----
          }
  
+         # save the format data
          $Self->{ImportExportObject}->FormatDataSave(
              TemplateID => $TemplateID,
***************
*** 616,620 ****
  
          # get object attributes
!         my $ObjectAttributes = $Self->{ImportExportObject}->MappingObjectAttributesGet(
              TemplateID => $TemplateData->{TemplateID},
              UserID     => $Self->{UserID},
--- 618,622 ----
  
          # get object attributes
!         my $MappingObjectAttributes = $Self->{ImportExportObject}->MappingObjectAttributesGet(
              TemplateID => $TemplateData->{TemplateID},
              UserID     => $Self->{UserID},
***************
*** 622,626 ****
  
          # get format attributes
!         my $FormatAttributes = $Self->{ImportExportObject}->MappingFormatAttributesGet(
              TemplateID => $TemplateData->{TemplateID},
              UserID     => $Self->{UserID},
--- 624,628 ----
  
          # get format attributes
!         my $MappingFormatAttributes = $Self->{ImportExportObject}->MappingFormatAttributesGet(
              TemplateID => $TemplateData->{TemplateID},
              UserID     => $Self->{UserID},
***************
*** 638,642 ****
              );
  
!             for my $Item ( @{$ObjectAttributes} ) {
  
                  # create form input
--- 640,656 ----
              );
  
!             # get mapping object data
!             my $MappingObjectData = $Self->{ImportExportObject}->MappingObjectDataGet(
!                 MappingID => $MappingID,
!                 UserID    => $Self->{UserID},
!             );
! 
!             # get mapping format data
!             my $MappingFormatData = $Self->{ImportExportObject}->MappingFormatDataGet(
!                 MappingID => $MappingID,
!                 UserID    => $Self->{UserID},
!             );
! 
!             for my $Item ( @{$MappingObjectAttributes} ) {
  
                  # create form input
***************
*** 644,648 ****
                      Item    => $Item,
                      Prefix  => 'Object::' . $Counter . '::',
! #                    Value   => $FormatData->{ $Item->{Key} },
                  );
  
--- 658,662 ----
                      Item    => $Item,
                      Prefix  => 'Object::' . $Counter . '::',
!                     Value   => $MappingObjectData->{ $Item->{Key} },
                  );
  
***************
*** 658,662 ****
              }
  
!             for my $Item ( @{$FormatAttributes} ) {
  
                  # create form input
--- 672,676 ----
              }
  
!             for my $Item ( @{$MappingFormatAttributes} ) {
  
                  # create form input
***************
*** 664,668 ****
                      Item   => $Item,
                      Prefix => 'Format::' . $Counter . '::',
! #                    Value => $FormatData->{ $Item->{Key} },
                  );
  
--- 678,682 ----
                      Item   => $Item,
                      Prefix => 'Format::' . $Counter . '::',
!                     Value => $MappingFormatData->{ $Item->{Key} },
                  );
  
***************
*** 729,732 ****
--- 743,801 ----
          );
  
+         # get object attributes
+         my $MappingObjectAttributes = $Self->{ImportExportObject}->MappingObjectAttributesGet(
+             TemplateID => $TemplateID,
+             UserID     => $Self->{UserID},
+         );
+ 
+         # get format attributes
+         my $MappingFormatAttributes = $Self->{ImportExportObject}->MappingFormatAttributesGet(
+             TemplateID => $TemplateID,
+             UserID     => $Self->{UserID},
+         );
+ 
+         my $Counter = 0;
+         MAPPINGID:
+         for my $MappingID ( @{$MappingList} ) {
+ 
+             # get object attribute values
+             my %ObjectAttributeValues;
+             for my $Item ( @{$MappingObjectAttributes} ) {
+ 
+                 # get object form data
+                 $ObjectAttributeValues{ $Item->{Key} } = $Self->{LayoutObject}->ImportExportFormDataGet(
+                     Item => $Item,
+                     Prefix => 'Object::' . $Counter . '::',
+                 );
+             }
+ 
+             # save the mapping object data
+             $Self->{ImportExportObject}->MappingObjectDataSave(
+                 MappingID         => $MappingID,
+                 MappingObjectData => \%ObjectAttributeValues,
+                 UserID            => $Self->{UserID},
+             );
+ 
+             # get format attribute values
+             my %FormatAttributeValues;
+             for my $Item ( @{$MappingFormatAttributes} ) {
+ 
+                 # get format form data
+                 $FormatAttributeValues{ $Item->{Key} } = $Self->{LayoutObject}->ImportExportFormDataGet(
+                     Item => $Item,
+                     Prefix => 'Format::' . $Counter . '::',
+                 );
+             }
+ 
+             # save the mapping format data
+             $Self->{ImportExportObject}->MappingFormatDataSave(
+                 MappingID         => $MappingID,
+                 MappingFormatData => \%FormatAttributeValues,
+                 UserID            => $Self->{UserID},
+             );
+ 
+             $Counter++;
+         }
+ 
          MAPPINGID:
          for my $MappingID ( @{$MappingList} ) {