dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10468
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-04-03 19:22:34 +0200
message:
  Analyitcs, minor update to function determining number of processes
modified:
  dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/DefaultAnalyticsTableService.java
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/account.vm


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/DefaultAnalyticsTableService.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/DefaultAnalyticsTableService.java	2013-03-15 16:33:34 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/DefaultAnalyticsTableService.java	2013-04-03 17:22:34 +0000
@@ -79,7 +79,7 @@
     
     public void update( boolean last3YearsOnly, TaskId taskId )
     {
-        Clock clock = new Clock().startClock().logTime( "Starting update" );
+        Clock clock = new Clock().startClock().logTime( "Starting update, no of processes: " + getProcessNo() );
         
         boolean valid = tableManager.validState();
         
@@ -261,6 +261,8 @@
     
     private int getProcessNo()
     {
-        return Math.max( ( SystemUtils.getCpuCores() - 1 ), 1 );
+        int cores = SystemUtils.getCpuCores();
+        
+        return cores > 2 ? ( cores - 1 ) : cores;
     }
 }

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/account.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/account.vm	2012-11-30 18:17:32 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/account.vm	2013-04-03 17:22:34 +0000
@@ -27,8 +27,8 @@
 <table>
     <tr>
         <td style="width:140px"><label for="firstName">$i18n.getString( "name" )</label></td>
-        <td><input type="text" id="firstName" name="firstName" style="width:11.7em; margin-right:7px;" placeholder="First">
-            <input type="text" id="surname" name="surname" style="width:11.7em" placeholder="Last"></td>
+        <td><input type="text" id="firstName" name="firstName" autocomplete="off" style="width:11.7em; margin-right:7px;" placeholder="First">
+            <input type="text" id="surname" name="surname" autocomplete="off" style="width:11.7em" placeholder="Last"></td>
     </tr>
     <tr>
         <td><label for="username">$i18n.getString( "user_name" )</label></td>