Changeset 28 for types

Timestamp:

Dec 8, 2008, 11:06:23 AM (16 years ago)

Author:

george

Message:

• Upraveno: Systém ukládání dat do databáze přepracován na jednodušší. Původní záměr počítal s verzováním položek seznamů čímž se komplikovaly SQL dotazy. Systém sledování změn bude později řešen přes tabulku Audit.
• Odebráno: Sloupce tabulek Author, ItemId, CreationTime, DeletionTime, ValidtTimeFrom a ValidTimeTo.

File:

• types/PointerOneToOne.php (modified) (6 diffs)

types/PointerOneToOne.php

@@ -11 +11 @@
     $List = GetListDefinition($Type['Parameters'][0]);
     $TargetTable = $List['TableName'];
+    //echo($TargetTable.'<');
+    //print_r($List);
     foreach($List['Items'] as $Index => $ListItem)
     {
@@ -21 +23 @@
         {
           //print_r($Type);
-          $DbResult = $Database->select($List['TableName'], '*', 'ItemId='.$Item['Value'].' ORDER BY Id DESC LIMIT 1');
+          $DbResult = $Database->select($List['TableName'], '*', 'Id='.$Item['Value']);
           $DbRow = $DbResult->fetch_assoc();
-          $DefinitionItem = array('Name' => $Index, 'Type' => $Item['Type'], 'Caption' => $Item['TextBefore'], 'Value' => $DbRow[$Index], 'SourceTable' => $List['ItemId'], 'SourceItemId' => 0);
+          $DefinitionItem = array('Name' => $Index, 'Type' => $Item['Type'], 'Caption' => $Item['TextBefore'], 'Value' => $DbRow[$Index], 'SourceTable' => $List['Id'], 'SourceItemId' => 0);
           $SubTarget = $this->GetTablePointerName($Type, $DefinitionItem);
           $Columns .= '"'.$SubTarget['Name'].' ",';
@@ -29 +31 @@
       }
     }
-    $Columns = 'CONCAT('.substr($Columns, 0, -1).') AS Name, ItemId, Id';
-    $DbResult = $Database->select($TargetTable, $Columns, 'ItemId='.$Item['Value'].' AND (DeletionTime IS NULL) ORDER BY Id DESC LIMIT 1');
-    echo($Database->LastQuery);
+    $Columns = substr($Columns, 0, -1);
+    if($Columns == '') $Columns = 'Id AS Name, Id';
+      else $Columns = 'CONCAT('.$Columns.') AS Name, Id';
+    $DbResult = $Database->select($TargetTable, $Columns, 'Id='.$Item['Value']);
+    //echo($Database->LastQuery);
     if($DbResult->num_rows > 0)
     {
@@ -46 +50 @@
     $TargetTable = $List['TableName'];
     foreach($List['Items'] as $ListItem)
-      if($ListItem['VisibleInPointer'] == 1) $Columns .= 't1.`'.$ListItem['Name'].'`," ",';
-    $Columns = 'CONCAT('.substr($Columns, 0, -1).') AS Name, t1.Id, t1.ItemId, t1.DeletionTime';
-    $DbResult = $Database->query('SELECT t3.* FROM (SELECT '.$Columns.' FROM `'.$TargetTable.'` AS t1 LEFT JOIN `'.$TargetTable.'` AS t2 ON t1.ItemId=t2.ItemId AND t1.Id < t2.Id WHERE (t2.ItemId IS NULL)) AS t3 WHERE t3.DeletionTime IS NULL');
+      if($ListItem['VisibleInPointer'] == 1) $Columns .= '`'.$ListItem['Name'].'`," ",';
+    $Columns = 'CONCAT('.substr($Columns, 0, -1).') AS Name, Id';
+    $DbResult = $Database->query('SELECT '.$Columns.' FROM `'.$TargetTable.'`');
     //echo($Database->LastQuery);
     if($DbResult->num_rows > 0)
     {
 
-      $Result = array(array('Name' => 'Žádný', 'Id' => 0, 'ItemId' => 0));
+      $Result = array(array('Name' => 'Žádný', 'Id' => 0));
       while($DbRow = $DbResult->fetch_assoc())
         $Result[] = $DbRow;
@@ -67 +71 @@
     $TargetTable = $Type['Parameters'][0];
     $TargetName = $this->GetTablePointerName($Type, $Item);
-    $Output = '<a href="?Action=ViewItem&amp;Table='.$TargetTable.'&amp;Item='.$TargetName['ItemId'].'">'.$TargetName['Name'].'</a>';
+    $Output = '<a href="?Action=ViewItem&amp;Table='.$TargetTable.'&amp;Item='.$TargetName['Id'].'">'.$TargetName['Name'].'</a>';
     return($Output);
   }
@@ -81 +85 @@
     foreach($TargetNameList as $TargetName)
     {
-      if($Item['Value'] == $TargetName['ItemId']) $Selected = ' selected="1"'; else $Selected = '';
-      $Output .= '<option value="'.$TargetName['ItemId'].'"'.$Selected.'>'.$TargetName['Name'].'</option>';
+      if($Item['Value'] == $TargetName['Id']) $Selected = ' selected="1"'; else $Selected = '';
+      $Output .= '<option value="'.$TargetName['Id'].'"'.$Selected.'>'.$TargetName['Name'].'</option>';
     }
     $Output .= '</select>';