Changeset 1262 for trunk/wifidog-auth/wifidog/classes/StatisticReport/AnonymisedDataExport.php

Timestamp:

07/21/07 02:40:43 (5 years ago)

Author:

benoitg

Message:

• AnonymisedDataExport?.php: Work around the huge memory requirements this report used to have.

Files:

• trunk/wifidog-auth/wifidog/classes/StatisticReport/AnonymisedDataExport.php (modified) (3 diffs)

trunk/wifidog-auth/wifidog/classes/StatisticReport/AnonymisedDataExport.php

@@ -99 +99 @@
         else
         {
+            header('Content-Type: application/octet-stream');
+            header('Content-Disposition: inline; filename="anonymised_data.sql"');
+            header("Content-Transfer-Encoding: binary");
+
             $html  .= <<<EOT
             CREATE TABLE connections_anonymised
@@ -113 +117 @@
 EOT;
 $html .= "\n";
+            echo $html;
             $distinguish_users_by = $this->stats->getDistinguishUsersBy();
 
@@ -118 +123 @@
 
             $sql = "$candidate_connections_sql ORDER BY timestamp_in DESC";
-            $db->execSql($sql, $rows, false);
-            foreach ($rows as $row)
-            {
-                $keys = null;
-                $values = null;
-                $first = true;
-                foreach ($row as $key=>$value)
+            $db->execSqlRaw($sql, $resultHandle, false);
+            if($resultHandle) {
+                while($row=pg_fetch_array($resultHandle,null,PGSQL_ASSOC))
                 {
-                    if($key == 'user_id' || $key == 'node_id' || $key == 'conn_id' || $key == 'user_mac' ) {
-                        $value = "'".$this->getNonRepeatableHash($value)."'";
+
+                    $keys = null;
+                    $values = null;
+                    $first = true;
+                    foreach ($row as $key=>$value)
+                    {
+                        if($key == 'user_id' || $key == 'node_id' || $key == 'conn_id' || $key == 'user_mac' ) {
+                            $value = "'".$this->getNonRepeatableHash($value)."'";
+                        }
+                        else if ($key == 'timestamp_out' && empty ($value)) {
+                            $value = 'NULL';
+                        }
+                        else {
+                            $value = "'$value'";
+                        }
+                        if(!$first) {
+                            $keys .= ', ';
+                            $values .= ', ';
+                        }
+                        else {
+                            $first = false;
+                        }
+                        $keys .= $key;
+                        $values .= $value;
                     }
-                    else if ($key == 'timestamp_out' && empty ($value)) {
-                        $value = 'NULL';
-                    }
-                    else {
-                        $value = "'$value'";
-                    }
-                    if(!$first) {
-                        $keys .= ', ';
-                        $values .= ', ';
-                    }
-                    else {
-                        $first = false;
-                    }
-                    $keys .= $key;
-                    $values .= $value;
+                    //fwrite($temp, "INSERT INTO connections_anonymised ($keys) VALUES ($values);\n");
+                    echo "INSERT INTO connections_anonymised ($keys) VALUES ($values);\n";
                 }
-                $html .= "INSERT INTO connections_anonymised ($keys) VALUES ($values);\n";
-                //$html .= "<br/>\n";
             }
+            exit;
         }
-        header('Content-Type: text/plain');
-        header('Content-Disposition: inline; filename="anonymised_data.sql"');
-        header("Content-Transfer-Encoding: binary");
-        echo $html;
-        exit;
+        return $html;
     }