Changeset 37119

Timestamp:

2008-05-26 16:59:56 (6 months ago)

Author:

raimue@…

Message:

port/port.tcl:
port search looks now in name, description and long_description for the search
pattern and prints the list sorted.
Fixes #15434.

Files:

• trunk/base/src/port/port.tcl (modified) (1 diff)

trunk/base/src/port/port.tcl

@@ -1955 +1955 @@
 
         set portfound 0
-        if {[catch {set res [mportsearch $portname no]} result]} {
+        set res {}
+        if {[catch {set matches [mportsearch "*$portname*" no glob name]} result]} {
             global errorInfo
             ui_debug "$errorInfo"
-            break_softcontinue "search for portname $portname failed: $result" 1 status
-        }
+            break_softcontinue "search for name $portname failed: $result" 1 status
+        }
+        set tmp {}
+        foreach {name info} $matches {
+            add_to_portlist tmp [concat [list name $name] $info]
+        }
+        set res [opUnion $res $tmp]
+        if {[catch {set matches [mportsearch "*$portname*" no glob description]} result]} {
+            global errorInfo
+            ui_debug "$errorInfo"
+            break_softcontinue "search for description $portname failed: $result" 1 status
+        }
+        set tmp {}
+        foreach {name info} $matches {
+            add_to_portlist tmp [concat [list name $name] $info]
+        }
+        set res [opUnion $res $tmp]
+        if {[catch {set matches [mportsearch "*$portname*" no glob long_description]} result]} {
+            global errorInfo
+            ui_debug "$errorInfo"
+            break_softcontinue "search for long_description $portname failed: $result" 1 status
+        }
+        set tmp {}
+        foreach {name info} $matches {
+            add_to_portlist tmp [concat [list name $name] $info]
+        }
+        set res [opUnion $res $tmp]
+        set res [portlist_sort $res]
+
         set joiner ""
-        foreach {name array} $res {
+        foreach info $res {
             array unset portinfo
-            array set portinfo $array
+            array set portinfo $info
 
             # XXX is this the right place to verify an entry?