ocr-service-v1/ocr-service-processor/build.gradle.kts

@@ -25,7 +25,7 @@ dependencies {
     api("io.github.karols:hocr4j:0.2.0")
     api("com.amazonaws:aws-java-sdk-kms:1.12.440")
     api("com.google.guava:guava:31.1-jre")
-    api("com.iqser.red.commons:pdftron-logic-commons:2.32.0")
+    api("com.iqser.red.commons:pdftron-logic-commons:2.27.0")
     api("com.knecon.fforesight:viewer-doc-processor:0.125.0")
     testImplementation("org.junit.jupiter:junit-jupiter:5.8.1")
 }

ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/model/RenderedPageOcrImage.java

@@ -24,7 +24,7 @@ public class RenderedPageOcrImage implements OcrImage {
     public AffineTransform getImageCTM() {
 
         double scalingFactor = calculateScalingFactor();
-        AffineTransform imageToCropBoxScaling = new AffineTransform(scalingFactor, 0, 0, scalingFactor, 0, 0);
+        AffineTransform imageToCropBoxScaling = new AffineTransform(scalingFactor, 0, 0, scalingFactor, -pageInformation.minX(), -pageInformation.minY());
 
         AffineTransform mirrorMatrix = new AffineTransform(1, 0, 0, -1, 0, pageInformation.height());
 

ocr-service-v1/ocr-service-server/build.gradle.kts

@@ -39,7 +39,7 @@ tasks.named<BootBuildImage>("bootBuildImage") {
 
     environment.put("BPE_DELIM_JAVA_TOOL_OPTIONS", " ")
     environment.put("BPE_APPEND_JAVA_TOOL_OPTIONS", "-Dfile.encoding=UTF-8")
-    environment.put("BPE_GS_LIB", "/layers/fagiani_apt/apt/usr/share/ghostscript/9.55.0/Resource/Init/") // set ghostscript lib path, version in path must match version in Aptfile
+    environment.put("BPE_GS_LIB", "/layers/fagiani_apt/apt/usr/share/ghostscript/9.26/Resource/Init/") // set ghostscript lib path
     environment.put("BPE_FONTCONFIG_PATH", "/layers/fagiani_apt/apt/etc/fonts/") // set ghostscript fontconfig path
 
     var aptfile = layout.projectDirectory.file("src/main/resources/Aptfile").toString()

ocr-service-v1/ocr-service-server/src/main/resources/Aptfile

@@ -1,5 +1,5 @@
 # you can list packages
-ghostscript=9.55.0~dfsg1-0ubuntu5.9
+ghostscript
 pkg-config
 zip
 unzip
@@ -11,7 +11,6 @@ libk5crypto3
 libkrb5support0
 libkeyutils1
 libkrb5-3
-libbrotli1
 
 # or include links to specific .deb files
 # http://ftp.debian.org/debian/pool/contrib/m/msttcorefonts/ttf-mscorefonts-installer_3.8_all.deb

publish-custom-image.sh

@@ -1,9 +1,5 @@
 #!/bin/bash
-
-set -e
-
 dir=${PWD##*/}
-
 gradle assemble
 
 # Get the current Git branch
@@ -15,32 +11,5 @@ commit_hash=$(git rev-parse --short=5 HEAD)
 # Combine branch and commit hash
 buildName="${USER}-${branch}-${commit_hash}"
 
-gradle bootBuildImage --publishImage -PbuildbootDockerHostNetwork=true -Pversion=${buildName}
-
-newImageName="nexus.knecon.com:5001/ff/ocr-service-server:$buildName"
-
-echo "full image name:"
-echo ${newImageName}
-echo ""
-
-if [ -z "$1" ]; then
-    exit 0
-fi
-
-namespace=${1}
-deployment_name="ocr-service-v1"
-
-echo "deploying to ${namespace}"
-
-oldImageName=$(rancher kubectl -n ${namespace} get deployment ${deployment_name} -o=jsonpath='{.spec.template.spec.containers[*].image}')
-
-if [ "${newImageName}" = "${oldImageName}" ]; then
-    echo "Image tag did not change, redeploying..."
-    rancher kubectl rollout restart deployment ${deployment_name} -n ${namespace}
-else
-    echo "upgrading the image tag..."
-    rancher kubectl set image deployment/${deployment_name} ${deployment_name}=${newImageName} -n ${namespace}
-fi
-rancher kubectl rollout status deployment ${deployment_name} -n ${namespace}
-echo "Built ${deployment_name}:${buildName} and deployed to ${namespace}"
-
+gradle bootBuildImage --publishImage -PbuildbootDockerHostNetwork=true -Pversion=$buildName
+echo "nexus.knecon.com:5001/ff/${dir}-server:$buildName"