[30440] users/rhwood/MacPorts.Framework

[source_changes at macosforge.org]

Revision: 30440
          http://trac.macosforge.org/projects/macports/changeset/30440
Author:   rhwood at macports.org
Date:     2007-10-27 18:21:50 -0700 (Sat, 27 Oct 2007)

Log Message:
-----------
[MPRegistery installed] returns a NSDictionary, keyed by port name NSArrays of MPReceipts instead of NSArrays of NSArrays now.

Modified Paths:
--------------
    users/rhwood/MacPorts.Framework/MPRegistery.h
    users/rhwood/MacPorts.Framework/MPRegistery.m

Modified: users/rhwood/MacPorts.Framework/MPRegistery.h
===================================================================
--- users/rhwood/MacPorts.Framework/MPRegistery.h	2007-10-28 01:18:16 UTC (rev 30439)
+++ users/rhwood/MacPorts.Framework/MPRegistery.h	2007-10-28 01:21:50 UTC (rev 30440)
@@ -37,6 +37,7 @@
 #import "MPConstants.h"
 #import "MPInterpreter.h"
 #import "MPPort.h"
+#import "MPReceipt.h"
 
 @interface MPRegistery : NSObject {
 

Modified: users/rhwood/MacPorts.Framework/MPRegistery.m
===================================================================
--- users/rhwood/MacPorts.Framework/MPRegistery.m	2007-10-28 01:18:16 UTC (rev 30439)
+++ users/rhwood/MacPorts.Framework/MPRegistery.m	2007-10-28 01:21:50 UTC (rev 30440)
@@ -94,7 +94,7 @@
 
 - (NSDictionary *)installed:(NSString *)name withVersion:(NSString *)version {
 	NSArray *raw;
-	NSDictionary *properties;
+	MPReceipt *receipt;
 	NSMutableDictionary *result;
 	NSEnumerator *rawEnumerator;
 	NSArray *versions;
@@ -111,13 +111,11 @@
 	while (item = [rawEnumerator nextObject]) {
 		versions = [interpreter arrayFromTclListAsString:item];
 		if ([versions count] == 6) {
-			properties = [NSDictionary dictionaryWithObjects:
-				[versions objectsAtIndexes:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(1,[versions count] - 1)]] 
-													 forKeys:[NSArray arrayWithObjects:@"version", @"revision", @"variants", @"active", @"whatIsThis", nil]];
+			receipt = [[MPReceipt alloc] initWithContentsOfArray:versions];
 			if ([result objectForKey:[versions objectAtIndex:0]]) {
-				[result setObject:[[result objectForKey:[versions objectAtIndex:0]] arrayByAddingObject:properties] forKey:[versions objectAtIndex:0]];
+				[result setObject:[[result objectForKey:[versions objectAtIndex:0]] arrayByAddingObject:receipt] forKey:[versions objectAtIndex:0]];
 			} else {
-				[result setObject:[NSArray arrayWithObject:properties] forKey:[versions objectAtIndex:0]];
+				[result setObject:[NSArray arrayWithObject:receipt] forKey:[versions objectAtIndex:0]];
 			}
 		}
 	}

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071027/e4668a53/attachment.html