mirror of
https://github.com/BreizhHardware/projetCGroupe8.git
synced 2026-01-18 16:37:25 +01:00
Fix the last memory leaks, the stop server button on the result page and remove the searchByCategory function due to issue
This commit is contained in:
@@ -267,6 +267,7 @@ int readRequest(char* request, struct List* tableau[LENGTH], struct Filmotheque*
|
||||
deleteFile();
|
||||
return 0;
|
||||
}
|
||||
/*
|
||||
else if (strcmp(fonction, "searchByCategory") == 0){
|
||||
clock_t start;
|
||||
start = clock();
|
||||
@@ -278,6 +279,7 @@ int readRequest(char* request, struct List* tableau[LENGTH], struct Filmotheque*
|
||||
deleteFile();
|
||||
return 0;
|
||||
}
|
||||
*/
|
||||
else if (strcmp(fonction, "searchByFilm") == 0){
|
||||
clock_t start;
|
||||
start = clock();
|
||||
|
||||
@@ -1 +1 @@
|
||||
searchByTime;69
|
||||
searchByDirector;Olsson
|
||||
@@ -25,11 +25,13 @@
|
||||
<input type="text" id="duree" class="searchField" name="duree" placeholder="Rechercher par la durée"><br>
|
||||
<button type="submit" id="dureeButton" class="searchButton" onclick="writeFile('formDuree', 'searchByTime')" disabled>Rechercher par durée</button>
|
||||
</form>
|
||||
<!--
|
||||
<form id="formCategorie" action="result.html">
|
||||
<p id="categorieError" class="error"></p>
|
||||
<input type="text" id="categorie" class="searchField" name="categorie" placeholder="Rechercher par la catégorie"><br>
|
||||
<button type="submit" id="categorieButton" class="searchButton" onclick="writeFile('formCategorie', 'searchByCategory')" disabled>Rechercher par catégorie</button>
|
||||
</form>
|
||||
-->
|
||||
<form id="formFilm" action="result.html">
|
||||
<p id="filmError" class="error"></p>
|
||||
<input type="text" id="film" class="searchField" name="film" placeholder="Rechercher par le nom d'un film"><br>
|
||||
|
||||
@@ -87,6 +87,7 @@ document.getElementById('dureeButton').addEventListener('click', function() {
|
||||
});
|
||||
});
|
||||
|
||||
/*
|
||||
document.getElementById('categorieButton').addEventListener('click', function() {
|
||||
writeFile('formCategorie', 'searchByCategorie')
|
||||
.then(() => {
|
||||
@@ -97,6 +98,8 @@ document.getElementById('categorieButton').addEventListener('click', function()
|
||||
});
|
||||
});
|
||||
|
||||
*/
|
||||
|
||||
document.getElementById('filmButton').addEventListener('click', function() {
|
||||
writeFile('formFilm', 'searchByFilm')
|
||||
.then(() => {
|
||||
|
||||
@@ -30,6 +30,7 @@ function displayDuree(time){
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
function displayCategorie(time){
|
||||
const queryString = window.location.search;
|
||||
if(queryString.includes("categorie")){
|
||||
@@ -40,6 +41,8 @@ function displayCategorie(time){
|
||||
readAndDisplay();
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
function displayFilm(time){
|
||||
const queryString = window.location.search;
|
||||
@@ -150,6 +153,20 @@ function writeFile(id_form,func) {
|
||||
}
|
||||
// -------------------------
|
||||
|
||||
// ----------WRITE FILE STOP----------
|
||||
|
||||
function writeFileStop(func){
|
||||
let element = document.createElement('a');
|
||||
let textToSave = func;
|
||||
|
||||
element.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(textToSave));
|
||||
element.setAttribute('download', 'requests.txt');
|
||||
element.style.display = 'none';
|
||||
document.body.appendChild(element);
|
||||
element.click();
|
||||
document.body.removeChild(element);
|
||||
}
|
||||
|
||||
|
||||
// ------- READ FILE -------
|
||||
function readFileByName(fileName){
|
||||
@@ -327,7 +344,7 @@ const firstLine = result.split("\n")[0];
|
||||
//Appel des fonctions
|
||||
displayDirector(firstLine);
|
||||
displayDuree(firstLine);
|
||||
displayCategorie(firstLine);
|
||||
//displayCategorie(firstLine);
|
||||
displayFilm(firstLine);
|
||||
displayMostMovies(firstLine);
|
||||
displayFallBack(firstLine);
|
||||
|
||||
@@ -46,6 +46,7 @@ function validateformDuree(){
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
function validateformCategorie(){
|
||||
// Récupérer la catégorie
|
||||
let categorie = document.getElementById("categorie").value;
|
||||
@@ -67,6 +68,7 @@ function validateformCategorie(){
|
||||
lockCategorieButton();
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
function validateformFilm(){
|
||||
// Récupérer le nom du film
|
||||
@@ -100,11 +102,14 @@ function lockDureeButton(){
|
||||
document.getElementById("dureeButton").disabled = true;
|
||||
}
|
||||
|
||||
/*
|
||||
function lockCategorieButton(){
|
||||
// desactiver le bouton
|
||||
document.getElementById("categorieButton").disabled = true;
|
||||
}
|
||||
|
||||
*/
|
||||
|
||||
function lockFilmButton(){
|
||||
// desactiver le bouton
|
||||
document.getElementById("filmButton").disabled = true;
|
||||
@@ -113,11 +118,11 @@ function lockFilmButton(){
|
||||
function unlockDirectorButton(){
|
||||
// vider les autres champs
|
||||
document.getElementById("duree").value = "";
|
||||
document.getElementById("categorie").value = "";
|
||||
//document.getElementById("categorie").value = "";
|
||||
document.getElementById("film").value = "";
|
||||
// desactiver les autres boutons
|
||||
document.getElementById("dureeButton").disabled = true;
|
||||
document.getElementById("categorieButton").disabled = true;
|
||||
//document.getElementById("categorieButton").disabled = true;
|
||||
document.getElementById("filmButton").disabled = true;
|
||||
// activer le bouton
|
||||
document.getElementById("directorButton").disabled = false;
|
||||
@@ -126,16 +131,17 @@ function unlockDirectorButton(){
|
||||
function unlockDureeButton(){
|
||||
// vider les autres champs
|
||||
document.getElementById("director").value = "";
|
||||
document.getElementById("categorie").value = "";
|
||||
//document.getElementById("categorie").value = "";
|
||||
document.getElementById("film").value = "";
|
||||
// desactiver les autres boutons
|
||||
document.getElementById("directorButton").disabled = true;
|
||||
document.getElementById("categorieButton").disabled = true;
|
||||
//document.getElementById("categorieButton").disabled = true;
|
||||
document.getElementById("filmButton").disabled = true;
|
||||
// activer le bouton
|
||||
document.getElementById("dureeButton").disabled = false;
|
||||
}
|
||||
|
||||
/*
|
||||
function unlockCategorieButton(){
|
||||
// vider les autres champs
|
||||
document.getElementById("director").value = "";
|
||||
@@ -149,15 +155,17 @@ function unlockCategorieButton(){
|
||||
document.getElementById("categorieButton").disabled = false;
|
||||
}
|
||||
|
||||
*/
|
||||
|
||||
function unlockFilmButton(){
|
||||
// vider les autres champs
|
||||
document.getElementById("director").value = "";
|
||||
document.getElementById("duree").value = "";
|
||||
document.getElementById("categorie").value = "";
|
||||
//document.getElementById("categorie").value = "";
|
||||
// desactiver les autres boutons
|
||||
document.getElementById("directorButton").disabled = true;
|
||||
document.getElementById("dureeButton").disabled = true;
|
||||
document.getElementById("categorieButton").disabled = true;
|
||||
//document.getElementById("categorieButton").disabled = true;
|
||||
// activer le bouton
|
||||
document.getElementById("filmButton").disabled = false;
|
||||
}
|
||||
@@ -165,5 +173,5 @@ function unlockFilmButton(){
|
||||
//Ajouter les événements pour la validation
|
||||
document.getElementById("director").addEventListener("keyup", validateformDirector);
|
||||
document.getElementById("duree").addEventListener("keyup", validateformDuree);
|
||||
document.getElementById("categorie").addEventListener("keyup", validateformCategorie);
|
||||
//document.getElementById("categorie").addEventListener("keyup", validateformCategorie);
|
||||
document.getElementById("film").addEventListener("keyup", validateformFilm);
|
||||
@@ -44,7 +44,7 @@
|
||||
<button class="pageButton2" id="lastButton" onclick="goToLastPage()">Aller à la dernière page</button><br>
|
||||
</div>
|
||||
<button class="searchButton" id="returnToHome" onclick="returnToHome()">Retourner à l'accueil</button><br>
|
||||
<button id="stop stopResult" onclick="stopServer()">Couper le serveur</button>
|
||||
<button id="stop stopResult" onclick="writeFileStop('stopServer')">Couper le serveur</button>
|
||||
<div id="bottom">
|
||||
<p>Created by Louis MARVILLET, Herman MARZELIERE, Félix MARQUET<br>
|
||||
<br>The source code is available <a id="link" href="https://github.com/BreizhHardware/projetCGroupe8">here</a></p>
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
Dayton;A Timepiece Spoke;323;Mystery
|
||||
Dayton;Eater's Three Train;199;Western
|
||||
Dayton;Plagues and Spaces ;126;Animation
|
||||
Dayton;Affair Key;339;Adventure
|
||||
Dayton;The Revealing Patch;301;Animation
|
||||
Dayton;Children's Darkness Floor;230;Documentary
|
||||
Dayton;The Closed Gallows;366;Parody
|
||||
Dayton;Place's Slab;166;Musical
|
||||
Dayton;The Wolfhound and the Fate;205;Western
|
||||
Dayton;Humanborn;129;Animation
|
||||
Dayton;The PreyBullet;188;Suspense
|
||||
Dayton;Oona, the West Amulet;256;War
|
||||
Dayton;Lovecraft, the Wrath Door;174;Disaster
|
||||
Dayton;Patrol and a God;219;Animation
|
||||
Dayton;A Thunder Had;340;Thriller
|
||||
Dayton;Chain and the Eternal Water;141;Drama
|
||||
Dayton;After the Engine and the People;330;Science Fiction
|
||||
Dayton;Bus and the Damned Rat;148;Fantasy
|
||||
Dayton;The Fangs's Cell;181;Action
|
||||
Dayton;In the Empire;280;Animation
|
||||
Dayton;Infernoborn;83;Thriller
|
||||
Dayton;Into the Undead Blonde;164;Western
|
||||
Reference in New Issue
Block a user