Merge remote-tracking branch 'origin/main'

This commit is contained in:
Florian SYLVAIN
2022-01-08 15:17:39 +01:00
3 changed files with 17 additions and 13 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="PublishConfigData" serverName="Sapinet" remoteFilesAllowedToDisappearOnAutoupload="false"> <component name="PublishConfigData" serverName="Sapinet" exclude=".svn;.cvs;.idea;.DS_Store;.git;.hg;*.hprof;*.pyc;.env" remoteFilesAllowedToDisappearOnAutoupload="false">
<serverData> <serverData>
<paths name="Sapinet"> <paths name="Sapinet">
<serverdata> <serverdata>
+4 -4
View File
@@ -72,7 +72,7 @@ function apiRequestThese(search, offset) {
.then(data => { .then(data => {
fetch(`api.php?q=count&search=${searchString}&option=${queryOption}&offset=0`) fetch(`api.php?q=count&search=${searchString}&option=${queryOption}&offset=0`)
.then(response => response.json()) .then(response => response.json())
.then(aCount => displayResults(data, aCount.data[0])) .then(aCount => displayResults(data, aCount.data ? aCount.data[0] : 0))
}) })
} else { } else {
alert('Veuillez attendre une seconde entre chaque recherche.') alert('Veuillez attendre une seconde entre chaque recherche.')
@@ -95,7 +95,7 @@ window.addEventListener('scroll', fadeIn);
function updatePageNumber(number) { function updatePageNumber(number) {
pagesNumbers.childNodes.forEach(elem => { pagesNumbers.childNodes.forEach(elem => {
if (elem.innerHTML == number) { if (parseInt(elem.innerHTML) === number) {
elem.style.fontWeight = "bold" elem.style.fontWeight = "bold"
elem.style.textDecoration = "underline" elem.style.textDecoration = "underline"
pagesNumbers.scrollLeft += elem.getBoundingClientRect().left - pagesNumbers.scrollLeft += elem.getBoundingClientRect().left -
@@ -133,7 +133,6 @@ function displayResults(results, aCount) {
error.classList.add("fade-in"); error.classList.add("fade-in");
errorMessage.innerHTML = results.message errorMessage.innerHTML = results.message
pagesNumbersContainer.style.display = 'none' pagesNumbersContainer.style.display = 'none'
return;
} else if (results.status === 200) { } else if (results.status === 200) {
count = aCount count = aCount
resultsArray = [] resultsArray = []
@@ -180,7 +179,8 @@ function displayResults(results, aCount) {
let pre_replacement = new RegExp(searchString, 'gi').exec(e) let pre_replacement = new RegExp(searchString, 'gi').exec(e)
child.innerHTML = e.replace(pre_replacement, `<mark>${pre_replacement}</mark>`) child.innerHTML = e.replace(pre_replacement, `<mark>${pre_replacement}</mark>`)
content.appendChild(child) content.appendChild(child)
} i += 1 }
i += 1
}) })
header.addEventListener('click', () => { header.addEventListener('click', () => {
+6 -2
View File
@@ -9,9 +9,12 @@ require_once('../class/dotEnv.php');
if (($handle = fopen(getenv('FILE'), "r")) !== FALSE) { if (($handle = fopen(getenv('FILE'), "r")) !== FALSE) {
$dbname = getenv('DBNAME');
$pdo_obj = new conf(); $pdo_obj = new conf();
$pdo = $pdo_obj->getPDO(); $pdo = $pdo_obj->getPDO();
$stmt = $pdo->query("TRUNCATE `" . getenv('DBNAME') ."`.`theses`"); $stmt = $pdo->prepare("TRUNCATE `:dbname`.`theses`");
$stmt->bindParam(':dbname', $dbname);
$row = 1; $row = 1;
while (($data = fgetcsv($handle, 10000, ";")) !== FALSE) { while (($data = fgetcsv($handle, 10000, ";")) !== FALSE) {
@@ -27,7 +30,8 @@ if (($handle = fopen(getenv('FILE'), "r")) !== FALSE) {
} catch (Exception $e) { } catch (Exception $e) {
echo "<br><br>Failed on " . $row . " ( " . $e->getMessage() . " ) :<br>"; echo "<br><br>Failed on " . $row . " ( " . $e->getMessage() . " ) :<br>";
} }
} $row++; }
$row++;
} }
fclose($handle); fclose($handle);
echo "<br><br>CSV file imported into DB. (" . $row . " results)"; echo "<br><br>CSV file imported into DB. (" . $row . " results)";