(fix #127) fallback to "work" when export as ldif
parent
12da6dc021
commit
0b10e20d37
|
@ -543,31 +543,6 @@ convention:
|
|||
flattenedValuesForKey: @""]
|
||||
inLDIFRecord: ldifRecord];
|
||||
|
||||
elements = [self childrenWithTag: @"adr"
|
||||
andAttribute: @"type" havingValue: @"work"];
|
||||
if (elements && [elements count] > 0)
|
||||
{
|
||||
element = [elements objectAtIndex: 0];
|
||||
[self _setValue: @"mozillaworkstreet2"
|
||||
to: [element flattenedValueAtIndex: 1 forKey: @""]
|
||||
inLDIFRecord: ldifRecord];
|
||||
[self _setValue: @"street"
|
||||
to: [element flattenedValueAtIndex: 2 forKey: @""]
|
||||
inLDIFRecord: ldifRecord];
|
||||
[self _setValue: @"l"
|
||||
to: [element flattenedValueAtIndex: 3 forKey: @""]
|
||||
inLDIFRecord: ldifRecord];
|
||||
[self _setValue: @"st"
|
||||
to: [element flattenedValueAtIndex: 4 forKey: @""]
|
||||
inLDIFRecord: ldifRecord];
|
||||
[self _setValue: @"postalcode"
|
||||
to: [element flattenedValueAtIndex: 5 forKey: @""]
|
||||
inLDIFRecord: ldifRecord];
|
||||
[self _setValue: @"c"
|
||||
to: [element flattenedValueAtIndex: 6 forKey: @""]
|
||||
inLDIFRecord: ldifRecord];
|
||||
}
|
||||
|
||||
elements = [self childrenWithTag: @"adr"
|
||||
andAttribute: @"type" havingValue: @"home"];
|
||||
if (elements && [elements count] > 0)
|
||||
|
@ -593,6 +568,35 @@ convention:
|
|||
inLDIFRecord: ldifRecord];
|
||||
}
|
||||
|
||||
elements = [self childrenWithTag: @"adr"
|
||||
andAttribute: @"type" havingValue: @"work"];
|
||||
|
||||
if (!elements || [elements count] == 0)
|
||||
elements = [self childrenWithTag: @"adr"];
|
||||
|
||||
if (elements && [elements count] > 0)
|
||||
{
|
||||
element = [elements objectAtIndex: 0];
|
||||
[self _setValue: @"mozillaworkstreet2"
|
||||
to: [element flattenedValueAtIndex: 1 forKey: @""]
|
||||
inLDIFRecord: ldifRecord];
|
||||
[self _setValue: @"street"
|
||||
to: [element flattenedValueAtIndex: 2 forKey: @""]
|
||||
inLDIFRecord: ldifRecord];
|
||||
[self _setValue: @"l"
|
||||
to: [element flattenedValueAtIndex: 3 forKey: @""]
|
||||
inLDIFRecord: ldifRecord];
|
||||
[self _setValue: @"st"
|
||||
to: [element flattenedValueAtIndex: 4 forKey: @""]
|
||||
inLDIFRecord: ldifRecord];
|
||||
[self _setValue: @"postalcode"
|
||||
to: [element flattenedValueAtIndex: 5 forKey: @""]
|
||||
inLDIFRecord: ldifRecord];
|
||||
[self _setValue: @"c"
|
||||
to: [element flattenedValueAtIndex: 6 forKey: @""]
|
||||
inLDIFRecord: ldifRecord];
|
||||
}
|
||||
|
||||
elements = [self childrenWithTag: @"url"];
|
||||
[self _setValue: @"mozillaworkurl"
|
||||
to: [self _simpleValueForType: @"work" inArray: elements
|
||||
|
|
Loading…
Reference in New Issue