Browse Source

update cleanup function

master
Larry L 1 year ago
parent
commit
f7cb64684e
  1. 16
      core/src/main/java/com/mcaps/core/servlets/HtmlServlet.java
  2. 14
      core/src/main/java/com/mcaps/core/workflows/ScormExtractor.java

16
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.apache.sling.servlets.annotations.SlingServletResourceTypes;
import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.propertytypes.ServiceDescription; import org.osgi.service.component.propertytypes.ServiceDescription;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.servlet.Servlet; import javax.servlet.Servlet;
import javax.servlet.ServletException; import javax.servlet.ServletException;
@ -25,13 +27,16 @@ import java.io.InputStream;
* {@link SlingSafeMethodsServlet} shall be used for HTTP methods that are * {@link SlingSafeMethodsServlet} shall be used for HTTP methods that are
* idempotent. For write operations use the {@link SlingAllMethodsServlet}. * idempotent. For write operations use the {@link SlingAllMethodsServlet}.
*/ */
@Component(service = { Servlet.class },property = { @Component(service = { Servlet.class })
"sling.servlet.paths=/mcaps-site/components/blankpage" , @SlingServletResourceTypes(
"sling.servlet.methods=GET", resourceTypes="mcaps-site/components/blankpage",
"sling.servlet.extensions=html" methods=HttpConstants.METHOD_GET,
}) extensions="html")
@ServiceDescription("HTML Servlet")
public class HtmlServlet extends SlingSafeMethodsServlet { public class HtmlServlet extends SlingSafeMethodsServlet {
private static final Logger log = LoggerFactory.getLogger(HtmlServlet.class);
@Override @Override
protected void doGet(SlingHttpServletRequest request, SlingHttpServletResponse response) throws ServletException, IOException { protected void doGet(SlingHttpServletRequest request, SlingHttpServletResponse response) throws ServletException, IOException {
// Get the path of the requested HTML file // 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 // Read the content of the HTML file from DAM
InputStream htmlStream = request.getResource().adaptTo(InputStream.class); InputStream htmlStream = request.getResource().adaptTo(InputStream.class);
log.warn("SCORM WORKFLOW: HTMLServlet: path");
// Set the content type // Set the content type
response.setContentType("text/html"); response.setContentType("text/html");

14
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()); log.warn("SCORM WORKFLOW: MetaDataMap args: " + mdm.get("PROCESS_ARGS", "string").toString());
String[] params = mdm.get("PROCESS_ARGS", "string").toString().split(","); String[] params = mdm.get("PROCESS_ARGS", "string").toString().split(",");
String excludePath = params[0]; //String excludePath = params[0];
String saveToLocation = params[1]; //String saveToLocation = params[1];
String payloadPath = wi.getContentPath().replace("/jcr:content/renditions/original",""); String payloadPath = wi.getContentPath().replace("/jcr:content/renditions/original","");
//unzipFile(payloadPath, saveToLocation); //unzipFile(payloadPath, saveToLocation);
String nodePath = wi.getContentPath().replace(".zip/jcr:content/renditions/original",""); 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); log.warn("SCORM WORKFLOW: inside cleanup: path - " + path);
Resource resource = resourceResolver.getResource(path + File.separator + excludePath); //Resource resource = resourceResolver.getResource(path + File.separator + excludePath);
//Node zipNode = resource.adaptTo(Node.class); /*Node zipNode = resource.adaptTo(Node.class);
try { try {
resourceResolver.delete(resource); resourceResolver.delete(resource);
resourceResolver.commit(); resourceResolver.commit();
} catch (PersistenceException e) { } catch (PersistenceException e) {
e.printStackTrace(); e.printStackTrace();
} }*/
} }
private void unzipFile(String filePath, String outputFolder) { private void unzipFile(String filePath, String outputFolder) {

Loading…
Cancel
Save