From f7cb64684ee0371de3f36f1898234d6221681a31 Mon Sep 17 00:00:00 2001
From: Larry L <lluangrath@live.com>
Date: Tue, 27 Feb 2024 23:37:29 +0000
Subject: [PATCH] update cleanup function

---
 .../com/mcaps/core/servlets/HtmlServlet.java     | 16 +++++++++++-----
 .../com/mcaps/core/workflows/ScormExtractor.java | 14 +++++++-------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/core/src/main/java/com/mcaps/core/servlets/HtmlServlet.java b/core/src/main/java/com/mcaps/core/servlets/HtmlServlet.java
index 75495a8..4305b57 100644
--- a/core/src/main/java/com/mcaps/core/servlets/HtmlServlet.java
+++ b/core/src/main/java/com/mcaps/core/servlets/HtmlServlet.java
@@ -13,6 +13,8 @@ import org.apache.sling.api.servlets.SlingSafeMethodsServlet;
 import org.apache.sling.servlets.annotations.SlingServletResourceTypes;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.propertytypes.ServiceDescription;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.servlet.Servlet;
 import javax.servlet.ServletException;
@@ -25,13 +27,16 @@ import java.io.InputStream;
  * {@link SlingSafeMethodsServlet} shall be used for HTTP methods that are
  * idempotent. For write operations use the {@link SlingAllMethodsServlet}.
  */
-@Component(service = { Servlet.class },property = {
-    "sling.servlet.paths=/mcaps-site/components/blankpage" ,
-    "sling.servlet.methods=GET",
-    "sling.servlet.extensions=html"
-})
+@Component(service = { Servlet.class })
+@SlingServletResourceTypes(
+        resourceTypes="mcaps-site/components/blankpage",
+        methods=HttpConstants.METHOD_GET,
+        extensions="html")
+@ServiceDescription("HTML Servlet")
 
 public class HtmlServlet extends SlingSafeMethodsServlet {
+    private static final Logger log = LoggerFactory.getLogger(HtmlServlet.class);
+
     @Override
     protected void doGet(SlingHttpServletRequest request, SlingHttpServletResponse response) throws ServletException, IOException {
         // Get the path of the requested HTML file
@@ -40,6 +45,7 @@ public class HtmlServlet extends SlingSafeMethodsServlet {
         // Read the content of the HTML file from DAM
         InputStream htmlStream = request.getResource().adaptTo(InputStream.class);
 
+        log.warn("SCORM WORKFLOW: HTMLServlet: path");
         // Set the content type
         response.setContentType("text/html");
 
diff --git a/core/src/main/java/com/mcaps/core/workflows/ScormExtractor.java b/core/src/main/java/com/mcaps/core/workflows/ScormExtractor.java
index b783626..6315e15 100644
--- a/core/src/main/java/com/mcaps/core/workflows/ScormExtractor.java
+++ b/core/src/main/java/com/mcaps/core/workflows/ScormExtractor.java
@@ -54,26 +54,26 @@ public class ScormExtractor implements WorkflowProcess {
 
         log.warn("SCORM WORKFLOW: MetaDataMap args: " + mdm.get("PROCESS_ARGS", "string").toString());
         String[] params = mdm.get("PROCESS_ARGS", "string").toString().split(",");
-        String excludePath = params[0];
-        String saveToLocation = params[1];
+        //String excludePath = params[0];
+        //String saveToLocation = params[1];
         String payloadPath = wi.getContentPath().replace("/jcr:content/renditions/original","");
         //unzipFile(payloadPath, saveToLocation);
 
         String nodePath = wi.getContentPath().replace(".zip/jcr:content/renditions/original","");
-        cleanup(nodePath, excludePath, resourceResolver);
+        cleanup(nodePath, resourceResolver);
     }
 
-    private void cleanup(String path, String excludePath, ResourceResolver resourceResolver) {
+    private void cleanup(String path, ResourceResolver resourceResolver) {
         log.warn("SCORM WORKFLOW: inside cleanup: path - " + path);
 
-        Resource resource = resourceResolver.getResource(path + File.separator + excludePath);
-        //Node zipNode = resource.adaptTo(Node.class);
+        //Resource resource = resourceResolver.getResource(path + File.separator + excludePath);
+        /*Node zipNode = resource.adaptTo(Node.class);
         try {
             resourceResolver.delete(resource);
             resourceResolver.commit();
         } catch (PersistenceException e) {
             e.printStackTrace();
-        }
+        }*/
     }
 
     private void unzipFile(String filePath, String outputFolder) {