GitLogParser.js

[gitlive] / GitLogParser.js

diff --git a/GitLogParser.js b/GitLogParser.js
index 5d28dfa..807f98f 100644 (file)
--- a/GitLogParser.js
+++ b/GitLogParser.js
@@ -84,11 +84,12 @@ GitLogParser = {
             
             hours[-1] = (typeof(hours[-1]) == 'undefined') ? {} : hours[-1];
             hours[-1][project] = (typeof(hours[-1][project]) == 'undefined') ? 
-                    { total : 0, items : [] } 
+                    { total : 0, items : {} } 
                     : hours[-1][project];
             
             hours[-1][project].total += line.span;
-            hours[-1][project].items.push(line);
+            hours[-1][project].items[line.desc] = (typeof(hours[-1][project].items[line.desc]) == 'undefined' ?
+                0 : hours[-1][project].items[line.desc]) + line.span;
             
             shours[hour] = (typeof(shours[hour]) == 'undefined') ? {} : shours[hour];
             shours[hour][line.desc] = (typeof(shours[hour][line.desc] ) == 'undefined') ? 0 : shours[hour][line.desc] ;
@@ -145,7 +146,8 @@ GitLogParser = {
         
         for(var proj in this.regexes) {
             for(var r in this.regexes[proj]) {
-                if (ret.line.match(r)) {
+                if (ret.line.match(this.regexes[proj][r])) {
+                    //print("Match " + proj + " on " + r + ret.line + )
                     ret.project = proj;
                     break;
                 }
@@ -263,7 +265,7 @@ for (var h in res) {
             
             for (var k in res[h][p].items) {
                  
-                print( '     ' + Math.floor(res[h][p].items[k].span/60000) +'m ' + res[h][p].items[k].line );
+                print( '     ' + Math.floor(res[h][p].items[k]/60000) +'m ' + k );
                      
             }
         }