X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=GitLogParser.js;h=8c13ff40051b4ab5ab82552d0d07a58b56aaf8ad;hp=11411768fe70d4e3dd7792f558fad2f22c8f6ad8;hb=refs%2Fheads%2Fwip_alan_T5782_messing_around_with_libgit2glib;hpb=60b288f862593c12b52ab0b08ea8ad90d0e27756

diff --git a/GitLogParser.js b/GitLogParser.js
index 11411768..8c13ff40 100644
--- a/GitLogParser.js
+++ b/GitLogParser.js
@@ -182,10 +182,10 @@ GitLogParser = {
     },
     
     regexes : {
-        'HPA' : [ /web.hpasite/, /Roo Application Builder - Site/, /HP Intranet/ ],
+        'HPA' : [ /web.hpasite/, /Roo Application Builder - Site/, /HP Intranet/, /Hpasite/ ],
         'MediaOut' : [ /app\.WorkerBee/, /web\.MediaOut/, /workerbee/,
                         /media-outreach/ , /Press Release Image Portal/, /Media Outreach Feed/ , /PressRelease/,
-                        /Clipping Portal/,
+                        /Clipping Portal/, /Media OutReach/,
                         /Auto Searching/ , // These are the excel files they send over..
                         /sitemap\.xml/,
                         /Builder - Clipping/
@@ -196,15 +196,32 @@ GitLogParser = {
         'RIS' : [ /Project web.Ris/ , /RIS HK/ , /Hydra/, /hydrajobs/ ],
         // for who thoug...
         'Mailfort' : [ /web.FlexySpam/ ],
+        'Emily' : [ /greengarden/ ,/Inventory \| Warehouse/, /Emily/ ],
+        'GPUK' : [/gp-wordpress/, /Greenpeace UK/], 
         
-        'COBA'  : [/Veridate Financial/, /web\.coba/, /COBA/ ],
-        
-        'Unknown Project' : [ /PAC/ , /Guake/ , /WhatsApp/ ],
+        'COBA'  : [/Veridate/, /web\.coba/, /COBA/ ,/Pipeline - DS view/, /Coba/, /Pman.BAdmin/ , /SoapUI/ ],
+        'Regulation Asia' : [/Regulation Asia/, /comocracy/],
+        'Unknown Project' : [ /PAC/ , /Guake/ , /WhatsApp/ ,/Mozilla Thunderbird/],
         'Admin Work' : [ /roojs.com\/admin/, /RooJSolutions Management Portal/ ]
             
          
     },
     
+    match_project : function(line) {
+        for(var proj in this.regexes) {
+            for(var r in this.regexes[proj]) {
+                if (line.match(this.regexes[proj][r])) {
+                    //print("Match " + proj + " on " + r + ret.line + )
+                    return  proj;
+
+                }
+            }
+            
+        }
+        return "Unknown";
+    },
+    
+    
     '/usr/bin/perl' : function(ret) {
         if (ret.title.match(/^PAC/)) {
             ret.project = 'Unknown';
@@ -281,7 +298,7 @@ for (var h in res) {
         
                 for (var k in res[h][p].items) {
                      
-                    print( '     ' + Math.floor(res[h][p].items[k]/60000) +'m ' + k );
+                    print( '     ' +   Math.floor(res[h][p].items[k]/60000) +'m ' + k );
                          
                 }
             } else {
@@ -317,7 +334,9 @@ for (var h in GitLogParser.shours) {
     hsum.sort(function(a,b) { if (a.tot == b.tot) { return 0; } return a.tot < b.tot ? 1 : -1 });
     print("\n\n" + h+': Total (' + htot +')');
     hsum.forEach(function(r) {
-        print ("  " + r.tot + "   : " + r.desc);
+        var pr = r.desc.match(/IDLE/) ? '' : (GitLogParser.match_project(r.desc) == "Unknown" ? '??? - ' : '');
+        
+        print ("  " + r.tot + "   : " + pr +   r.desc);
     });
 }