diff --git a/backend/foodspector/pom.xml b/backend/foodspector/pom.xml index fad64c12d3d45b00540df2c0fdce954dc3d84c07..284962b89a78a4fe952070b05ad886c47ee7d6da 100644 --- a/backend/foodspector/pom.xml +++ b/backend/foodspector/pom.xml @@ -45,6 +45,7 @@ <version>1.8.0-beta4</version> </dependency> + <dependency> <groupId>io.javalin</groupId> <artifactId>javalin</artifactId> @@ -67,6 +68,18 @@ <groupId>org.apache.solr</groupId> <artifactId>solr-solrj</artifactId> <version>8.5.0</version> + + + <exclusions> + <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> diff --git a/backend/foodspector/src/main/java/ch/hepia/foodspector/App.java b/backend/foodspector/src/main/java/ch/hepia/foodspector/App.java index 2f4cf5a9dee0710c819581beb143b8c5b0df697c..2cb6a1397c32fa542d577161ded26b9f071d0f33 100644 --- a/backend/foodspector/src/main/java/ch/hepia/foodspector/App.java +++ b/backend/foodspector/src/main/java/ch/hepia/foodspector/App.java @@ -13,7 +13,7 @@ public class App { Javalin app = Javalin.create().start(7000); - app.post("/images/", ImageController::processImages); + app.post("/images", ImageController::processImages); } } diff --git a/backend/foodspector/src/main/java/ch/hepia/foodspector/controllers/ImageController.java b/backend/foodspector/src/main/java/ch/hepia/foodspector/controllers/ImageController.java index 11a9022e7d9f1825397ea7ee32885325329fae75..0103b33f6de16b00d88587d1ac32c0cefd0f9b7a 100644 --- a/backend/foodspector/src/main/java/ch/hepia/foodspector/controllers/ImageController.java +++ b/backend/foodspector/src/main/java/ch/hepia/foodspector/controllers/ImageController.java @@ -2,16 +2,13 @@ package ch.hepia.foodspector.controllers; import io.javalin.http.Context; import io.javalin.http.UploadedFile; -import net.sourceforge.tess4j.*; +import net.sourceforge.tess4j.ITesseract; +import net.sourceforge.tess4j.Tesseract; import net.sourceforge.tess4j.util.LoadLibs; -import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.SolrQuery; -import org.apache.solr.client.solrj.SolrRequest; -import org.apache.solr.client.solrj.SolrResponse; import org.apache.solr.client.solrj.impl.HttpSolrClient; import org.apache.solr.client.solrj.response.QueryResponse; import org.apache.solr.common.SolrDocumentList; -import org.apache.solr.common.params.SolrParams; import javax.imageio.ImageIO; import java.awt.image.BufferedImage; @@ -19,6 +16,7 @@ import java.awt.image.RenderedImage; import java.io.ByteArrayInputStream; import java.io.File; import java.util.*; +import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; public class ImageController { @@ -32,6 +30,7 @@ public class ImageController { Set<String> filenames = ctx.formParamMap().keySet(); + filenames.forEach( filename -> { UploadedFile file = ctx.uploadedFile(filename); @@ -40,6 +39,7 @@ public class ImageController { File outputfile = new File(filename + ".jpg"); ImageIO.write(test, "jpg", outputfile); + Thread t = new Thread() { @Override public void run() { @@ -48,14 +48,8 @@ public class ImageController { tess.setDatapath( tessDataFolder.getAbsolutePath() ); try { - /* tess.createDocumentsWithResults( - new BufferedImage[]{test}, - new String[]{"test"}, - new String[]{"test"}, - List.of(ITesseract.RenderedFormat.TEXT), - ITessAPI.TessPageIteratorLevel.RIL_WORD); */ String result = tess.doOCR(test); - // Arrays.stream( result.split(",") ).forEach( t -> System.out.println(t.strip()) ); + Arrays.stream( result.split(",") ).forEach( t -> System.out.println(t.strip()) ); // Inits the Solr Client. @@ -81,13 +75,10 @@ public class ImageController { System.out.println( "=========" ); } catch (Exception e) { - e.printStackTrace(); + System.out.println( e.getMessage() ); } }); - - - // System.out.println(result); } catch (Exception e) { System.err.println(e.getMessage()); @@ -97,7 +88,7 @@ public class ImageController { t.start(); } catch (Exception e) { - e.printStackTrace(); + System.out.println( e.getMessage() ); } } ); @@ -140,5 +131,4 @@ public class ImageController { }); } - }