[28934] users/rhwood/MacPorts.Framework

[source_changes at macosforge.org]

Revision: 28934
          http://trac.macosforge.org/projects/macports/changeset/28934
Author:   rhwood at macports.org
Date:     2007-09-12 03:12:38 -0700 (Wed, 12 Sep 2007)

Log Message:
-----------
remove [MPInterpreter search] and reimplement [MPMacPorts search] using the code from [MPInterpreter search]

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

Modified: users/rhwood/MacPorts.Framework/MPInterpreter.h
===================================================================
--- users/rhwood/MacPorts.Framework/MPInterpreter.h	2007-09-12 09:56:40 UTC (rev 28933)
+++ users/rhwood/MacPorts.Framework/MPInterpreter.h	2007-09-12 10:12:38 UTC (rev 28934)
@@ -19,8 +19,6 @@
 
 #pragma Port Operations
 
-- (NSArray *)search:(NSString *)query;
-
 #pragma Port Settings
 
 #pragma Utilities

Modified: users/rhwood/MacPorts.Framework/MPInterpreter.m
===================================================================
--- users/rhwood/MacPorts.Framework/MPInterpreter.m	2007-09-12 09:56:40 UTC (rev 28933)
+++ users/rhwood/MacPorts.Framework/MPInterpreter.m	2007-09-12 10:12:38 UTC (rev 28934)
@@ -73,14 +73,6 @@
 
 #pragma Port Operations
 
-- (NSArray *)search:(NSString *)query {
-	return [self evaluateArrayAsString:[NSArray arrayWithObjects:
-		@"set r {}; set res [mportsearch",
-		query,
-		@"]; foreach {name info} $res { set r [concat $r $name] }; return $r",
-		nil]];
-}
-
 #pragma Port Settings
 
 #pragma Utilities

Modified: users/rhwood/MacPorts.Framework/MPMacPorts.m
===================================================================
--- users/rhwood/MacPorts.Framework/MPMacPorts.m	2007-09-12 09:56:40 UTC (rev 28933)
+++ users/rhwood/MacPorts.Framework/MPMacPorts.m	2007-09-12 10:12:38 UTC (rev 28934)
@@ -25,7 +25,11 @@
 }
 
 - (NSArray *)search:(NSString *)query {
-	return [interpreter search:query];
+	return [interpreter evaluateArrayAsString:[NSArray arrayWithObjects:
+		@"set r {}; set res [mportsearch",
+		query,
+		@"]; foreach {name info} $res { set r [concat $r $name] }; return $r",
+		nil]];
 }
 
 #pragma settings

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