Changeset 507

Timestamp:

10/30/08 20:13:55 (23 months ago)

Author:

PavelVinogradov

Message:

Proper count or real and cache traffic. Remove redundant code. (Closes #258)

Files:

• branches/1.0.x/php/createpdf.php (modified) (6 diffs)

branches/1.0.x/php/createpdf.php

@@ -87 +87 @@
   $ycount=50;
   $count=0;
-  $result=mysql_query("SELECT sum(size) as all_sum,sum(hit),user,domain FROM cachesum WHERE date>=\"$sdate\"&&date<=\"$edate\" group by user,domain order by all_sum desc");
+
+  if($SAMSConf->realtraffic=="real")
+    $result=mysql_query("SELECT sum(size), sum(hit), user,domain, sum(size) - sum(hit) as traff  FROM cachesum WHERE date>=\"$sdate\"&&date<=\"$edate\" group by user,domain order by traff desc");
+  else
+    $result=mysql_query("SELECT sum(size), sum(hit), user,domain, sum(size) as traff  FROM cachesum WHERE date>=\"$sdate\"&&date<=\"$edate\" group by user,domain order by traff desc");
   while($row=mysql_fetch_array($result))
        {
@@ -102 +106 @@
          $pdfFile->Write(0, $aaa);
          $pdfFile->SetXY(130, $ycount);
-         if($SAMSConf->realtraffic=="real")
-           $aaa=ReturnTrafficFormattedSize($row[0]-$row[1]);
-         else
-           $aaa=ReturnTrafficFormattedSize($row[0]);    
+  
+         $aaa=ReturnTrafficFormattedSize($row[4]);
          $pdfFile->Write(0, $aaa);
          
@@ -111 +113 @@
          $size2=$size2+$row[0];
          $hitsize=$hitsize+$row[1];
-         if($SAMSConf->realtraffic=="real")
-           $traf=$traf+$row[0]-$row[1];
-         else
-           $traf=$traf+$row[0];
+         $traf=$traf+$row[4];
          $ycount+=7;
 
@@ -269 +268 @@
   
   $ycount=700;
-  $result=mysql_query("SELECT sum(size) as all_sum,sum(hit),user,domain FROM cachesum WHERE date>=\"$sdate\"&&date<=\"$edate\" group by user,domain order by all_sum desc");
+  if($SAMSConf->realtraffic=="real")
+    $result=mysql_query("SELECT sum(size), sum(hit), user,domain, sum(size) - sum(hit) as traff  FROM cachesum WHERE date>=\"$sdate\"&&date<=\"$edate\" group by user,domain order by traff desc");
+  else
+    $result=mysql_query("SELECT sum(size), sum(hit), user,domain, sum(size) as traff  FROM cachesum WHERE date>=\"$sdate\"&&date<=\"$edate\" group by user,domain order by traff desc");
   while($row=mysql_fetch_array($result))
        {
@@ -305 +307 @@
          $aaa=convert_cyr_string("$row_2[family] $row_2[name]","k","w");
          pdf_show_xy($pdfFile, $aaa, 160, $ycount);  
-         if($SAMSConf->realtraffic=="real")
-           {
-                $aaa=ReturnTrafficFormattedSize($row[0]-$row[1]);
-           }
-         else
-           {
-                $aaa=ReturnTrafficFormattedSize($row[0]);
-           }
+         $aaa=ReturnTrafficFormattedSize($row[4]);
          pdf_show_xy($pdfFile, $aaa, 400, $ycount);  
          //$aaa=ReturnTrafficFormattedSize($row[1]);
@@ -320 +315 @@
          $size2=$size2+$row[0];
          $hitsize=$hitsize+$row[1];
-         if($SAMSConf->realtraffic=="real")
-           $traf=$traf+$row[0]-$row[1];
-         else
-           $traf=$traf+$row[0];
+         $traf=$traf+$row[4];
          $ycount-=20;
          if($ycount==40)