Changeset 621 for pro-violet-viettel/sourcecode/application/helpers

Timestamp:

Nov 25, 2014 10:33:58 AM (10 years ago)

Author:

dungnv

Message:

 

File:

• pro-violet-viettel/sourcecode/application/helpers/lockfile_helper.php (modified) (6 diffs)

pro-violet-viettel/sourcecode/application/helpers/lockfile_helper.php

@@ -3 +3 @@
 if ( ! function_exists('createLockFile'))
 {
-        function createLockFile ($lockFilePrefix, $maxReach, $timeToUnlock, $lockFilePath = '', $checkLockOnly = 0, $colSep = '|')
+        function createLockFile ($lockFilePrefix, $maxReach, $timeToUnlock, $lockFilePath = '', $checkLockOnly = FALSE, $colSep = '|')
         {
                 $currentTimeStamp = time();
@@ -23 +23 @@
         
                 $timeDiffMin = $lastTimeLock != '' ? dateDifference(date('Y-m-d H:i:s',$currentTimeStamp), date('Y-m-d H:i:s',$lastTimeLock), '%i') : 0;
-        
-                if ($lockCount < $maxReach && $timeDiffMin < $timeToUnlock && $checkLockOnly == 0) {
+
+                if ($lockCount < $maxReach && $timeDiffMin < $timeToUnlock && !$checkLockOnly) {
                         $lockCount ++;
                         $isLocked = $lockCount < $maxReach ? 0:1;
@@ -30 +30 @@
                 }
                 else if ($timeDiffMin > $timeToUnlock) {
-                        $lockCount = 0;
+                        $lockCount = 1;
                         $isLocked = 0;
                         $ready = 1;
@@ -44 +44 @@
                 }
         
-                return $isLocked;
+                return (int)$isLocked;
         }
 }
@@ -52 +52 @@
         function releaseLockFile ($lockFilePrefix, $lockFilePath = '')
         {
-                $filePath = $lockFilePrefix.'_lock';
+                $filePath = $lockFilePath.$lockFilePrefix.'_lock';
                 $fileExisted = file_exists($filePath);
                 if ($fileExisted) {
@@ -81 +81 @@
                 $datetime2 = date_create($date_2);
 
-                $interval = date_diff($datetime1, $datetime2);
-
-                return $interval->format($differenceFormat);
-
+                $diff = date_diff($datetime1, $datetime2);
+                $total = 0;
+                switch( $differenceFormat){
+                        case "%y":
+                                $total = $diff->y + $diff->m / 12 + $diff->d / 365.25; break;
+                        case "%m":
+                                $total= $diff->y * 12 + $diff->m + $diff->d/30 + $diff->h / 24;
+                                break;
+                        case "%a":
+                                $total = $diff->y * 365.25 + $diff->m * 30 + $diff->d + $diff->h/24 + $diff->i / 60;
+                                break;
+                        case "%h":
+                                $total = ($diff->y * 365.25 + $diff->m * 30 + $diff->d) * 24 + $diff->h + $diff->i/60;
+                                break;
+                        case "%i":
+                                $total = (($diff->y * 365.25 + $diff->m * 30 + $diff->d) * 24 + $diff->h) * 60 + $diff->i + $diff->s/60;
+                                break;
+                        case "%s":
+                                $total = ((($diff->y * 365.25 + $diff->m * 30 + $diff->d) * 24 + $diff->h) * 60 + $diff->i)*60 + $diff->s;
+                                break;
+                }
+                
+                return (int)$total;
+                /* if( $diff->invert)
+                        return -1 * $total;
+                else    return $total; */
         }
 }