Changeset 568
- Timestamp:
- 01/05/10 08:12:07 (15 years ago)
- Location:
- LATMOS-Accounts
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
LATMOS-Accounts/import/epo.pl
r567 r568 14 14 my $otype ||= 'user'; 15 15 16 my $LA = LATMOS::Accounts->new($config , noacl => 1);16 my $LA = LATMOS::Accounts->new($config); 17 17 my $labase = $base ? $LA->base($base) : $LA->default_base; 18 18 $labase->{wexported} = 1; … … 24 24 25 25 my @passwd = split("\t", $line); 26 #warn (join(' - ', map { $_ => $passwd[$_] } 0 ..$#passwd));26 warn (join(' - ', map { $_ => $passwd[$_] } 0 ..$#passwd)); 27 27 my @epo; 28 28 … … 31 31 cgranier => 'clg', 32 32 vernier => 'jeanpaul82', 33 }->{$passwd[2 7]} || $passwd[27];33 }->{$passwd[22]} || $passwd[22]; 34 34 my $obj = $labase->get_object($otype, $login) or do { 35 35 warn "Cannot get $login user"; 36 #warn $line . "\n";36 warn $line . "\n"; 37 37 next; 38 38 }; … … 51 51 $changes{mail} = $passwd[9]; 52 52 $changes{mail} =~ s/cetp.ipsl.fr/latmos.ipsl.fr/; 53 if ($passwd[13] !~ /1900\d\d\d\d/) { 54 $changes{birthDate} = $passwd[13]; 55 $changes{birthDate} =~ s/^N//; 56 $changes{birthDate} .= '120000Z'; 57 } 53 58 } 54 59 … … 59 64 } 60 65 61 62 foreach my $col (3, 5, 7) { 66 foreach my $col (3, 5) { 63 67 if($passwd[$col] ne 'AJETER') { 64 68 my %param = (user => $obj->id,); 65 $passwd[$col] =~ /^(SAV|SAJ|vel|StM|GY)-(.*)/i or do { 66 warn "unknown $passwd[$col]"; 67 next; 68 }; 69 $passwd[$col] =~ /^(SAV|SAJ|vel|StM)-(.*)/i; 69 70 my $eposite = $1; 70 71 $param{physicalDeliveryOfficeName} = $2; 71 $param{telephoneNumber} = '+33 1 ' . $passwd[$col + 5];72 $param{telephoneNumber} = '+33 1 ' . $passwd[$col + 3]; 72 73 73 74 for ($eposite) { … … 86 87 last; 87 88 }; 88 /^SAJ$/ iand do {89 /^SAJ$/ and do { 89 90 $param{site} = 'Jussieu'; 90 91 $passwd[14] =~ /aero$/ and $param{isMainAddress} = 1; 91 last;92 };93 /^GY$/i and do {94 $param{site} = 'Guyancourt';95 # is not main address at time96 92 last; 97 93 }; … … 105 101 } 106 102 } 107 $passwd[1 6] =~ /^T(\d\d\d\d)(\d\d)(\d\d)$/ and do {103 $passwd[12] =~ /^T(\d\d\d\d)(\d\d)(\d\d)$/ and do { 108 104 if($1 < 2100) { 109 105 $changes{expire} = "$3/$2/$1 23:59:59"; … … 112 108 } 113 109 }; 114 $passwd[ 22] =~ /^GRADE(.*)/ and do {110 $passwd[17] =~ /^GRADE(.*)/ and do { 115 111 $changes{grade} = $1; 116 112 }; … … 119 115 { 120 116 my @group = @{ $obj->get_c_field('memberOf') || []}; 121 foreach ($passwd[20] =~ /^DOM(.*)/g) { 122 $changes{departement} = '$1'; 117 foreach ($passwd[15] =~ /^DOM(.*)/g) { 123 118 push @group, $1; 124 119 next; -
LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql.pm
r567 r568 98 98 $self->log(LA_DEBUG, 'DB::COMMIT'); 99 99 } 100 $self->{__cache} = undef;101 100 $self->db->commit; 102 101 } … … 110 109 $self->log(LA_DEBUG, 'DB::ROLLBACK'); 111 110 } 112 $self->{__cache} = undef;113 111 $self->db->rollback; 114 112 } -
LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/objects.pm
r567 r568 91 91 sub _inline_fields { 92 92 my ($self, $for, $base) = @_; 93 if ($base->{__cache}{$self->object_table}) {94 return %{$base->{__cache}{$self->object_table}};95 }96 93 my @res; 97 94 my $sth = $base->db->prepare( … … 108 105 } 109 106 my %fields = map { $_ => $_ } @res; 110 $base->{__cache}{$self->object_table} = \%fields;111 107 %fields 112 108 } … … 126 122 my @attr; 127 123 if ($class->has_extended_attributes) { 128 if ($base->{__cache}{_extended_field}{$class}) {129 return map { $_ => $_ }130 @{$base->{__cache}{_extended_field}{$class}};131 }132 124 my $sth = $base->db->prepare_cached( 133 125 sprintf( … … 140 132 push(@attr, $res->{canonical}); 141 133 } 142 $base->{__cache}{_extended_field}{$class} = \@attr;143 134 return map { $_ => $_ } @attr; 144 135 } else {
Note: See TracChangeset
for help on using the changeset viewer.