Changeset 90 for trunk/Packages

Timestamp:

Oct 4, 2019, 10:31:38 PM (5 years ago)

Author:

chronos

Message:

• Modified: Updated Common package files.
• Modified: Updated link to project website.

Location:

trunk/Packages/Common

Files:

• Application.php (modified) (3 diffs)
• Common.php (modified) (3 diffs)
• Database.php (modified) (8 diffs)
• Table.php (modified) (1 diff)
• Update.php (modified) (1 diff)

trunk/Packages/Common/Application.php

@@ -1 +1 @@
 <?php
+
+class ModelDef
+{
+  var $OnChange;
+  
+  function __construct()
+  {
+    $this->OnChange = array();
+  }
+  
+  function DoOnChange()
+  {
+    foreach($this->OnChange as $Callback)
+    {
+      call_user_func($Callback);
+    }
+  }
+  
+  function RegisterOnChange($SysName, $Callback)
+  {
+    $this->OnChange[$SysName] = $Callback;
+  }
+  
+  function UnregisterOnChange($SysName)
+  {
+    unset($this->OnChange[$SysName]);
+  }
+}
 
 class Application extends System
@@ -7 +35 @@
   var $ModuleManager;
   var $Modules;
-
+  var $Models;
+  
   function __construct()
   {
@@ -14 +43 @@
     $this->ModuleManager = new AppModuleManager($this);
     $this->Modules = array();
+    $this->Models = array();
+  }
+  
+  function RegisterModel($SysName, $Model)
+  {
+    $NewModelDef = new ModelDef();
+    $NewModelDef->Title = $Model['Title'];
+    $this->Models[$SysName] = $NewModelDef;
   }
 
+  function UnregisterModel($SysName)
+  {
+    unset($this->Models[$SysName]);
+  }
+  
   function Run()
   {

trunk/Packages/Common/Common.php

@@ -19 +19 @@
 include_once(dirname(__FILE__).'/Setup.php');
 include_once(dirname(__FILE__).'/Table.php');
+include_once(dirname(__FILE__).'/Process.php');
 
 class PackageCommon
@@ -32 +33 @@
   {
     $this->Name = 'Common';
-    $this->Version = '1.2';
-    $this->ReleaseDate = strtotime('2016-01-22');
+    $this->Version = '1.3';
+    $this->ReleaseDate = strtotime('2019-10-04');
     $this->Creator = 'Chronos';
     $this->License = 'GNU/GPL';
-    $this->Homepage = 'http://svn.zdechov.net/svn/PHPlib/Common/';
+    $this->Homepage = 'https://svn.zdechov.net/PHPlib/Common/';
   }
 }
@@ -48 +49 @@
   var $Page;
 
-  function __construct(System $System)
+  function __construct()
   {
+    global $System;
+
     $this->ItemPerPage = $System->Config['Web']['ItemsPerPage'];
     $this->Around = $System->Config['Web']['VisiblePagingItems'];

trunk/Packages/Common/Database.php

@@ -3 +3 @@
 // Extended database class
 // Date: 2016-01-11
+
+function microtime_float()
+{
+  list($usec, $sec) = explode(" ", microtime());
+  return ((float)$usec + (float)$sec);
+}
 
 class DatabaseResult
@@ -51 +57 @@
     $this->LogFile = dirname(__FILE__).'/../../Query.log';
   }
+ 
 
   function Connect($Host, $User, $Password, $Database)
@@ -85 +92 @@
   {
     if(!$this->Connected()) throw new Exception(T('Not connected to database'));
-    if(($this->ShowSQLQuery == true) or ($this->LogSQLQuery == true)) $QueryStartTime = microtime();
+    if(($this->ShowSQLQuery == true) or ($this->LogSQLQuery == true)) $QueryStartTime = microtime_float();
     $this->LastQuery = $Query;
+    //echo('a'.$this->ShowSQLQuery.'<'.$QueryStartTime.', '.microtime_float());
     if(($this->ShowSQLQuery == true) or ($this->LogSQLQuery == true))
-      $Duration = ' ; '.round(microtime() - $QueryStartTime, 4). ' s';
+      $Duration = ' ; '.round(microtime_float() - $QueryStartTime, 4). ' s';
     if($this->LogSQLQuery == true)
       file_put_contents($this->LogFile, $Query.$Duration."\n", FILE_APPEND);
@@ -101 +109 @@
       $this->insert_id = $this->PDO->lastInsertId();
     } else
-    {
+    {     
       $this->Error = $this->PDO->errorInfo();
       $this->Error = $this->Error[2];
@@ -123 +131 @@
   function insert($Table, $Data)
   {
+    $this->query($this->GetInsert($Table, $Data));
+    $this->insert_id = $this->PDO->lastInsertId();
+  }
+  
+  function GetInsert($Table, $Data)
+  {
     $Name = '';
     $Values = '';
@@ -137 +151 @@
     $Name = substr($Name, 1);
     $Values = substr($Values, 1);
-    $this->query('INSERT INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')');
-    $this->insert_id = $this->PDO->lastInsertId();
+    return('INSERT INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')');
   }
 
   function update($Table, $Condition, $Data)
+  {
+    $this->query($this->GetUpdate($Table, $Condition, $Data));
+  }
+  
+  function GetUpdate($Table, $Condition, $Data)
   {
     $Values = '';
@@ -154 +172 @@
     }
     $Values = substr($Values, 2);
-    $this->query('UPDATE `'.$this->Prefix.$Table.'` SET '.$Values.' WHERE ('.$Condition.')');
+    return('UPDATE `'.$this->Prefix.$Table.'` SET '.$Values.' WHERE ('.$Condition.')');
   }
 
@@ -200 +218 @@
   public function __wakeup()
   {
+  }
+  
+  public function Transaction($Queries)
+  {
+      $this->PDO->beginTransaction();
+      foreach ($Queries as $Query)
+      {
+        $Statement = $this->PDO->prepare($Query);
+        $Statement->execute();
+      }          
+      $this->PDO->commit();
   }
 }

trunk/Packages/Common/Table.php

@@ -98 +98 @@
   var $Style;
 
-  function __construct(System $System)
+  function __construct()
   {
+    global $System;
+
     $this->Columns = array();
     $this->Table = new TableMemory();

trunk/Packages/Common/Update.php

@@ -43 +43 @@
     while($this->Revision > $DbRevision)
     {
+      if(!array_key_exists($DbRevision, $this->Trace))
+        die('Missing upgrade trace for revision '.$DbRevision);
       $TraceItem = $this->Trace[$DbRevision];
       $Output .= 'Aktualizace na verzi '.$TraceItem['Revision'].':<br/>';