Changeset 17862

Timestamp:

Sep 11, 2012, 3:27:24 PM (12 years ago)

Author:

grum

Message:

version 0.1.0b
. fix bug on thumb view
. fix SQLite compression managment & 'compress.method' config
. manage number of items per page by config

Location:

extensions/EStat

Files:

• admin/estat_admin.tpl (modified) (1 diff)
• estat_aip.class.inc.php (modified) (2 diffs)
• estat_ajax.php (modified) (1 diff)
• estat_pip.class.inc.php (modified) (1 diff)
• estat_root.class.inc.php (modified) (1 diff)
• js/estatPM.js (modified) (12 diffs)
• lib/statDB.class.inc.php (modified) (11 diffs)
• lib/statDBGlobal.class.inc.php (modified) (1 diff)

extensions/EStat/admin/estat_admin.tpl

@@ -107 +107 @@
           url:'{$plugin.urlRequest}',
           urlExport:'{$plugin.urlRequestExport}',
-          token:'{$plugin.token}'
+          token:'{$plugin.token}',
+          itemPerPage:{$plugin.itemPerPage}
           {literal}
         }

extensions/EStat/estat_aip.class.inc.php

@@ -107 +107 @@
       'urlRequest' => $this->getAdminLink('ajax'),
       'urlRequestExport' => $this->getAdminLink('ajaxExport'),
-      'token' => get_pwg_token()
+      'token' => get_pwg_token(),
+      'itemPerPage' => $this->config['global.itemPerPage']
     );
 
@@ -116 +117 @@
 
 
-    $this->checkBuildStatPeriod(true);
+    $this->checkBuildStatPeriod(true, $this->config['compress.method']=='gz');
   }
 

extensions/EStat/estat_ajax.php

@@ -443 +443 @@
         $monthStatFile->close();
 
-        // if imported data are from a previous period, pack it
-        if($nbLogs<self::MAX_LOAD_LOG and $period!=date('Y-m'))
-        {
-          /*if($monthStatFile->pack()===true)
-            $monthStatFile->delete(ASDF_DELETE_UNPACKED);*/
+        // if imported data are from a previous period and compression method is set, pack it
+        if($nbLogs<self::MAX_LOAD_LOG and $period!=date('Y-m') and $this->config['compress.method']=='gz')
+        {
+          if($monthStatFile->pack()===true)
+            $monthStatFile->delete(ASDF_DELETE_UNPACKED);
         }
       }

extensions/EStat/estat_pip.class.inc.php

@@ -68 +68 @@
       }
 
-      $this->checkBuildStatPeriod(false, $this->config['compress.public']=='y');
+      $this->checkBuildStatPeriod(false, ($this->config['compress.public']=='y' and $this->config['compress.method']=='gz'));
     }
     return($do_log);

extensions/EStat/estat_root.class.inc.php

@@ -107 +107 @@
         'build.end' => '6:30:00',        // build.start hour to build.end hour
         'compress.public' => 'n',        // compress file in public session
-        'compress.method' => 'none',     // none, gz
-
-        'global.itemPerPage' => 250,
+        'compress.method' => 'gz',     // none, gz
+
+        'global.itemPerPage' => 150,
 
         'export.csv.separator' => $csvExport['export.csv.separator'],

extensions/EStat/js/estatPM.js

@@ -28 +28 @@
         urlExport:'',
         token:'',
+        itemPerPage:50,
         currentPage:'Stats_by_period',
         initPhase:false,
@@ -170 +171 @@
           properties.token=values.token;
 
+        if(values.itemPerPage)
+          properties.itemPerPage=values.itemPerPage;
+
         if(values.currentPage)
           properties.currentPage=values.currentPage;
@@ -338 +342 @@
             minHeight:350,
             maxHeight:350,
+            nbItemsPage:properties.itemPerPage,
             footerString:
               {
@@ -662 +667 @@
             minHeight:350,
             maxHeight:350,
+            nbItemsPage:properties.itemPerPage,
             sortBoxTitle:translateString.sortBy,
             footerString:
@@ -936 +942 @@
             minHeight:350,
             maxHeight:350,
+            nbItemsPage:properties.itemPerPage,
             sortBoxTitle:translateString.sortBy,
             footerString:
@@ -1047 +1054 @@
                                 {
                                   displayPopupThumb(false);
-
                                 }
                             );
@@ -1107 +1113 @@
             minHeight:350,
             maxHeight:350,
+            nbItemsPage:properties.itemPerPage,
             sortBoxTitle:translateString.sortBy,
             footerString:
@@ -1218 +1225 @@
                                 {
                                   displayPopupThumb(false);
-
                                 }
                             );
@@ -1390 +1396 @@
             minHeight:150,
             maxHeight:350,
+            nbItemsPage:properties.itemPerPage,
             sortBoxTitle:translateString.sortBy,
             footerString:
@@ -1498 +1505 @@
                                 {
                                   displayPopupThumb(false);
-
                                 }
                             );
@@ -2746 +2752 @@
           url='';
         }
-
         if(visible)
         {
           $('#iPopupThumb')
+            .unbind('load')
             .bind('load', {geometry:geometry}, function (e)
                     {
@@ -2765 +2771 @@
         else
         {
-          $('#iPopupThumb').css('display', 'none');
+          $('#iPopupThumb').unbind('load').css('display', 'none');
         }
       },

extensions/EStat/lib/statDB.class.inc.php

@@ -9 +9 @@
 define('ASDF_EXIST_PACKED',   0x01);
 define('ASDF_EXIST_UNPACKED', 0x02);
+define('ASDF_EXIST_LOCK',     0x04);
 define('ASDF_EXIST_ALL', ASDF_EXIST_PACKED|ASDF_EXIST_UNPACKED);
 
 define('ASDF_FILE_EXT', '.db');
 define('ASDF_FILE_EXT_ZIP', ASDF_FILE_EXT.'.gz');
+define('ASDF_FILE_EXT_LOCK', '.lock');
 define('ASDF_FILE_ROOT_MONTH', 'M');
 define('ASDF_FILE_ROOT_GLOBAL', 'G');
@@ -55 +57 @@
   protected $transacOpen=false;
   protected $ipCountryFile='';
-
+  protected $lckFileNumber=0;
+  //protected $logs=''; for debug
   private $deleteUnpackedWhenClose=ASDF_CLOSE_DO_NOTHING;
 
@@ -218 +221 @@
    * if $mode=ASDF_OPEN_WRITE and file doesn't exist, create it; if a packed file
    * exist, try to unpack the packed file; in this case the unpacked file will be
-   * packed and removed automatically when the process will close.
+   * packed and removed automatically when the process will close
    *
    * if $mode=ASDF_OPEN_READ, and unpacked file doesn't exist, try to unpack
    * packed file (if exists); in this case the unpacked file will be removed
-   * automatically when the process will close.
+   * automatically when the process will close (if there's no lock
+   * files linked to the uncompressed file); a new lock file is created
    *
    * @param Integer $mode: READ or WRITE
@@ -230 +234 @@
   {
     $dbFile=$this->getFileName(ASDF_EXIST_UNPACKED, true);
+    $this->createLockFile();
+    $this->waitForUnpackedFile();
 
     /*
@@ -252 +258 @@
         $this->deleteUnpackedWhenClose=ASDF_CLOSE_DO_DELETE; // the unpacked file will be deleted when the process will close
       }
+    }
+    else
+    {
+      if($this->lckFileNumber>1 and $this->getFileName(ASDF_EXIST_PACKED, true)!='' and $mode==ASDF_OPEN_READ)
+        $this->deleteUnpackedWhenClose=ASDF_CLOSE_DO_DELETE;
     }
 
@@ -293 +304 @@
       }
 
-      if(($this->deleteUnpackedWhenClose&ASDF_CLOSE_DO_DELETE)==ASDF_CLOSE_DO_DELETE)
+      $this->deleteLockFile();
+      if(($this->deleteUnpackedWhenClose&ASDF_CLOSE_DO_DELETE)==ASDF_CLOSE_DO_DELETE and
+          !$this->fileIsLocked())
       {
         $this->delete(ASDF_DELETE_UNPACKED);
@@ -330 +343 @@
     if($this->fileExist() & ASDF_EXIST_PACKED==ASDF_EXIST_PACKED)
     {
-      $returned=GPCCompress::gunzip($this->getFileName(ASDF_EXIST_PACKED), $this->getFileName(ASDF_EXIST_UNPACKED));
-      /*
-      $dir=dirName(dirName($this->getFileName(ASDF_EXIST_UNPACKED)));
-      $tH=fopen($dir.'/logs.log', 'a');
-      if($tH)
-      {
-        $dest=$this->getFileName(ASDF_EXIST_UNPACKED);
-        fwrite($tH, sprintf("%s - %30s - %10d - %s\n", date('Y-m-d H:i:s'), $dest, filesize($dest), $returned?'y':'n'));
-        fclose($tH);
-      }
-*/
+      $unpackedFile=$this->getFileName(ASDF_EXIST_UNPACKED);
+
+      // create a temp file
+      $fHandle=fopen($unpackedFile, 'w');
+      fclose($fHandle);
+
+      $returned=GPCCompress::gunzip($this->getFileName(ASDF_EXIST_PACKED), $unpackedFile.'.tmp');
+
+      unlink($unpackedFile);
+      if($returned)
+      {
+        rename($unpackedFile.'.tmp', $unpackedFile);
+      }
+
       return($returned);
     }
@@ -422 +438 @@
       case ASDF_EXIST_UNPACKED:
         $fileName=$this->fileDir.$this->fileName.$this->fileRootName.ASDF_FILE_EXT;
+        break;
+      case ASDF_EXIST_LOCK:
+        $fileName=$this->fileDir.$this->fileName.$this->fileRootName.'-'.$this->lckFileNumber.ASDF_FILE_EXT_LOCK;
         break;
     }
@@ -517 +536 @@
     if($returned==null) $returned=$value;
     return($returned);
+  }
+
+  /**
+   * how the file lock system works:
+   *
+   * the lock system is used only when for uncompressed files, allowing to know
+   * if an uncompressed file can be deleted or not; locks function are called only
+   * in READ mode by function open() and close()
+   *
+   * createLockFile()
+   *  1/ Search for existing lock files
+   *  2/ If files are found, increase the $lckFileNumber with number of existing files + 1
+   *  3/ Create the lock file
+   *
+   * deleteLockFile()
+   *  delete the lock file associated with the current $lckFileNumber
+   *
+   * fileIsLocked()
+   *  return true if at least, one lock exists
+   *
+   *  ......................................
+   *          ......................................
+   *                   ..............
+   * -+-------+--------+------------+------+-------+-->
+   * (A)     (B)      (C)          (D)    (E)     (F)
+   *  ^       ^        ^            ^      ^       ^
+   *  p1      p2       p3           p3     p1      p2
+   *  start   start    start        end    end     end
+   *
+   * (A) process 1 start: createLockFile() => lock file '1' is created
+   * (B) process 2 start: createLockFile() => lock file '2' is created
+   * (C) process 3 start: createLockFile() => lock file '3' is created
+   * (D) process 3 end:   deleteLockFile() => lock file '3' is deleted
+   *                                          lock files '1' & '2' still exist (uncompressed SQLite file can't be deleted)
+   * (E) process 1 end:   deleteLockFile() => lock file '1' is deleted
+   *                                          lock file '2' still exist (uncompressed SQLite file can't be deleted)
+   * (F) process 2 end:   deleteLockFile() => lock file '2' is deleted
+   *                                          there's no lock files (uncompressed SQLite file can be deleted)
+   *
+   * @return Boolean: true if the lock file was created, otherwise false
+   */
+  protected function createLockFile()
+  {
+    $this->lckFileNumber=$this->getNumberOfLockFiles()+1;
+    $fHandle=fopen($this->getFileName(ASDF_EXIST_LOCK), 'w');
+    if($fHandle)
+    {
+      fclose($fHandle);
+      return(true);
+    }
+    $this->lckFileNumber=0;
+    return(false);
+  }
+
+  /**
+   * delete the current lock file
+   * return true if file is deleted (or file doesn't exists => there's no more file to delete...), otherwise return false
+   *
+   * the function also delete all lock files older than current timestamp+max_execution_time (if
+   * the file still exist, it means that a problem has occured at a moment)
+   *
+   * @return Boolean
+   */
+  protected function deleteLockFile()
+  {
+    $returned=true;
+    $file=$this->getFileName(ASDF_EXIST_LOCK);
+    if(file_exists($file)) $returned=unlink($file);
+
+    if($returned) $this->lckFileNumber=0;
+
+    $regExp="/\\".ASDF_FILE_EXT_LOCK.'/i';
+    scandir(dirName($this->fileDir));
+    $files=scandir($this->fileDir);
+    $timeOut=time()-ini_get('max_execution_time');
+
+    foreach($files as $file)
+    {
+      if(preg_match($regExp, $file, $result)>0)
+      {
+        if(filemtime($this->fileDir.$file)<$timeOut)
+        {
+          unlink($this->fileDir.$file);
+        }
+      }
+    }
+
+
+
+    return($returned);
+  }
+
+  /**
+   * return true if a lock file exists
+   *
+   * @return Boolean
+   */
+  protected function fileIsLocked()
+  {
+    if($this->getNumberOfLockFiles()>0) return(true);
+    return(false);
+  }
+
+  /**
+   * return true the number of existing lock files
+   *
+   * @return Integer: number of existing lock files
+   */
+  protected function getNumberOfLockFiles()
+  {
+    $returned=0;
+    $regExp='/'.$this->fileName.$this->fileRootName."-(\d+)\\".ASDF_FILE_EXT_LOCK.'/i';
+    $files=scandir($this->fileDir);
+    foreach($files as $file)
+    {
+      if(preg_match($regExp, $file, $result)>0)
+      {
+        $tmp=$result[1]*1;
+        if($tmp>$returned) $returned=$tmp;
+      }
+    }
+    return($returned);
+  }
+
+  /**
+   * if the unpacked exist with a '.tmp' extension, assume that an unpacking process
+   * is running and loop until the file doesn't exist anymore
+   *
+   * @param Integer $maxWait: maximum wait time in millisecond...
+   * @return Boolean: true if file was unpacked in the waiting time, otherwise false
+   */
+  protected function waitForUnpackedFile($maxWait=2000)
+  {
+    $tmpFile=$this->getFileName(ASDF_EXIST_UNPACKED).'.tmp';
+    $maxTimer=microtime(true)+$maxWait/1000;
+    while(file_exists($tmpFile))
+    {
+      if(microtime(true)>=$maxTimer) return(false);
+      usleep(5000); //wait 5milliseconds before next check
+    }
+    return(true);
   }
 
@@ -1190 +1350 @@
 
 
-}
+/*
+  for debug
+
+  private function log($data)
+  {
+    if($this->logs=='') return(false);
+    $tH=fopen(dirName($this->fileDir).'/logs.log', 'a');
+    if($tH)
+    {
+      $time=microtime(true);
+      fwrite($tH, sprintf("%s %f - %s\n", $this->logs, $time, $data));
+
+      fclose($tH);
+    }
+  }
+*/
+
+
+} // StatDB
 
 
@@ -1213 +1391 @@
 
 
-
 ?>

extensions/EStat/lib/statDBGlobal.class.inc.php

@@ -240 +240 @@
     if($packed!='')
     {
+      // packed file was unpacked, pack file only if file was already packed
       if($fmPeriod->pack())
-        $fmPeriod->delete(ASDF_DELETE_UNPACKED); //packed file was unpacked, keep only packed file
+        $fmPeriod->delete(ASDF_DELETE_UNPACKED);
     }
     return($returned);