timeline: adjusted for new git layout

1 files changed, 6 insertions, 3 deletions

diff --git a/timeline/tlcacher.php b/timeline/tlcacher.php
index 24db441..8e680a2 100755
--- a/timeline/tlcacher.php
+++ b/timeline/tlcacher.php
@@ -19,7 +19,8 @@ $task_url="https://crux.nu/bugs/?do=details&id=%s";
 // Gitweb url for commits
 $git_url = "http://crux.nu/gitweb/?p=%s.git;a=commitdiff;h=%s";
 // append ":branch" to the repo name to restrict logs to 'branch'
-$git_repos = array("core:2.2","opt:2.2","xorg:2.2", "pkgutils", "prt-get", "prt-utils");
+#$git_repos = array("ports/core:2.2","ports/opt:2.2","ports/xorg:2.2", "tools/pkgutils", "tools/prt-get", "tools/prt-utils");
+$git_repos = array("ports/core:2.2","ports/opt:2.2","tools/webtools");
 $git_root = "/home/crux/scm";
 
 // Map git authors to wiki profiles
@@ -187,12 +188,14 @@ if ($chline != "") {
 /******************* Git events ***********************/
 
 foreach ($git_repos as $repo) {
-    $branch = "";
     if (strpos($repo, ":") !== FALSE) {
 		$tmp = explode(':', $repo);
     	$repo = $tmp[0];
 		$branch = $tmp[1];
 	}
+    $pos = strpos($repo, "/");
+    $reponame = substr($repo, $pos);
+    $branch = "";
     $last_git = last_cached_git($repo);
     $out = array();
     $res = 0;
@@ -230,7 +233,7 @@ foreach ($git_repos as $repo) {
                 $date = date("Y-m-d", $tstamp);
                 $time = date("H:i", $tstamp);
             } else if (trim($line) != "" && !array_key_exists($rev, $done)) {
-    			$icon = "git_commit_$repo";
+    			$icon = "git_commit_$reponame";
 	    		$notes = trim($line);
 		    	$events[] = array( 'cache_id' => $rev, 'tstamp' => $tstamp, 'icon' => $icon, 'date' => $date, 
 			        'time' => $time, 'user' => $user, 'url'=>$url, 'description' => $description, 'notes' => $notes);