<!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>[137531] 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/137531">137531</a></dd>
<dt>Author</dt> <dd>ijackson@macports.org</dd>
<dt>Date</dt> <dd>2015-06-13 12:03:58 -0700 (Sat, 13 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Code clean-up and adding comments
Removed comments that were used for testing and
printing the variable contents. Add comments before
procedures and add a To-do list in the comment.
Also add comments regarding the libsolv related variables
and procedures.</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 (137530 => 137531)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc15-dependency/base/src/macports1.0/macports_libsolv.tcl 2015-06-13 18:44:16 UTC (rev 137530)
+++ branches/gsoc15-dependency/base/src/macports1.0/macports_libsolv.tcl 2015-06-13 19:03:58 UTC (rev 137531)
</span><span class="lines">@@ -35,21 +35,12 @@
</span><span class="cx"> # Load solv.dylib, bindings for libsolv
</span><span class="cx"> package require solv
</span><span class="cx">
</span><del>-## Testing solv.dylib
-#global solv::Job_SOLVER_SOLVABLE
-
-
-#set pool [solv::Pool]
-#puts $pool
-
</del><span class="cx"> namespace eval macports::libsolv {
</span><span class="cx">
</span><del>- ## Variable to keep check if libsolv cache is created or not.
- # variable libsolv_pool
-
</del><span class="cx"> ## Variable for pool
</span><span class="cx"> variable pool
</span><span class="cx">
</span><ins>+ ## Some debugging related printing of variable contents
</ins><span class="cx"> proc print {} {
</span><span class="cx"> variable pool
</span><span class="cx"> puts $solv::Job_SOLVER_SOLVABLE
</span><span class="lines">@@ -62,26 +53,32 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ ## Procedure to create the libsolv pool. This is similar to PortIndex. \
+ # Read the PortIndex contents and write into libsolv readable solv's.
+ # To Do:
+ # Add additional information regarding version, description, dependency, etc to solv.
</ins><span class="cx"> proc create_pool {} {
</span><span class="cx"> variable pool
</span><span class="cx">
</span><ins>+ ## Check if libsolv cache (pool) is already created or not.
</ins><span class="cx"> if {![info exists pool]} {
</span><span class="cx"> global macports::sources
</span><span class="cx"> set matches [list]
</span><span class="cx">
</span><ins>+ ## Create a new pool instance by calling Pool contructor.
</ins><span class="cx"> set pool [solv::Pool]
</span><span class="cx">
</span><span class="cx"> foreach source $sources {
</span><span class="cx"> set source [lindex $source 0]
</span><ins>+ ## Add a repo in the pool for each source as mentioned in sources.conf
</ins><span class="cx"> set repo [$pool add_repo $source]
</span><span class="cx">
</span><span class="cx"> if {[catch {set fd [open [macports::getindex $source] r]} result]} {
</span><span class="cx"> ui_warn "Can't open index file for source: $source"
</span><span class="cx"> } else {
</span><span class="cx"> try {
</span><del>- #incr found 1
</del><span class="cx"> while {[gets $fd line] >= 0} {
</span><del>- # Create a solvable for each port processed
</del><ins>+ # Create a solvable for each port processed.
</ins><span class="cx"> set solvable [$repo add_solvable]
</span><span class="cx">
</span><span class="cx"> array unset portinfo
</span><span class="lines">@@ -89,45 +86,37 @@
</span><span class="cx"> set len [lindex $line 1]
</span><span class="cx"> set line [read $fd $len]
</span><span class="cx">
</span><del>- #puts "\nname = ${name}\n"
</del><span class="cx"> $solvable configure -name $name
</span><del>- #puts [$solvable cget -name]
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ ## createwhatprovides creates hash over all the provides of the package \
+ # This method is necessary before we can run any lookups on provides.
</ins><span class="cx"> $pool createwhatprovides
</span><del>- # puts $pool
</del><span class="cx"> } else {
</span><span class="cx"> return {}
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ ## Search using libsolv. Needs some more work.
+ # To Do list:
+ # Add support for search options i.e. --exact, --case-sensitive, --glob, --regex.
+ # Return portinfo to mportsearch which will pass the info to port.tcl to print results.
</ins><span class="cx"> proc search {pattern} {
</span><del>- ## Search using libsolv
- # puts "pattern = $pattern"
</del><span class="cx"> variable pool
</span><del>- # $pool createwhatprovides
</del><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]]
- # puts "$pool Dataiterator $solv::SOLVABLE_NAME $pattern [expr $solv::Dataiterator_SEARCH_GLOB | $solv::Dataiterator_SEARCH_NOCASE]"
</del><ins>+ set di [$pool Dataiterator $solv::SOLVABLE_NAME $pattern \
+ [expr $solv::Dataiterator_SEARCH_GLOB | $solv::Dataiterator_SEARCH_NOCASE]]
</ins><span class="cx">
</span><span class="cx"> while {[set data [$di __next__]] ne "NULL"} {
</span><del>- # puts "data = $data"
- # puts [$data cget -solvid]
</del><span class="cx"> $sel add_raw $solv::Job_SOLVER_SOLVABLE [$data cget -solvid]
</span><del>- # puts [$sel __repr__]
</del><span class="cx"> }
</span><span class="cx">
</span><ins>+ ## This prints all the solvable's information that matched the pattern.
</ins><span class="cx"> foreach s [$sel solvables] {
</span><span class="cx"> puts "solvable = $s [$s __str__]"
</span><span class="cx"> }
</span><del>-
- #if{[info exists sel]} {
- # puts "$pattern found by libsolv"
- #} else {
- # puts "$pattern not found by libsolv"
- #}
</del><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>