--- bin/ldap2model.pl 2008/05/01 16:31:00 105 +++ bin/ldap2model.pl 2008/05/02 14:38:45 108 @@ -74,7 +74,8 @@ my $name = $_->{name} || die "no name?"; $methods .= qq/sub $_ { \$_[0]->$name }\n/ foreach @{$_->{aliases}}; my $out = qq/\tcolumn $name =>\n\t\tlabel is _('$_->{desc}')/; - $out .= qq/,\n\t\t# single-value/ if $_->{'single-value'}; +# $out .= qq/,\n\t\t# single-value/ if $_->{'single-value'}; +# $out .= qq/,\n\t\tfilters are qw(A3C::Filter::Array)/ unless $_->{'single-value'}; $out .= qq/,\n\t\tmax_length is $_->{max_length}/ if $_->{'max_length'}; $out .= qq/,\n\t\t$add/ if $add; $out .= qq/;\n\n/; @@ -90,7 +91,7 @@ map { warn "# $objectClass must: ",dump( $_ ) if $debug; $model .= entry( $_, 'is mandatory' ); - $create->{$_->{name}} = $_->{name}; + $create->{$_->{name}} = $_->{'single-value'} ? $_->{name} : [ $_->{name}, $_->{desc} ]; } $schema->must( $objectClass ); $model .= qq/\t# $objectClass may:\n\n/; @@ -178,7 +179,7 @@ foreach my $round ( 1 .. 2 ) { my $data; - $data .= qq/\t\t'$_' => '$_ $round',\n/ foreach keys %$create; + $data .= qq/\t\t'$_' => / . dump( $create->{$_} ) . qq/,\n/ foreach keys %$create; warn "$round data = $data\n" if $debug; $test =~ s/_create_${round}_/$data/gs; }