incubator-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r706023 - in /incubator/public/trunk: clutch.py site-author/clutch.xml site-publish/clutch.html
Date Sun, 19 Oct 2008 14:45:56 GMT
Author: crossley
Date: Sun Oct 19 07:45:56 2008
New Revision: 706023

URL: http://svn.apache.org/viewvc?rev=706023&view=rev
Log:
Fix calculation of elapsedDays. Allow for null day value (as in Thrift status).
Was going to use inline "expression if expression else expression", but that is
python-2.5

Modified:
    incubator/public/trunk/clutch.py
    incubator/public/trunk/site-author/clutch.xml
    incubator/public/trunk/site-publish/clutch.html

Modified: incubator/public/trunk/clutch.py
URL: http://svn.apache.org/viewvc/incubator/public/trunk/clutch.py?rev=706023&r1=706022&r2=706023&view=diff
==============================================================================
--- incubator/public/trunk/clutch.py (original)
+++ incubator/public/trunk/clutch.py Sun Oct 19 07:45:56 2008
@@ -215,10 +215,12 @@
 
   match = re.search(startDateRE, projects[k]['startDate'])
   if match:
+    if match.group(3) != None:
+      entryDateDay = int(match.group(3))
+    else:
+      entryDateDay = 1
     try:
-      # FIXME: Deal with optional "day", e.g. Thrift "2008-05"
-      #        - use "if-then-else" expression (ternary)
-      entryDate = datetime.datetime(int(match.group(1)), int(match.group(2)), 1)
+      entryDate = datetime.datetime(int(match.group(1)), int(match.group(2)), entryDateDay)
       projects[k]['elapsedDays'] = (gatherDate-entryDate).days
     except ValueError:
       print 'ERROR: %s: ValueError with date' % k

Modified: incubator/public/trunk/site-author/clutch.xml
URL: http://svn.apache.org/viewvc/incubator/public/trunk/site-author/clutch.xml?rev=706023&r1=706022&r2=706023&view=diff
==============================================================================
--- incubator/public/trunk/site-author/clutch.xml (original)
+++ incubator/public/trunk/site-author/clutch.xml Sun Oct 19 07:45:56 2008
@@ -81,7 +81,7 @@
         </li>
       </ul>
       <p>
-        Clutch last gathered: Sun Oct 19 10:26:06 2008 UTC.<br />
+        Clutch last gathered: Sun Oct 19 14:32:51 2008 UTC.<br />
         Number of podlings in incubation: 36
       </p>
       <table id="clutch">
@@ -104,7 +104,7 @@
           <td>Abdera</td>
           <td>Incubator</td>
           <td>2006-06-06</td>
-          <td class="cool4">871</td>
+          <td class="cool4">866</td>
           <td>False</td>
           <td>group-2</td>
           <td>True</td>
@@ -119,7 +119,7 @@
           <td>BlueSky</td>
           <td>Incubator</td>
           <td>2008-01-12</td>
-          <td class="cool2">292</td>
+          <td class="cool2">281</td>
           <td class="care">True</td>
           <td>month</td>
           <td class="issue">False</td>
@@ -149,7 +149,7 @@
           <td>Click</td>
           <td>Incubator</td>
           <td>2008-07-21</td>
-          <td class="cool1">110</td>
+          <td class="cool1">90</td>
           <td class="care">True</td>
           <td>month</td>
           <td class="issue">False</td>
@@ -164,7 +164,7 @@
           <td>Composer</td>
           <td>Incubator</td>
           <td>2007-11-17</td>
-          <td class="cool2">353</td>
+          <td class="cool2">337</td>
           <td>False</td>
           <td>group-3</td>
           <td>True</td>
@@ -179,7 +179,7 @@
           <td>CouchDB</td>
           <td>Incubator</td>
           <td>2008-02-12</td>
-          <td class="cool1">261</td>
+          <td class="cool1">250</td>
           <td>False</td>
           <td>group-2</td>
           <td>True</td>
@@ -209,7 +209,7 @@
           <td>Empire-db</td>
           <td>Incubator</td>
           <td>2008-07-08</td>
-          <td class="cool1">110</td>
+          <td class="cool1">103</td>
           <td class="care">True</td>
           <td>group-3</td>
           <td>True</td>
@@ -224,7 +224,7 @@
           <td>Etch</td>
           <td>Incubator</td>
           <td>2008-09-02</td>
-          <td class="cool1">48</td>
+          <td class="cool1">47</td>
           <td class="care">True</td>
           <td>group-3</td>
           <td>True</td>
@@ -239,7 +239,7 @@
           <td>Hama</td>
           <td>Incubator</td>
           <td>2008-05-20</td>
-          <td class="cool1">171</td>
+          <td class="cool1">152</td>
           <td class="care">True</td>
           <td>group-3</td>
           <td>True</td>
@@ -254,7 +254,7 @@
           <td>Imperius</td>
           <td>Incubator</td>
           <td>2007-11-10</td>
-          <td class="cool2">353</td>
+          <td class="cool2">344</td>
           <td>False</td>
           <td>group-1</td>
           <td>True</td>
@@ -269,7 +269,7 @@
           <td>JSecurity</td>
           <td>Incubator</td>
           <td>2008-05-20</td>
-          <td class="cool1">171</td>
+          <td class="cool1">152</td>
           <td class="care">True</td>
           <td>group-1</td>
           <td>True</td>
@@ -284,7 +284,7 @@
           <td>JSPWiki</td>
           <td>Incubator</td>
           <td>2007-09-17</td>
-          <td class="cool2">414</td>
+          <td class="cool2">398</td>
           <td>False</td>
           <td>group-1</td>
           <td>True</td>
@@ -299,7 +299,7 @@
           <td>log4php</td>
           <td>Logging Services</td>
           <td>2004-01-31</td>
-          <td class="cool4">1753</td>
+          <td class="cool4">1723</td>
           <td>False</td>
           <td>group-3</td>
           <td>True</td>
@@ -329,7 +329,7 @@
           <td>Lucene.Net</td>
           <td>Lucene</td>
           <td>2006-03-15</td>
-          <td class="cool4">963</td>
+          <td class="cool4">949</td>
           <td>False</td>
           <td>group-1</td>
           <td>True</td>
@@ -344,7 +344,7 @@
           <td>NMaven</td>
           <td>Maven</td>
           <td>2006-11-17</td>
-          <td class="cool3">718</td>
+          <td class="cool3">702</td>
           <td>False</td>
           <td>group-2</td>
           <td>True</td>
@@ -359,7 +359,7 @@
           <td>Olio</td>
           <td>Incubator</td>
           <td>2008-09-29</td>
-          <td class="cool1">48</td>
+          <td class="cool1">20</td>
           <td class="care">True</td>
           <td>group-1</td>
           <td>True</td>
@@ -374,7 +374,7 @@
           <td>PDFBox</td>
           <td>Incubator</td>
           <td>2008-02-07</td>
-          <td class="cool1">261</td>
+          <td class="cool1">255</td>
           <td>False</td>
           <td>group-2</td>
           <td>True</td>
@@ -389,7 +389,7 @@
           <td>PhotArk</td>
           <td>Incubator</td>
           <td>2008-08-19</td>
-          <td class="cool1">79</td>
+          <td class="cool1">61</td>
           <td class="care">True</td>
           <td>month</td>
           <td class="issue">False</td>
@@ -404,7 +404,7 @@
           <td>Pig</td>
           <td>Incubator</td>
           <td>2007-10-02</td>
-          <td class="cool2">384</td>
+          <td class="cool2">383</td>
           <td>False</td>
           <td>group-3</td>
           <td>True</td>
@@ -419,7 +419,7 @@
           <td>Qpid</td>
           <td>Incubator</td>
           <td>2006-08-27</td>
-          <td class="cool3">810</td>
+          <td class="cool3">784</td>
           <td>False</td>
           <td>group-1</td>
           <td>True</td>
@@ -434,7 +434,7 @@
           <td>RAT</td>
           <td>Incubator</td>
           <td>2008-01-06</td>
-          <td class="cool2">292</td>
+          <td class="cool2">287</td>
           <td>False</td>
           <td>group-3</td>
           <td>True</td>
@@ -449,7 +449,7 @@
           <td>RCF</td>
           <td>MyFaces</td>
           <td>2007-04-06</td>
-          <td class="cool3">567</td>
+          <td class="cool3">562</td>
           <td>False</td>
           <td>group-1</td>
           <td>True</td>
@@ -464,7 +464,7 @@
           <td>River</td>
           <td>Incubator</td>
           <td>2006-12-26</td>
-          <td class="cool3">688</td>
+          <td class="cool3">663</td>
           <td>False</td>
           <td>group-3</td>
           <td>True</td>
@@ -479,7 +479,7 @@
           <td>Sanselan</td>
           <td>Incubator</td>
           <td>2007-09-09</td>
-          <td class="cool2">414</td>
+          <td class="cool2">406</td>
           <td>False</td>
           <td>group-1</td>
           <td>True</td>
@@ -494,7 +494,7 @@
           <td>Shindig</td>
           <td>Incubator</td>
           <td>2007-12-03</td>
-          <td class="cool2">323</td>
+          <td class="cool2">321</td>
           <td>False</td>
           <td>group-3</td>
           <td>True</td>
@@ -509,7 +509,7 @@
           <td>Sling</td>
           <td>Jackrabbit</td>
           <td>2007-09-09</td>
-          <td class="cool2">414</td>
+          <td class="cool2">406</td>
           <td>False</td>
           <td>group-2</td>
           <td>True</td>
@@ -554,7 +554,7 @@
           <td>Tika</td>
           <td>Lucene</td>
           <td>2007-03-22</td>
-          <td class="cool3">598</td>
+          <td class="cool3">577</td>
           <td>False</td>
           <td>group-1</td>
           <td>True</td>
@@ -584,7 +584,7 @@
           <td>UIMA</td>
           <td>Incubator</td>
           <td>2006-10-23</td>
-          <td class="cool3">749</td>
+          <td class="cool3">727</td>
           <td>False</td>
           <td>group-1</td>
           <td>True</td>
@@ -599,7 +599,7 @@
           <td>VCL</td>
           <td>Incubator</td>
           <td>2008-10-06</td>
-          <td class="cool1">18</td>
+          <td class="cool1">13</td>
           <td class="care">True</td>
           <td>group-1</td>
           <td>True</td>
@@ -614,7 +614,7 @@
           <td>WSRP4J</td>
           <td>Portals</td>
           <td>2003-09-03</td>
-          <td class="cool4">1875</td>
+          <td class="cool4">1873</td>
           <td>False</td>
           <td>group-2</td>
           <td>True</td>
@@ -629,7 +629,7 @@
           <td>XAP</td>
           <td>Incubator</td>
           <td>2006-05-22</td>
-          <td class="cool4">902</td>
+          <td class="cool4">881</td>
           <td>False</td>
           <td>group-2</td>
           <td>True</td>

Modified: incubator/public/trunk/site-publish/clutch.html
URL: http://svn.apache.org/viewvc/incubator/public/trunk/site-publish/clutch.html?rev=706023&r1=706022&r2=706023&view=diff
==============================================================================
--- incubator/public/trunk/site-publish/clutch.html (original)
+++ incubator/public/trunk/site-publish/clutch.html Sun Oct 19 07:45:56 2008
@@ -166,7 +166,7 @@
         </li>
       </ul>
 <p>
-        Clutch last gathered: Sun Oct 19 10:26:06 2008 UTC.<br />
+        Clutch last gathered: Sun Oct 19 14:32:51 2008 UTC.<br />
         Number of podlings in incubation: 36
       </p>
 <table id="clutch" class="colortable" width="100%">
@@ -189,7 +189,7 @@
           <td>Abdera</td>
           <td>Incubator</td>
           <td>2006-06-06</td>
-          <td class="cool4">871</td>
+          <td class="cool4">866</td>
           <td>False</td>
           <td>group-2</td>
           <td>True</td>
@@ -204,7 +204,7 @@
           <td>BlueSky</td>
           <td>Incubator</td>
           <td>2008-01-12</td>
-          <td class="cool2">292</td>
+          <td class="cool2">281</td>
           <td class="care">True</td>
           <td>month</td>
           <td class="issue">False</td>
@@ -234,7 +234,7 @@
           <td>Click</td>
           <td>Incubator</td>
           <td>2008-07-21</td>
-          <td class="cool1">110</td>
+          <td class="cool1">90</td>
           <td class="care">True</td>
           <td>month</td>
           <td class="issue">False</td>
@@ -249,7 +249,7 @@
           <td>Composer</td>
           <td>Incubator</td>
           <td>2007-11-17</td>
-          <td class="cool2">353</td>
+          <td class="cool2">337</td>
           <td>False</td>
           <td>group-3</td>
           <td>True</td>
@@ -264,7 +264,7 @@
           <td>CouchDB</td>
           <td>Incubator</td>
           <td>2008-02-12</td>
-          <td class="cool1">261</td>
+          <td class="cool1">250</td>
           <td>False</td>
           <td>group-2</td>
           <td>True</td>
@@ -294,7 +294,7 @@
           <td>Empire-db</td>
           <td>Incubator</td>
           <td>2008-07-08</td>
-          <td class="cool1">110</td>
+          <td class="cool1">103</td>
           <td class="care">True</td>
           <td>group-3</td>
           <td>True</td>
@@ -309,7 +309,7 @@
           <td>Etch</td>
           <td>Incubator</td>
           <td>2008-09-02</td>
-          <td class="cool1">48</td>
+          <td class="cool1">47</td>
           <td class="care">True</td>
           <td>group-3</td>
           <td>True</td>
@@ -324,7 +324,7 @@
           <td>Hama</td>
           <td>Incubator</td>
           <td>2008-05-20</td>
-          <td class="cool1">171</td>
+          <td class="cool1">152</td>
           <td class="care">True</td>
           <td>group-3</td>
           <td>True</td>
@@ -339,7 +339,7 @@
           <td>Imperius</td>
           <td>Incubator</td>
           <td>2007-11-10</td>
-          <td class="cool2">353</td>
+          <td class="cool2">344</td>
           <td>False</td>
           <td>group-1</td>
           <td>True</td>
@@ -354,7 +354,7 @@
           <td>JSecurity</td>
           <td>Incubator</td>
           <td>2008-05-20</td>
-          <td class="cool1">171</td>
+          <td class="cool1">152</td>
           <td class="care">True</td>
           <td>group-1</td>
           <td>True</td>
@@ -369,7 +369,7 @@
           <td>JSPWiki</td>
           <td>Incubator</td>
           <td>2007-09-17</td>
-          <td class="cool2">414</td>
+          <td class="cool2">398</td>
           <td>False</td>
           <td>group-1</td>
           <td>True</td>
@@ -384,7 +384,7 @@
           <td>log4php</td>
           <td>Logging Services</td>
           <td>2004-01-31</td>
-          <td class="cool4">1753</td>
+          <td class="cool4">1723</td>
           <td>False</td>
           <td>group-3</td>
           <td>True</td>
@@ -414,7 +414,7 @@
           <td>Lucene.Net</td>
           <td>Lucene</td>
           <td>2006-03-15</td>
-          <td class="cool4">963</td>
+          <td class="cool4">949</td>
           <td>False</td>
           <td>group-1</td>
           <td>True</td>
@@ -429,7 +429,7 @@
           <td>NMaven</td>
           <td>Maven</td>
           <td>2006-11-17</td>
-          <td class="cool3">718</td>
+          <td class="cool3">702</td>
           <td>False</td>
           <td>group-2</td>
           <td>True</td>
@@ -444,7 +444,7 @@
           <td>Olio</td>
           <td>Incubator</td>
           <td>2008-09-29</td>
-          <td class="cool1">48</td>
+          <td class="cool1">20</td>
           <td class="care">True</td>
           <td>group-1</td>
           <td>True</td>
@@ -459,7 +459,7 @@
           <td>PDFBox</td>
           <td>Incubator</td>
           <td>2008-02-07</td>
-          <td class="cool1">261</td>
+          <td class="cool1">255</td>
           <td>False</td>
           <td>group-2</td>
           <td>True</td>
@@ -474,7 +474,7 @@
           <td>PhotArk</td>
           <td>Incubator</td>
           <td>2008-08-19</td>
-          <td class="cool1">79</td>
+          <td class="cool1">61</td>
           <td class="care">True</td>
           <td>month</td>
           <td class="issue">False</td>
@@ -489,7 +489,7 @@
           <td>Pig</td>
           <td>Incubator</td>
           <td>2007-10-02</td>
-          <td class="cool2">384</td>
+          <td class="cool2">383</td>
           <td>False</td>
           <td>group-3</td>
           <td>True</td>
@@ -504,7 +504,7 @@
           <td>Qpid</td>
           <td>Incubator</td>
           <td>2006-08-27</td>
-          <td class="cool3">810</td>
+          <td class="cool3">784</td>
           <td>False</td>
           <td>group-1</td>
           <td>True</td>
@@ -519,7 +519,7 @@
           <td>RAT</td>
           <td>Incubator</td>
           <td>2008-01-06</td>
-          <td class="cool2">292</td>
+          <td class="cool2">287</td>
           <td>False</td>
           <td>group-3</td>
           <td>True</td>
@@ -534,7 +534,7 @@
           <td>RCF</td>
           <td>MyFaces</td>
           <td>2007-04-06</td>
-          <td class="cool3">567</td>
+          <td class="cool3">562</td>
           <td>False</td>
           <td>group-1</td>
           <td>True</td>
@@ -549,7 +549,7 @@
           <td>River</td>
           <td>Incubator</td>
           <td>2006-12-26</td>
-          <td class="cool3">688</td>
+          <td class="cool3">663</td>
           <td>False</td>
           <td>group-3</td>
           <td>True</td>
@@ -564,7 +564,7 @@
           <td>Sanselan</td>
           <td>Incubator</td>
           <td>2007-09-09</td>
-          <td class="cool2">414</td>
+          <td class="cool2">406</td>
           <td>False</td>
           <td>group-1</td>
           <td>True</td>
@@ -579,7 +579,7 @@
           <td>Shindig</td>
           <td>Incubator</td>
           <td>2007-12-03</td>
-          <td class="cool2">323</td>
+          <td class="cool2">321</td>
           <td>False</td>
           <td>group-3</td>
           <td>True</td>
@@ -594,7 +594,7 @@
           <td>Sling</td>
           <td>Jackrabbit</td>
           <td>2007-09-09</td>
-          <td class="cool2">414</td>
+          <td class="cool2">406</td>
           <td>False</td>
           <td>group-2</td>
           <td>True</td>
@@ -639,7 +639,7 @@
           <td>Tika</td>
           <td>Lucene</td>
           <td>2007-03-22</td>
-          <td class="cool3">598</td>
+          <td class="cool3">577</td>
           <td>False</td>
           <td>group-1</td>
           <td>True</td>
@@ -669,7 +669,7 @@
           <td>UIMA</td>
           <td>Incubator</td>
           <td>2006-10-23</td>
-          <td class="cool3">749</td>
+          <td class="cool3">727</td>
           <td>False</td>
           <td>group-1</td>
           <td>True</td>
@@ -684,7 +684,7 @@
           <td>VCL</td>
           <td>Incubator</td>
           <td>2008-10-06</td>
-          <td class="cool1">18</td>
+          <td class="cool1">13</td>
           <td class="care">True</td>
           <td>group-1</td>
           <td>True</td>
@@ -699,7 +699,7 @@
           <td>WSRP4J</td>
           <td>Portals</td>
           <td>2003-09-03</td>
-          <td class="cool4">1875</td>
+          <td class="cool4">1873</td>
           <td>False</td>
           <td>group-2</td>
           <td>True</td>
@@ -714,7 +714,7 @@
           <td>XAP</td>
           <td>Incubator</td>
           <td>2006-05-22</td>
-          <td class="cool4">902</td>
+          <td class="cool4">881</td>
           <td>False</td>
           <td>group-2</td>
           <td>True</td>



---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@incubator.apache.org
For additional commands, e-mail: cvs-help@incubator.apache.org


Mime
View raw message