[otrs-cvs] CVS: ITSMCMDB/Kernel/Modules AgentITSMCMDB.pm,1.69,1.70

[cvs-log at otrs.org]

Update of /home/cvs/ITSMCMDB/Kernel/Modules
In directory lancelot:/tmp/cvs-serv15761/Kernel/Modules

Modified Files:
	AgentITSMCMDB.pm 
Log Message:
improved search mechanism

Index: AgentITSMCMDB.pm
===================================================================
RCS file: /home/cvs/ITSMCMDB/Kernel/Modules/AgentITSMCMDB.pm,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -r1.69 -r1.70
*** AgentITSMCMDB.pm	13 Dec 2006 12:05:08 -0000	1.69
--- AgentITSMCMDB.pm	13 Dec 2006 13:13:33 -0000	1.70
***************
*** 614,620 ****
  
      elsif ($Self->{Subaction} eq 'RecordSearch') {
-         my $Search = 0;
          my %AttributesData;
          my $ConfigItem = $Self->{ParamObject}->GetParam(Param => "ConfigItemSelect");
  
          $Output = $Self->{LayoutObject}->Header(Title => 'Search Record');
--- 614,620 ----
  
      elsif ($Self->{Subaction} eq 'RecordSearch') {
          my %AttributesData;
          my $ConfigItem = $Self->{ParamObject}->GetParam(Param => "ConfigItemSelect");
+         my $SubmitSearch = $Self->{ParamObject}->GetParam(Param => "SubmitSearch");
  
          $Output = $Self->{LayoutObject}->Header(Title => 'Search Record');
***************
*** 641,645 ****
              $Self->{LayoutObject}->Block(
                  Name => 'RecordSearchAttribute',
!                 Data => {},
              );
              # get attributes
--- 641,647 ----
              $Self->{LayoutObject}->Block(
                  Name => 'RecordSearchAttribute',
!                 Data => {
!                     ConfigItem => $ConfigItem,
!                 },
              );
              # get attributes
***************
*** 653,659 ****
                  # get search string
                  my $SearchString = $Self->{ParamObject}->GetParam(Param => "$Key");
-                 if ($SearchString) {
-                     $AttributesData{$Key} = $SearchString;
-                 }
                  # generate input field
                  my $AttributeInput = $Self->{LayoutObject}->ITSMCMDBInputText(
--- 655,658 ----
***************
*** 671,682 ****
                  );
              }
-             # if AttributeData was given, start search
-             if (%AttributesData) {
-                 $Search = 1;
-             }
          }
  
          # output search result
!         if ($Search) {
              my @What;
              # create search array
--- 670,677 ----
                  );
              }
          }
  
          # output search result
!         if ($SubmitSearch) {
              my @What;
              # create search array