svn: /web/php-rmtools/trunk/ docroot/rm/json.php include/Base.php include/Storage.php template/menu.php template/revision_list_yui_extra_head.php

pajoye Mon, 11 Jan 2010 17:04:30 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=293412 Log: - time to enable multiple branches Changed paths: U web/php-rmtools/trunk/docroot/rm/json.php U web/php-rmtools/trunk/include/Base.php U web/php-rmtools/trunk/include/Storage.php U web/php-rmtools/trunk/template/menu.php U web/php-rmtools/trunk/template/revision_list_yui_extra_head.php Modified: web/php-rmtools/trunk/docroot/rm/json.php =================================================================== --- web/php-rmtools/trunk/docroot/rm/json.php 2010-01-11 16:51:32 UTC (rev 293411) +++ web/php-rmtools/trunk/docroot/rm/json.php 2010-01-11 17:04:30 UTC (rev 293412) @@ -6,8 +6,8 @@ include 'Base.php'; use rmtools as rm; - -$svn = new rm\Storage('5.3.2'); +$release_name = filter_input(INPUT_GET, 'release', FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); +$svn = new rm\Storage($release_name); $json = $svn->exportAsJson(); //$json = '{"replyCode":201, "replyText":"Data follows","data": ' . $json . '}'; Modified: web/php-rmtools/trunk/include/Base.php =================================================================== --- web/php-rmtools/trunk/include/Base.php 2010-01-11 16:51:32 UTC (rev 293411) +++ web/php-rmtools/trunk/include/Base.php 2010-01-11 17:04:30 UTC (rev 293412) @@ -103,6 +103,7 @@ if (sqlite_num_rows($res) == 0) { Throw new \Exception($release . ' not found.'); } + return sqlite_fetch_array($res); } @@ -116,6 +117,12 @@ if (sqlite_num_rows($res) == 0) { Throw new \Exception($rm . ' not found.'); } - return sqlite_fetch_array($res, SQLITE_ASSOC); + $rel = sqlite_fetch_all($res, SQLITE_NUM); + $releases = array(); + foreach ($rel as $v) { + $releases[] = $v[0]; + } + + return $releases; } } Modified: web/php-rmtools/trunk/include/Storage.php =================================================================== --- web/php-rmtools/trunk/include/Storage.php 2010-01-11 16:51:32 UTC (rev 293411) +++ web/php-rmtools/trunk/include/Storage.php 2010-01-11 17:04:30 UTC (rev 293412) @@ -119,6 +119,7 @@ } else { $snaps_archive_name = $filename; } + $now = date(DATE_RFC822); $text = " PHP source snapshot generated on $now. The last revision in this snap is @@ -150,6 +151,10 @@ } function getAll() { + /* Test if we actually have a separate branch for the release phases */ + if ($this->release['release_branch'] == $this->release['dev_branch']) { + return NULL; + } $res = sqlite_query($this->db, 'SELECT * FROM revision ORDER by revision', SQLITE_ASSOC); if ($res && sqlite_num_rows($res) > 0) { return sqlite_fetch_all($res); Modified: web/php-rmtools/trunk/template/menu.php =================================================================== --- web/php-rmtools/trunk/template/menu.php 2010-01-11 16:51:32 UTC (rev 293411) +++ web/php-rmtools/trunk/template/menu.php 2010-01-11 17:04:30 UTC (rev 293412) @@ -1,10 +1,11 @@ <body> <h1><?php echo "Tasks for RM: $username";?><br /></h1> <?php foreach ($releases as $release_name) { ?> -<?php $release = $base->getRelease($release_name);?> +<?php $release = $base->getRelease($release_name); ?> <h2>Release <?php echo $release_name; ?><br /></h2> <ul> <li><a href="index.php?mode=list&release=<?php echo $release_name; ?>">Merges (updated on <?php echo $release['last_update'];?>)</a></li> <li><a href="index.php?mode=list&nojs=1">Merges (no js)</a></li> <li><a href="">Builds</a></li> +</ul> <?php } ?> Modified: web/php-rmtools/trunk/template/revision_list_yui_extra_head.php =================================================================== --- web/php-rmtools/trunk/template/revision_list_yui_extra_head.php 2010-01-11 16:51:32 UTC (rev 293411) +++ web/php-rmtools/trunk/template/revision_list_yui_extra_head.php 2010-01-11 17:04:30 UTC (rev 293412) @@ -117,7 +117,7 @@ {key:"news", resizeable: true, width:300} ]; - var ds = new YAHOO.util.DataSource("/rm/json.php?"); + var ds = new YAHOO.util.DataSource("/rm/json.php?release=<?php echo $release_name; ?>"); ds.responseType = YAHOO.util.DataSource.TYPE_JSON; ds.connXhrMode = "queueRequests"; ds.responseSchema = {