diff --git a/LIB/.gitkeep b/NGCC/LIB/.gitkeep similarity index 100% rename from LIB/.gitkeep rename to NGCC/LIB/.gitkeep diff --git a/LIB/junit-platform-console-standalone-1.5.1.jar b/NGCC/LIB/junit-platform-console-standalone-1.5.1.jar similarity index 100% rename from LIB/junit-platform-console-standalone-1.5.1.jar rename to NGCC/LIB/junit-platform-console-standalone-1.5.1.jar diff --git a/LICENSE b/NGCC/LICENSE similarity index 100% rename from LICENSE rename to NGCC/LICENSE diff --git a/README.md b/NGCC/README.md similarity index 100% rename from README.md rename to NGCC/README.md diff --git a/grades.csv b/NGCC/export/.gitkeep similarity index 100% rename from grades.csv rename to NGCC/export/.gitkeep diff --git a/installer.bat b/NGCC/installer.bat similarity index 100% rename from installer.bat rename to NGCC/installer.bat diff --git a/NGCC/installer.sh b/NGCC/installer.sh new file mode 100644 index 0000000..4a1773b --- /dev/null +++ b/NGCC/installer.sh @@ -0,0 +1,4 @@ +#!bin/bash + + +java -Dfile.encoding=UTF-8 -classpath NGCC/bin:/Users/louis/.p2/pool/plugins/org.junit.jupiter.api_5.3.1.v20181005-1442.jar:/Users/louis/.p2/pool/plugins/org.junit.jupiter.engine_5.3.1.v20181005-1442.jar:/Users/louis/.p2/pool/plugins/org.junit.jupiter.migrationsupport_5.3.1.v20181005-1442.jar:/Users/louis/.p2/pool/plugins/org.junit.jupiter.params_5.3.1.v20181005-1442.jar:/Users/louis/.p2/pool/plugins/org.junit.platform.commons_1.3.1.v20181005-1442.jar:/Users/louis/.p2/pool/plugins/org.junit.platform.engine_1.3.1.v20181005-1442.jar:/Users/louis/.p2/pool/plugins/org.junit.platform.launcher_1.3.1.v20181005-1442.jar:/Users/louis/.p2/pool/plugins/org.junit.platform.runner_1.3.1.v20181005-1442.jar:/Users/louis/.p2/pool/plugins/org.junit.platform.suite.api_1.3.1.v20181005-1442.jar:/Users/louis/.p2/pool/plugins/org.junit.vintage.engine_5.3.1.v20181005-1442.jar:/Users/louis/.p2/pool/plugins/org.opentest4j_1.1.1.v20181005-1442.jar:/Users/louis/.p2/pool/plugins/org.apiguardian_1.0.0.v20181005-1442.jar:/Users/louis/.p2/pool/plugins/org.junit_4.12.0.v201504281640/junit.jar:/Users/louis/.p2/pool/plugins/org.hamcrest.core_1.3.0.v20180420-1519.jar:NGCC/jar/commons-beanutils-1.9.2.jar:NGCC/jar/commons-io-2.6.jar:NGCC/jar/commons-logging-1.2-javadoc.jar:NGCC/jar/commons-logging-1.2.jar:NGCC/jar/fontbox-2.0.9.jar:NGCC/jar/fontbox-2.0.16.jar:NGCC/jar/ghost4j-1.0.1.jar:NGCC/jar/hamcrest-core-1.3.jar:NGCC/jar/itext-2.1.7.jar:NGCC/jar/jai-imageio-core-1.4.0.jar:NGCC/jar/jbig2-imageio-3.0.0.jar:NGCC/jar/jboss-vfs-3.2.12.Final.jar:NGCC/jar/jcl-over-slf4j-1.7.25.jar:NGCC/jar/jna-4.1.0.jar:NGCC/jar/jul-to-slf4j-1.7.25.jar:NGCC/jar/junit-4.12.jar:NGCC/jar/lept4j-1.6.4.jar:NGCC/jar/log4j-api-2.12.1.jar:NGCC/jar/log4j-core-2.12.1.jar:NGCC/jar/log4j-over-slf4j-1.7.25.jar:NGCC/jar/logback-classic-1.2.3.jar:NGCC/jar/logback-core-1.2.3.jar:NGCC/jar/pdfbox-2.0.9.jar:NGCC/jar/pdfbox-2.0.16.jar:NGCC/jar/pdfbox-app-2.0.16.jar:NGCC/jar/pdfbox-debugger-2.0.16.jar:NGCC/jar/pdfbox-tools-2.0.9.jar:NGCC/jar/pdfbox-tools-2.0.16.jar:NGCC/jar/preflight-2.0.16.jar:NGCC/jar/preflight-app-2.0.16.jar:NGCC/jar/slf4j-api-1.7.25.jar:NGCC/jar/tess4j-3.4.8.jar:NGCC/jar/xmlgraphics-commons-1.5.jar:NGCC/jar/xmpbox-2.0.16.jar:Tess4j Exec \ No newline at end of file diff --git a/NGCC/pdf b/NGCC/pdf deleted file mode 100644 index b247134..0000000 --- a/NGCC/pdf +++ /dev/null @@ -1,7 +0,0 @@ -Student number;Grade -211052130 -;4 - -11052130 -;4 - diff --git a/pdf/belleImage.jpeg b/NGCC/pdf/belleImage.jpeg similarity index 100% rename from pdf/belleImage.jpeg rename to NGCC/pdf/belleImage.jpeg diff --git a/pdf/img_0.jpg b/NGCC/pdf/img_0.jpg similarity index 100% rename from pdf/img_0.jpg rename to NGCC/pdf/img_0.jpg diff --git a/pdf/img_1.jpg b/NGCC/pdf/img_1.jpg similarity index 100% rename from pdf/img_1.jpg rename to NGCC/pdf/img_1.jpg diff --git a/pdf/testPDFMarks copie.pdf b/NGCC/pdf/testPDFMarks copie.pdf similarity index 100% rename from pdf/testPDFMarks copie.pdf rename to NGCC/pdf/testPDFMarks copie.pdf diff --git a/pdf/testPDFMarks.pdf b/NGCC/pdf/testPDFMarks.pdf similarity index 100% rename from pdf/testPDFMarks.pdf rename to NGCC/pdf/testPDFMarks.pdf diff --git a/NGCC/resources/log4j2.properties b/NGCC/resources/log4j2.properties index 81eb8f1..29862d4 100644 --- a/NGCC/resources/log4j2.properties +++ b/NGCC/resources/log4j2.properties @@ -11,7 +11,7 @@ appender.console.layout.pattern = [%-5level] %d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %c appender.file.type = File appender.file.name = LOGFILE -appender.file.fileName=../${filename}/ngcclogs.log +appender.file.fileName=${filename}/ngcclogs.log appender.file.layout.type=PatternLayout appender.file.layout.pattern=[%-5level] %d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %c{1} - %msg%n diff --git a/NGCC/src/commands/Read.java b/NGCC/src/commands/Read.java index bb9f493..6245616 100644 --- a/NGCC/src/commands/Read.java +++ b/NGCC/src/commands/Read.java @@ -2,6 +2,7 @@ package commands; import picocli.CommandLine; + import picocli.CommandLine.*; import progressbar.ProgressBar; @@ -151,7 +152,7 @@ public class Read implements Callable { String filePath = new File("").getAbsolutePath(); // Instantie l'OCR - GestionnaireCopies ocr = new GestionnaireCopies("../"+directory_name); + GestionnaireCopies ocr = new GestionnaireCopies(directory_name); logger.debug("CSV initialized with : "+ocr.createHashMapforCSV()+" , "+config.getParam().get("Code")+" , "+result_name); diff --git a/NGCC/src/csv/GenerateCSV.java b/NGCC/src/csv/GenerateCSV.java index 70b569e..719aac3 100644 --- a/NGCC/src/csv/GenerateCSV.java +++ b/NGCC/src/csv/GenerateCSV.java @@ -1,9 +1,10 @@ package csv; import java.io.File; + import java.io.FileNotFoundException; import java.io.PrintWriter; -import java.util.HashMap; + import java.util.Map; import org.apache.logging.log4j.LogManager; @@ -13,7 +14,7 @@ public class GenerateCSV { Map etudiants; int numLength; - String path = "../export"; + String path = "export"; Logger logger = LogManager.getLogger(GenerateCSV.class); public GenerateCSV(Map map, String length, String pth) { diff --git a/installer.sh b/installer.sh deleted file mode 100644 index b2a049c..0000000 --- a/installer.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!bin/bash - - -mkdir bin; - -javac -cp ".:NGCC/jar/*" -d bin NGCC/src/*/*.java NGCC/src/Exec.java; - - -cd bin; - -java -cp ".:NGCC/jar/*" Exec; \ No newline at end of file