From e797580812ce12e7ba6743298847233fbe649119 Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Wed, 15 Feb 2023 13:53:57 +0100
Subject: [PATCH] change to SQL

---
 dataCollector/dataCollector.php | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/dataCollector/dataCollector.php b/dataCollector/dataCollector.php
index aa44a5d..25d590e 100644
--- a/dataCollector/dataCollector.php
+++ b/dataCollector/dataCollector.php
@@ -18,22 +18,19 @@ $databasePort = "3306";
 $databaseName = "u517357132_genderwatchpro";
 $databaseUser = "u517357132_genderwatchpro";
 $databasePassword = "zU!7gRHA6x";
-$link = mysqli_connect($databaseAddress, $databaseUser, $databasePassword, $databaseName);
-if (!$link) {
-    die('Could not connect to Database: ' . mysql_error());
+$conn = new mysqli($databaseAddress, $databaseUser, $databasePassword, $databaseName);
+// Check connection
+if ($conn->connect_error) {
+    die("Connection failed: " . $conn->connect_error);
 }
-//if connection is successfully you will see message below
-echo 'Connected successfully to Database<br>';
 
-mysqli_close($link);
-//$mysqli = new mysqli($databaseAddress, $databaseUser, $databasePassword, $databaseName);
-
-function saveToDatabase($contentArray, $mysqli) {
+function saveToDatabase($contentArray, $conn) {
     echo "sending Query to Database<br>";
-    $response =  mysqli_query($mysqli, "INSERT INTO `topics` (`id`, `fullJSON`, `timeWatchM`,`timeWatchW`, `timeWatchD`, `countWatchM`, `countWatchW`, `countWatchD`) values ($contentArray[0], $contentArray[2], $contentArray[3], $contentArray[4], $contentArray[5], $contentArray[6], $contentArray[7], $contentArray[8]) ON DUPLICATE KEY UPDATE `id` = $contentArray[0]");
+    $sql = "INSERT INTO `topics` (`id`, `fullJSON`, `timeWatchM`,`timeWatchW`, `timeWatchD`, `countWatchM`, `countWatchW`, `countWatchD`) values ($contentArray[0], $contentArray[2], $contentArray[3], $contentArray[4], $contentArray[5], $contentArray[6], $contentArray[7], $contentArray[8]) ON DUPLICATE KEY UPDATE `id` = $contentArray[0]";
+    $result = $conn->query($sql);
     echo "Query sent<br>";
-    echo $response;
-    return $response;
+    echo $result;
+    return $result;
 }
 
 function getFromDatabase() {
@@ -48,7 +45,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
     echo "POST Request received.<br>";
 
     if(property_exists($entityBodyObject, "id")) {
-        saveToDatabase(objectToArray($entityBodyObject, $entityBody), $link);
+        saveToDatabase(objectToArray($entityBodyObject, $entityBody), $conn);
         echo "<br>Data saved.<br>";
     }
 } elseif($_SERVER['REQUEST_METHOD'] === 'GET') {
@@ -59,6 +56,5 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
 
 
 
-
-mysqli_close( );
+$conn->close();