diff --git a/site/accesBase.php b/site/accesBase.php
index e78f8db..7e9577d 100644
--- a/site/accesBase.php
+++ b/site/accesBase.php
@@ -111,23 +111,6 @@
$tab = pg_fetch_all($result);
return $tab;
}
-
- /*function upload($index,$maxsize=FALSE,$extensions=FALSE)
- {
- //Test1: fichier correctement uploadé
- if (!isset($_FILES[$index]) OR $_FILES[$index]['error'] > 0) return FALSE;
- //Test2: taille limite
- if ($maxsize !== FALSE AND $_FILES[$index]['size'] > $maxsize) return FALSE;
- //Test3: extension
- $ext = substr(strrchr($_FILES[$index]['name'],'.'),1);
- if ($extensions !== FALSE AND !in_array($ext,$extensions)) return FALSE;
- $name = "main";
- $extension_upload = strtolower( substr( strrchr($_FILES['fichier']['name'], '.') ,1) );
- $dossier = "upload/";
- $fichier = $name.".".$extension_upload;
- //$fichier = basename($_FILES[$index]['name']);
- return move_uploaded_file($_FILES['fichier']['tmp_name'],$dossier.$fichier);
- }*/
function load($tmp_name, $name)
{
@@ -144,24 +127,6 @@
return False;
}
- function update_values()
- {
- $rep = 'data';
- $fichiers = array_diff(scandir($rep), array('..', '.'));
- $db = connexion();
- foreach($fichiers as $fichier) {
- $parametres = simplexml_load_file('data/'.$fichier);
- list($ip_address) = $parametres->xpath("parametre[@name='ip_address']");
- list($numero) = $parametres->xpath("parametre[@name='numero']");
- list($name) = $parametres->xpath("parametre[@name='name']");
- list($data) = $parametres->xpath("parametre[@name='data']");
-
- $query = "UPDATE capteurs SET value='$data' WHERE raspberry='$ip_address' and numero='$numero' and nom='$name'";
- $result = pg_query($db, $query) or die("La requête a echoué : ".pg_last_error());
- }
- deconnexion($db);
- }
-
function update_bdd($ip_address, $numero, $data, $date)
{
$name = getSensorName($ip_address, $numero);
@@ -287,9 +252,14 @@
}
}
- function add($nom, $type, $raspberry, $numero, $unite, $version)
+ function add($nom, $type, $raspberry, $unite, $version)
{
$db = connexion();
+ $query = "SELECT MAX(numero) as numero FROM capteurs WHERE raspberry = '$raspberry'";
+ $result = pg_query($db, $query) or die("La requête a echoué : ".pg_last_error());
+ $tab = pg_fetch_assoc($result);
+ $numero = $tab['numero'] +1;
+ if($numero > 4) return False;
$query = "SELECT * FROM capteurs WHERE nom = '$nom' OR (raspberry = '$raspberry' AND numero = '$numero')";
$result = pg_query($db, $query) or die("La requête a echoué : ".pg_last_error());
if (pg_affected_rows($result)!=0){
diff --git a/site/add.php b/site/add.php
index 3abf74e..ad513bc 100644
--- a/site/add.php
+++ b/site/add.php
@@ -20,7 +20,7 @@ session_start();