X-Git-Url: http://nitlanguage.org

diff --git a/src/nitcatalog.nit b/src/nitcatalog.nit
index 3ff0da9..42dc5dd 100644
--- a/src/nitcatalog.nit
+++ b/src/nitcatalog.nit
@@ -320,7 +320,8 @@ redef class Catalog
 		if errors > 0 then
 			res.add "<li>{errors} errors</li>\n"
 		end
-		res.add "<li>{warnings[mpackage]} warnings</li>\n"
+		res.add "<li>{warnings[mpackage]} warnings ({warnings_per_kloc[mpackage]}/kloc)</li>\n"
+		res.add "<li>{documentation_score[mpackage]}% documented</li>\n"
 		res.add "</ul>\n"
 
 		res.add "<h3>Tags</h3>\n"
@@ -484,6 +485,8 @@ redef class Catalog
 		res.add "<th data-field=\"score\" data-sortable=\"true\">score</th>\n"
 		res.add "<th data-field=\"errors\" data-sortable=\"true\">errors</th>\n"
 		res.add "<th data-field=\"warnings\" data-sortable=\"true\">warnings</th>\n"
+		res.add "<th data-field=\"warnings_per_kloc\" data-sortable=\"true\">w/kloc</th>\n"
+		res.add "<th data-field=\"doc\" data-sortable=\"true\">doc</th>\n"
 		res.add "</tr></thead>"
 		for p in mpackages do
 			res.add "<tr>"
@@ -505,6 +508,8 @@ redef class Catalog
 			res.add "<td>{score[p]}</td>"
 			res.add "<td>{errors[p]}</td>"
 			res.add "<td>{warnings[p]}</td>"
+			res.add "<td>{warnings_per_kloc[p]}</td>"
+			res.add "<td>{documentation_score[p]}</td>"
 			res.add "</tr>\n"
 		end
 		res.add "</table>\n"
@@ -556,10 +561,16 @@ end
 
 # Get files or groups
 var args = tc.option_context.rest
+var mmodules
 if opt_no_parse.value then
-	modelbuilder.scan_full(args)
+	mmodules = modelbuilder.scan_full(args)
 else
-	modelbuilder.parse_full(args)
+	mmodules = modelbuilder.parse_full(args)
+end
+var mpackages = new Set[MPackage]
+for m in mmodules do
+	var p = m.mpackage
+	if p != null then mpackages.add p
 end
 
 # Scan packages and compute information
@@ -581,7 +592,7 @@ for p in model.mpackages do
 	end
 end
 
-if not opt_no_git.value then for p in model.mpackages do
+if not opt_no_git.value then for p in mpackages do
 	catalog.git_info(p)
 end
 
@@ -698,7 +709,7 @@ css.write_to_file(out/"style.css")
 
 # PAGES
 
-for p in model.mpackages do
+for p in mpackages do
 	# print p
 	var f = "p/{p.name}.html"
 	catalog.package_page(p)
@@ -721,7 +732,7 @@ index.add catalog.list_best(catalog.score)
 if catalog.deps.not_empty then
 	index.add "<h2>Most Required</h2>\n"
 	var reqs = new Counter[MPackage]
-	for p in model.mpackages do
+	for p in mpackages do
 		reqs[p] = catalog.deps[p].smallers.length - 1
 	end
 	index.add catalog.list_best(reqs)
@@ -738,7 +749,7 @@ index.add """
 <div class="sidebar">
 <h3>Stats</h3>
 <ul class="box">
-<li>{{{model.mpackages.length}}} packages</li>
+<li>{{{mpackages.length}}} packages</li>
 <li>{{{catalog.maint2proj.length}}} maintainers</li>
 <li>{{{catalog.contrib2proj.length}}} contributors</li>
 <li>{{{catalog.tag2proj.length}}} tags</li>
@@ -770,6 +781,6 @@ page = catalog.new_page("")
 page.more_head.add "<title>Projets of Nit</title>"
 page.add """<div class="content">\n<h1>People of Nit</h1>\n"""
 page.add "<h2>Table of Projets</h2>\n"
-page.add catalog.table_packages(model.mpackages)
+page.add catalog.table_packages(mpackages.to_a)
 page.add "</div>\n"
 page.write_to_file(out/"table.html")