[otrs-cvs] CVS: ITSMCMDB/Kernel/System ITSMCMDB.pm,1.29,1.30

[cvs-log at otrs.org]

Update of /home/cvs/ITSMCMDB/Kernel/System
In directory lancelot:/tmp/cvs-serv16234/Kernel/System

Modified Files:
	ITSMCMDB.pm 
Log Message:
moved regexp and require check to core module

Index: ITSMCMDB.pm
===================================================================
RCS file: /home/cvs/ITSMCMDB/Kernel/System/ITSMCMDB.pm,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** ITSMCMDB.pm	4 Nov 2006 16:30:37 -0000	1.29
--- ITSMCMDB.pm	6 Nov 2006 15:40:26 -0000	1.30
***************
*** 738,742 ****
                  $DataArray->[$Counter]->{Name} = $Attribute->{Name};
                  $DataArray->[$Counter]->{Key} = $Attribute->{Key};
! 
                  # copy input hash
                  my %Input = %{$Attribute->{Input}};
--- 738,743 ----
                  $DataArray->[$Counter]->{Name} = $Attribute->{Name};
                  $DataArray->[$Counter]->{Key} = $Attribute->{Key};
!                 $DataArray->[$Counter]->{Input}->{Required} = $Attribute->{Input}->{Required};
!                 $DataArray->[$Counter]->{Input}->{RegExp} = $Attribute->{Input}->{RegExp};
                  # copy input hash
                  my %Input = %{$Attribute->{Input}};
***************
*** 760,763 ****
--- 761,777 ----
                  }
  
+                 # regexp and require check
+                 if (@DatabaseArray) {
+                     if ($Attribute->{Input}->{Required} && !$DataArray->[$Counter]->{Input}->{Value}) {
+                         $DataArray->[$Counter]->{Input}->{RequiredInvalid} = 1;
+                         $DataArray->[$Counter]->{Invalid} = 1;
+                     }
+                     if ($Attribute->{Input}->{RegExp} && $DataArray->[$Counter]->{Input}->{Value} &&
+                         $DataArray->[$Counter]->{Input}->{Value} !~ /$Attribute->{Input}->{RegExp}/i) {
+                         $DataArray->[$Counter]->{Input}->{RegExpInvalid} = 1;
+                         $DataArray->[$Counter]->{Invalid} = 1;
+                     }
+                 }
+ 
                  # if subs are defined (hierachy 1)
                  if ($Attribute->{Sub}) {
***************
*** 782,785 ****
--- 796,801 ----
                                  $DataArray->[$Counter]->{Sub}->[$CounterSub1]->{Name} = $Sub1->{Name};
                                  $DataArray->[$Counter]->{Sub}->[$CounterSub1]->{Key} = $Sub1->{Key};
+                                 $DataArray->[$Counter]->{Sub}->[$CounterSub1]->{Input}->{Required} = $Sub1->{Input}->{Required};
+                                 $DataArray->[$Counter]->{Sub}->[$CounterSub1]->{Input}->{RegExp} = $Sub1->{Input}->{RegExp};
  
                                  # copy input hash
***************
*** 806,809 ****
--- 822,838 ----
                                  }
  
+                                 # regexp and require check
+                                 if (@DatabaseArray) {
+                                     if ($Sub1->{Input}->{Required} && !$DataArray->[$Counter]->{Sub}->[$CounterSub1]->{Input}->{Value}) {
+                                         $DataArray->[$Counter]->{Sub}->[$CounterSub1]->{Input}->{RequiredInvalid} = 1;
+                                         $DataArray->[$Counter]->{Invalid} = 1;
+                                     }
+                                     if ($Sub1->{Input}->{RegExp} && $DataArray->[$Counter]->{Sub}->[$CounterSub1]->{Input}->{Value} &&
+                                         $DataArray->[$Counter]->{Sub}->[$CounterSub1]->{Input}->{Value} !~ /$Sub1->{Input}->{RegExp}/i) {
+                                         $DataArray->[$Counter]->{Sub}->[$CounterSub1]->{Input}->{RegExpInvalid} = 1;
+                                         $DataArray->[$Counter]->{Invalid} = 1;
+                                     }
+                                 }
+ 
                                  # if subs are defined (hierachy 2)
                                  if ($Sub1->{Sub}) {
***************
*** 828,831 ****
--- 857,862 ----
                                                  $DataArray->[$Counter]->{Sub}->[$CounterSub1]->{Sub}->[$CounterSub2]->{Name} = $Sub2->{Name};
                                                  $DataArray->[$Counter]->{Sub}->[$CounterSub1]->{Sub}->[$CounterSub2]->{Key} = $Sub2->{Key};
+                                                 $DataArray->[$Counter]->{Sub}->[$CounterSub1]->{Sub}->[$CounterSub2]->{Input}->{Required} = $Sub2->{Input}->{Required};
+                                                 $DataArray->[$Counter]->{Sub}->[$CounterSub1]->{Sub}->[$CounterSub2]->{Input}->{RegExp} = $Sub2->{Input}->{RegExp};
  
                                                  # copy input hash
***************
*** 852,855 ****
--- 883,899 ----
                                                  }
  
+                                                 # regexp and require check
+                                                 if (@DatabaseArray) {
+                                                     if ($Sub2->{Input}->{Required} && !$DataArray->[$Counter]->{Sub}->[$CounterSub1]->{Sub}->[$CounterSub2]->{Input}->{Value}) {
+                                                         $DataArray->[$Counter]->{Sub}->[$CounterSub1]->{Sub}->[$CounterSub2]->{Input}->{RequiredInvalid} = 1;
+                                                         $DataArray->[$Counter]->{Invalid} = 1;
+                                                     }
+                                                     if ($Sub2->{Input}->{RegExp} && $DataArray->[$Counter]->{Sub}->[$CounterSub1]->{Sub}->[$CounterSub2]->{Input}->{Value} &&
+                                                         $DataArray->[$Counter]->{Sub}->[$CounterSub1]->{Sub}->[$CounterSub2]->{Input}->{Value} !~ /$Sub2->{Input}->{RegExp}/i) {
+                                                         $DataArray->[$Counter]->{Sub}->[$CounterSub1]->{Sub}->[$CounterSub2]->{Input}->{RegExpInvalid} = 1;
+                                                         $DataArray->[$Counter]->{Invalid} = 1;
+                                                     }
+                                                 }
+ 
                                                  $CounterSub2++;
                                                  $CounterSub2Element++;
***************
*** 1034,1036 ****
  $Revision$ $Date$
  
! =cut
\ No newline at end of file
--- 1078,1080 ----
  $Revision$ $Date$
  
! =cut