Changeset 567
- Timestamp:
- 01/05/10 08:11:24 (14 years ago)
- Location:
- LATMOS-Accounts
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
LATMOS-Accounts/import/epo.pl
r502 r567 14 14 my $otype ||= 'user'; 15 15 16 my $LA = LATMOS::Accounts->new($config );16 my $LA = LATMOS::Accounts->new($config, noacl => 1); 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 2]} || $passwd[22];33 }->{$passwd[27]} || $passwd[27]; 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 }58 53 } 59 54 … … 64 59 } 65 60 66 foreach my $col (3, 5) { 61 62 foreach my $col (3, 5, 7) { 67 63 if($passwd[$col] ne 'AJETER') { 68 64 my %param = (user => $obj->id,); 69 $passwd[$col] =~ /^(SAV|SAJ|vel|StM)-(.*)/i; 65 $passwd[$col] =~ /^(SAV|SAJ|vel|StM|GY)-(.*)/i or do { 66 warn "unknown $passwd[$col]"; 67 next; 68 }; 70 69 my $eposite = $1; 71 70 $param{physicalDeliveryOfficeName} = $2; 72 $param{telephoneNumber} = '+33 1 ' . $passwd[$col + 3];71 $param{telephoneNumber} = '+33 1 ' . $passwd[$col + 5]; 73 72 74 73 for ($eposite) { … … 87 86 last; 88 87 }; 89 /^SAJ$/ and do {88 /^SAJ$/i and do { 90 89 $param{site} = 'Jussieu'; 91 90 $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 time 92 96 last; 93 97 }; … … 101 105 } 102 106 } 103 $passwd[1 2] =~ /^T(\d\d\d\d)(\d\d)(\d\d)$/ and do {107 $passwd[16] =~ /^T(\d\d\d\d)(\d\d)(\d\d)$/ and do { 104 108 if($1 < 2100) { 105 109 $changes{expire} = "$3/$2/$1 23:59:59"; … … 108 112 } 109 113 }; 110 $passwd[ 17] =~ /^GRADE(.*)/ and do {114 $passwd[22] =~ /^GRADE(.*)/ and do { 111 115 $changes{grade} = $1; 112 116 }; … … 115 119 { 116 120 my @group = @{ $obj->get_c_field('memberOf') || []}; 117 foreach ($passwd[15] =~ /^DOM(.*)/g) { 121 foreach ($passwd[20] =~ /^DOM(.*)/g) { 122 $changes{departement} = '$1'; 118 123 push @group, $1; 119 124 next; -
LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql.pm
r413 r567 98 98 $self->log(LA_DEBUG, 'DB::COMMIT'); 99 99 } 100 $self->{__cache} = undef; 100 101 $self->db->commit; 101 102 } … … 109 110 $self->log(LA_DEBUG, 'DB::ROLLBACK'); 110 111 } 112 $self->{__cache} = undef; 111 113 $self->db->rollback; 112 114 } -
LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/objects.pm
r504 r567 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 } 93 96 my @res; 94 97 my $sth = $base->db->prepare( … … 105 108 } 106 109 my %fields = map { $_ => $_ } @res; 110 $base->{__cache}{$self->object_table} = \%fields; 107 111 %fields 108 112 } … … 122 126 my @attr; 123 127 if ($class->has_extended_attributes) { 128 if ($base->{__cache}{_extended_field}{$class}) { 129 return map { $_ => $_ } 130 @{$base->{__cache}{_extended_field}{$class}}; 131 } 124 132 my $sth = $base->db->prepare_cached( 125 133 sprintf( … … 132 140 push(@attr, $res->{canonical}); 133 141 } 142 $base->{__cache}{_extended_field}{$class} = \@attr; 134 143 return map { $_ => $_ } @attr; 135 144 } else {
Note: See TracChangeset
for help on using the changeset viewer.