Move one method and som internal data form DailyStatisticsController.java to BasicCo...

[proteocache.git] / server / compbio / controllers / BasicController.java

diff --git a/server/compbio/controllers/BasicController.java b/server/compbio/controllers/BasicController.java
index 32703aa..a714c4d 100644 (file)
--- a/server/compbio/controllers/BasicController.java
+++ b/server/compbio/controllers/BasicController.java
@@ -1,13 +1,23 @@
 package compbio.controllers;
 
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Collection;
 
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UserDetails;
 
-public class BasicController {
+import compbio.cassandra.CassandraReader;
+import compbio.cassandra.DateFormatter;
 
+public class BasicController {
+       final protected SimpleDateFormat formaterDDMMYY = DateFormatter.getFormatDDMMYY();
+       final protected SimpleDateFormat formaterYYMMDD = DateFormatter.getFormatYYMMDD();
+       protected Calendar cal = Calendar.getInstance();
+       protected String theEaerlistDate = DateFormatter.DateLongToString(CassandraReader.earliestDate(), formaterYYMMDD);
+       protected String theCurrentDate = cal.get(Calendar.YEAR) + "/" + (cal.get(Calendar.MONTH) + 1) + "/" + cal.get(Calendar.DAY_OF_MONTH);
+       
        protected String getPrincipalName() {
                Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
                if (principal instanceof UserDetails) {
@@ -55,4 +65,19 @@ public class BasicController {
                return false;
        }
        
+       protected String DateChecking(String trimmeddate1, String trimmeddate2, long longDate1, long longDate2) {
+               Calendar cal2 = Calendar.getInstance();
+               if (trimmeddate1.equalsIgnoreCase("") || trimmeddate2.equalsIgnoreCase("")) 
+                       return "The date cann't be empty";
+               else if (!DateFormatter.isThisDateValid(trimmeddate1, formaterYYMMDD) || !DateFormatter.isThisDateValid(trimmeddate2, formaterYYMMDD)) 
+                       return "The date format in invalid. Try format yyyy/mm/dd";
+               else if (longDate2 < CassandraReader.earliestDate()) 
+                       return "The date2 is after the earlestDate " + theEaerlistDate;
+               else if (longDate1 > cal2.getTimeInMillis())
+                       return "The date1 is before the current date " + theCurrentDate;
+               else if (longDate1 > longDate2)         
+                       return "Wrong date's diaposon. The date1 is more than date2.";
+               else                    
+                       return null;
+       }
 }