<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[137549] branches/gsoc15-dependency/base/src/macports1.0/macports_libsolv.tcl</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/137549">137549</a></dd>
<dt>Author</dt> <dd>ijackson@macports.org</dd>
<dt>Date</dt> <dd>2015-06-14 03:47:34 -0700 (Sun, 14 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add support for search options in libsolv search engine.
Now libsolv search support options passed to search
i.e. --exact, --glob, --regex, --case-sensitive.
First check for $matchstyle inside switch and set the flag to
value corresponding to the option. Then check for case_sensitive,
If case-sensitive is not passed then Binary OR with the
initialized flag. We do not keep a if{$case_sensitive} block in each
switch case like the builtin engine as the flag value in libsolv
can be Binary OR'ed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesgsoc15dependencybasesrcmacports10macports_libsolvtcl">branches/gsoc15-dependency/base/src/macports1.0/macports_libsolv.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesgsoc15dependencybasesrcmacports10macports_libsolvtcl"></a>
<div class="modfile"><h4>Modified: branches/gsoc15-dependency/base/src/macports1.0/macports_libsolv.tcl (137548 => 137549)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc15-dependency/base/src/macports1.0/macports_libsolv.tcl 2015-06-14 08:09:38 UTC (rev 137548)
+++ branches/gsoc15-dependency/base/src/macports1.0/macports_libsolv.tcl 2015-06-14 10:47:34 UTC (rev 137549)
</span><span class="lines">@@ -101,15 +101,37 @@
</span><span class="cx">
</span><span class="cx"> ## Search using libsolv. Needs some more work.
</span><span class="cx"> # To Do list:
</span><ins>+ # Return portinfo to mportsearch which will pass the info to port.tcl to print results.
+ # Done:
</ins><span class="cx"> # Add support for search options i.e. --exact, --case-sensitive, --glob, --regex.
</span><del>- # Return portinfo to mportsearch which will pass the info to port.tcl to print results.
</del><span class="cx"> proc search {pattern {case_sensitive yes} {matchstyle regexp} } {
</span><span class="cx"> variable pool
</span><span class="cx">
</span><span class="cx"> set sel [$pool Selection]
</span><del>- set di [$pool Dataiterator $solv::SOLVABLE_NAME $pattern \
- [expr $solv::Dataiterator_SEARCH_GLOB | $solv::Dataiterator_SEARCH_NOCASE]]
</del><ins>+
+ ## Initialize search option flag depending on the option passed to port search
+ switch -- $matchstyle {
+ exact {
+ set di_flag [expr $solv::Dataiterator_SEARCH_STRING]
+ }
+ glob {
+ set di_flag [expr $solv::Dataiterator_SEARCH_GLOB]
+ }
+ regexp {
+ set di_flag [expr $solv::Dataiterator_SEARCH_REGEX]
+ }
+ default {
+ return -code error "mportsearch: Unsupported matching style: ${matchstyle}."
+ }
+ }
</ins><span class="cx">
</span><ins>+ ## If --case-sensitive is not passed, Binary OR "|" with no_case flag.
+ if {!${case_sensitive}} {
+ set di_flag [expr $di_flag | $solv::Dataiterator_SEARCH_NOCASE]
+ }
+
+ set di [$pool Dataiterator $solv::SOLVABLE_NAME $pattern $di_flag]
+
</ins><span class="cx"> while {[set data [$di __next__]] ne "NULL"} {
</span><span class="cx"> $sel add_raw $solv::Job_SOLVER_SOLVABLE [$data cget -solvid]
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>