Changeset 880 for trunk/includes/dbc.php

Timestamp:

Apr 7, 2020, 10:15:48 PM (4 years ago)

Author:

chronos

Message:

• Modified: Improved code formatting.

File:

• trunk/includes/dbc.php (modified) (17 diffs)

trunk/includes/dbc.php

@@ -35 +35 @@
 
     $this->ColumnFormat = $ColumnFormat;
-    if($this->ReadUint() != DBC_SIGNATURE) die(NOT_DBC_FILE);
+    if ($this->ReadUint() != DBC_SIGNATURE) die(NOT_DBC_FILE);
 
     $this->RecordCount = $this->ReadUint();
@@ -43 +43 @@
 
     $this->GenerateOffsetTable();
-    if($this->EndOffset != $this->RecordSize)
+    if ($this->EndOffset != $this->RecordSize)
     die(RECORD_SIZE_NOT_MATCH.$this->EndOffset.' <> '.$this->RecordSize);
   }
@@ -71 +71 @@
   {
     // Preallocate array
-    if($this->FieldCount > 0) $this->Offsets = array_fill(0, $this->FieldCount, 0);
+    if ($this->FieldCount > 0) $this->Offsets = array_fill(0, $this->FieldCount, 0);
       else $this->Offsets = array();
 
     $Offset = 0;
     $I = 0;
-    while($I < $this->FieldCount)
+    while ($I < $this->FieldCount)
     {
       $this->Offsets[$I] = $Offset;
-      if(array_key_exists($I, $this->ColumnFormat)) $Format = $this->ColumnFormat[$I];
+      if (array_key_exists($I, $this->ColumnFormat)) $Format = $this->ColumnFormat[$I];
         else $Format = FORMAT_UINT32;
-      switch($Format)
+      switch ($Format)
       {
         case FORMAT_BYTE:
@@ -100 +100 @@
   private function CellPos($Row, $Column)
   {
-    return($this->HeaderSize + $Row * $this->RecordSize + $this->Offsets[$Column]);
+    return $this->HeaderSize + $Row * $this->RecordSize + $this->Offsets[$Column];
   }
 
@@ -106 +106 @@
   {
     $this->SetPosition($this->CellPos($Row, $Column));
-    return($this->ReadByte());
+    return $this->ReadByte();
   }
 
@@ -112 +112 @@
   {
     $this->SetPosition($this->CellPos($Row, $Column));
-    return($this->ReadUint());
+    return $this->ReadUint();
   }
 
@@ -118 +118 @@
   {
     $this->SetPosition($this->CellPos($Row, $Column));
-    return($this->ReadInt());
+    return $this->ReadInt();
   }
 
@@ -124 +124 @@
   {
     $this->SetPosition($this->CellPos($Row, $Column));
-    return($this->ReadFloat());
+    return $this->ReadFloat();
   }
 
@@ -156 +156 @@
 
     $Position = $this->HeaderSize + $this->RecordCount * $this->RecordSize + $Offset;
-    if($Position >= $this->GetSize()) return('');
+    if ($Position >= $this->GetSize()) return '';
     $this->SetPosition($Position);
 
     $String = '';
-    while(($Char = $this->ReadChar()) != "\0")
+    while (($Char = $this->ReadChar()) != "\0")
     {
       $String .= $Char;
     }
-    return($String);
+    return $String;
   }
 
   public function SetString($Row, $Column, $Value)
   {
-    if(in_array($Value, $this->StringList))
+    if (in_array($Value, $this->StringList))
     {
       $this->SetUint($Row, $Column, $this->StringListOffset[array_search($Value, $this->StringList)]);
@@ -192 +192 @@
     $this->SetPosition($this->HeaderSize + $this->RecordCount * $this->RecordSize);
     $this->WriteByte(0);
-    foreach($this->StringList as $Index => $Item)
+    foreach ($this->StringList as $Index => $Item)
     {
       $this->WriteString($Item."\0");
@@ -206 +206 @@
 
     // Preallocate array
-    if($this->FieldCount > 0) $Line = array_fill(0, $this->FieldCount, 0);
+    if ($this->FieldCount > 0) $Line = array_fill(0, $this->FieldCount, 0);
       else $Line = array();
-    for($I = 0; $I < $this->FieldCount; $I++)
-    {
-      if(array_key_exists($I, $this->ColumnFormat)) $Format = $this->ColumnFormat[$I];
+    for ($I = 0; $I < $this->FieldCount; $I++)
+    {
+      if (array_key_exists($I, $this->ColumnFormat)) $Format = $this->ColumnFormat[$I];
         else $Format = FORMAT_UINT32;
       $Record->SetPosition($this->Offsets[$I]);
-      switch($Format)
+      switch ($Format)
       {
         case FORMAT_BYTE:
@@ -231 +231 @@
 
           $Position = $this->HeaderSize + $this->RecordCount * $this->RecordSize + $Offset;
-          if($Position >= $this->GetSize()) $String = '';
+          if ($Position >= $this->GetSize()) $String = '';
           else
           {
             $this->SetPosition($Position);
             $String = '';
-            while(($Char = $this->ReadChar()) != "\0")
+            while (($Char = $this->ReadChar()) != "\0")
               $String .= $Char;
           }
@@ -245 +245 @@
       }
     }
-    return($Line);
+    return $Line;
   }
 
@@ -253 +253 @@
     $Record = new MemoryStream();
 
-    for($I = 0; $I < $this->FieldCount; $I++)
-    {
-      if(array_key_exists($I, $this->ColumnFormat)) $Format = $this->ColumnFormat[$I];
+    for ($I = 0; $I < $this->FieldCount; $I++)
+    {
+      if (array_key_exists($I, $this->ColumnFormat)) $Format = $this->ColumnFormat[$I];
         else $Format = FORMAT_UINT32;
       $Record->SetPosition($this->Offsets[$I]);
-      switch($Format)
+      switch ($Format)
       {
         case FORMAT_BYTE:
@@ -273 +273 @@
           break;
         case FORMAT_STRING:
-          if(in_array($Line[$I], $this->StringList))
+          if (in_array($Line[$I], $this->StringList))
           {
             $Record->WriteUint($this->StringListOffset[array_search($Line[$I], $this->StringList)]);
@@ -291 +291 @@
     $this->SetPosition($this->CellPos($Row, 0));
     $this->WriteBlock($Record->Data, $this->RecordSize);
-    return($Line);
+    return $Line;
   }
 
   public function GetRecordCount()
   {
-    return($this->RecordCount);
+    return $this->RecordCount;
   }
 
@@ -306 +306 @@
   public function GetFieldCount()
   {
-    return($this->FieldCount);
+    return $this->FieldCount;
   }