Skip to content

Commit

Permalink
Merge pull request #38 from rwth-acis/handle_docx
Browse files Browse the repository at this point in the history 
Handle docx
  • Loading branch information
@Tobasco99
Tobasco99 authored Jul 25, 2023
2 parents 19485d4 + 8e8c072 commit 92611f4
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 5 deletions.
2 changes: 1 addition & 1 deletion las2peer-tmitocar-service/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies {
implementation "org.jacoco:org.jacoco.ant:0.8.5"
implementation "net.minidev:json-smart:1.3.1"
implementation "org.apache.pdfbox:pdfbox-ant:1.8.16"

implementation group: 'org.apache.poi', name: 'poi-ooxml', version: '5.2.3'
implementation "org.apache.tika:tika-core:2.7.0"

// MongoDB Java driver GridFS
Expand Down
41 changes: 37 additions & 4 deletions las2peer-tmitocar-service/src/main/java/i5/las2peer/services/tmitocar/TmitocarService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@
import net.minidev.json.parser.JSONParser;
import net.minidev.json.parser.ParseException;
import org.apache.pdfbox.pdfparser.PDFParser;
import org.apache.poi.xwpf.extractor.XWPFWordExtractor;
import org.apache.poi.xwpf.usermodel.XWPFDocument;
import org.bson.BsonDocument;
import org.bson.BsonInt64;
import org.bson.BsonObjectId;
Expand Down Expand Up @@ -457,6 +459,10 @@ public void run() {
System.out.println(decodedBytes);
FileUtils.writeByteArrayToFile(f, decodedBytes);
textContent = readPDFFile("tmitocar/texts/" + user + "/" + fileName);
} else if (type.equalsIgnoreCase("application/vnd.openxmlformats-officedocument.wordprocessingml.document") || type.equalsIgnoreCase("docx")) {
byte[] decodedBytes = Base64.decode(body.getText());
FileUtils.writeByteArrayToFile(f, decodedBytes);
textContent = readDocXFile("tmitocar/texts/" + user + "/" + fileName);
}
if (textContent.replaceAll("\\s", "").length() < 350) {
System.out.println("not enough words");
Expand Down Expand Up @@ -656,7 +662,7 @@ public static class TMitocarText {
* @param label1 the first label (user text)
* @param textInputStream the InputStream containing the text to compare
* @param textFileDetail the file details of the text file
* @param type the type of text (txt or pdf)
* @param type the type of text (txt, pdf or docx)
* @return id of the stored file
* @throws ParseException if there is an error parsing the input parameters
* @throws IOException if there is an error reading the input stream
Expand Down Expand Up @@ -859,7 +865,7 @@ private static String formatJSONArray(JSONArray jsonArray) {


@Api(value = "Feedback Resource")
@SwaggerDefinition(info = @Info(title = "Feedback Resource", version = "1.0.0", description = "This API is responsible for handling text documents in txt or pdf format and sending them to T-MITOCAR for processing. The feedback is then saved in a MongoDB and the document IDs are returned.", termsOfService = "https://tech4comp.de/", contact = @Contact(name = "Alexander Tobias Neumann", url = "https://tech4comp.dbis.rwth-aachen.de/", email = "neumann@dbis.rwth-aachen.de"), license = @License(name = "ACIS License (BSD3)", url = "https://github.com/rwth-acis/las2peer-tmitocar-Service/blob/master/LICENSE")))
@SwaggerDefinition(info = @Info(title = "Feedback Resource", version = "1.0.0", description = "This API is responsible for handling text documents in txt, pdf or docx format and sending them to T-MITOCAR for processing. The feedback is then saved in a MongoDB and the document IDs are returned.", termsOfService = "https://tech4comp.de/", contact = @Contact(name = "Alexander Tobias Neumann", url = "https://tech4comp.dbis.rwth-aachen.de/", email = "neumann@dbis.rwth-aachen.de"), license = @License(name = "ACIS License (BSD3)", url = "https://github.com/rwth-acis/las2peer-tmitocar-Service/blob/master/LICENSE")))
@Path("/feedback")
public static class Feedback {
TmitocarService service = (TmitocarService) Context.get().getService();
Expand All @@ -870,7 +876,7 @@ public static class Feedback {
* @param label1 the first label (user text)
* @param textInputStream the InputStream containing the text to compare
* @param textFileDetail the file details of the text file
* @param type the type of text (txt or pdf)
* @param type the type of text (txt, pdf or docx)
* @param topic the topic of the text (e.g. BiWi 5)
* @param template the template to use for the PDF report
* @param wordSpec the word specification for the PDF report
Expand Down Expand Up @@ -1004,7 +1010,7 @@ public Response getAnalyzedText(@PathParam("label1") String label1) throws Parse
* @param label2 the second label (expert or second user text)
* @param textInputStream the InputStream containing the text to compare
* @param textFileDetail the file details of the text file
* @param type the type of text (txt or pdf)
* @param type the type of text (txt, pdf or docx)
* @param template the template to use for the PDF report
* @param wordSpec the word specification for the PDF report
* @return the id of the stored file
Expand Down Expand Up @@ -1492,6 +1498,22 @@ private static String readTxtFile(String fileName) {
return text;
}

private String readDocXFile(String fileName) {
String parsedText = "";
File file = new File(fileName);
try {
FileInputStream inputStream = new FileInputStream(file);
XWPFDocument document = new XWPFDocument(inputStream);
XWPFWordExtractor extractor = new XWPFWordExtractor(document);
parsedText = extractor.getText();
inputStream.close();
} catch (Exception e) {
e.printStackTrace();
}

return parsedText;
}

private String readPDFFile(String fileName) {
org.apache.pdfbox.pdfparser.PDFParser parser = null;
org.apache.pdfbox.pdmodel.PDDocument pdDoc = null;
Expand Down Expand Up @@ -1527,6 +1549,8 @@ private String createFileName(String name, String type) {
return name + ".txt";
} else if (type.toLowerCase().equals("application/pdf") || type.toLowerCase().equals("pdf")) {
return name + ".pdf";
} else if (type.equalsIgnoreCase("application/vnd.openxmlformats-officedocument.wordprocessingml.document") || type.equalsIgnoreCase("docx")) {
return name + ".docx";
}
return name + "txt";
}
Expand Down Expand Up @@ -1557,6 +1581,10 @@ private boolean storeFileLocally(String name, String text, String type) {
System.out.println(decodedBytes);
FileUtils.writeByteArrayToFile(f, decodedBytes);
textContent = readPDFFile("tmitocar/texts/" + name + "/" + fileName);
} else if (type.equalsIgnoreCase("application/vnd.openxmlformats-officedocument.wordprocessingml.document") || type.equalsIgnoreCase("docx")) {
byte[] decodedBytes = Base64.decode(text);
FileUtils.writeByteArrayToFile(f, decodedBytes);
textContent = readDocXFile("tmitocar/texts/" + name + "/" + fileName);
} else {
System.out.println("wrong type");
throw new IOException();
Expand Down Expand Up @@ -1590,6 +1618,11 @@ private void deleteFileLocally(String name) {
} catch (IOException e) {
e.printStackTrace();
}
try {
Files.delete(Paths.get("tmitocar/texts/" + name + "/" + name + ".docx"));
} catch (IOException e) {
e.printStackTrace();
}
}

private void cleanJSONFile(String path){
Expand Down

0 comments on commit 92611f4

Please sign in to comment.