Revision 2f816d2a

b/asi-http-request-with-pithos/Classes/Pithos/ASIPithosAccountRequest.m
275 275
        if (currentContainer.policy == nil)
276 276
            currentContainer.policy = [NSMutableDictionary dictionary];
277 277
        self.currentDictionary = currentContainer.policy;
278
	} else if ([elementName isEqualToString:@"x_container_meta"]) {
279
        if (currentContainer.metadata == nil)
280
            currentContainer.metadata = [NSMutableDictionary dictionary];
281
        self.currentDictionary = currentContainer.metadata;
282 278
    }
283 279
	self.currentContent = @"";
284 280
}
......
303 299
    } else if ([elementName isEqualToString:@"value"]) {
304 300
        [currentDictionary setObject:currentContent forKey:currentKey];
305 301
        self.currentKey = nil;
306
    } else if ([elementName isEqualToString:@"x_container_policy"] || [elementName isEqualToString:@"x_container_meta"]) {
302
    } else if ([elementName isEqualToString:@"x_container_policy"]) {
307 303
        self.currentDictionary = nil;
308 304
	} else if ([elementName isEqualToString:@"container"]) {
309 305
		[containers addObject:currentContainer];
b/asi-http-request-with-pithos/Classes/Pithos/ASIPithosContainerRequest.m
421 421
		self.currentObject = [ASIPithosObject object];
422 422
	} else if ([elementName isEqualToString:@"subdir"]) {
423 423
		[objects addObject:[ASIPithosObject subdirWithName:[attributeDict valueForKey:@"name"]]];
424
	} else if ([elementName isEqualToString:@"x_object_meta"]) {
425
        if (currentObject.metadata == nil)
426
            currentObject.metadata = [NSMutableDictionary dictionary];
427 424
	}
428 425

  
429 426
	self.currentContent = @"";
......
442 439
        currentObject.bytes = [currentContent intValue];
443 440
	} else if ([elementName isEqualToString:@"content_type"]) {
444 441
        currentObject.contentType = currentContent;
445
	} else if ([elementName isEqualToString:@"content_encoding"]) {
446
        currentObject.contentEncoding = currentContent;
447
	} else if ([elementName isEqualToString:@"content_disposition"]) {
448
        currentObject.contentDisposition = currentContent;
449 442
    } else if ([elementName isEqualToString:@"last_modified"]) {
450 443
        currentObject.lastModified = [[self dateFormatterWithFormatId:0] dateFromString:
451 444
         [currentContent stringByReplacingOccurrencesOfString:@":" 
......
458 451
        currentObject.versionTimestamp = [NSDate dateWithTimeIntervalSince1970:[currentContent doubleValue]];
459 452
	} else if ([elementName isEqualToString:@"x_object_modified_by"]) {
460 453
        currentObject.modifiedBy = currentContent;
461
	} else if ([elementName isEqualToString:@"x_object_manifest"]) {
462
        currentObject.manifest = currentContent;
463 454
	} else if ([elementName isEqualToString:@"x_object_sharing"]) {
464 455
        currentObject.sharing = currentContent;
465 456
	} else if ([elementName isEqualToString:@"x_object_shared_by"]) {
466 457
        currentObject.sharedBy = currentContent;
467 458
	} else if ([elementName isEqualToString:@"x_object_public"]) {
468 459
        currentObject.publicURI = currentContent;
469
    } else if ([elementName isEqualToString:@"key"]) {
470
        self.currentKey = currentContent;
471
    } else if ([elementName isEqualToString:@"value"]) {
472
        [currentObject.metadata setObject:currentContent forKey:currentKey];
473
        self.currentKey = nil;
474 460
	} else if ([elementName isEqualToString:@"x_object_allowed_to"]) {
475 461
        currentObject.allowedTo = currentContent;
476 462
	} else if ([elementName isEqualToString:@"object"]) {
b/asi-http-request-with-pithos/Classes/Pithos/ASIPithosObjectRequest.m
288 288
    ASIPithosObject *object = [ASIPithosObject object];
289 289
    object.name = objectName;
290 290
    object.hash = [self eTag];
291
    object.objectHash = [self objectHash];
292
    object.UUID = [self UUID];
291 293
    object.contentType = [self contentType];
292 294
    object.contentEncoding = [self contentEncoding];
293 295
    object.contentDisposition = [self contentDisposition];

Also available in: Unified diff