Add additional logs and make encode/decode toggleable via environment…

… variables DEBUG_DISABLE_URL_DECODE and DEBUG_DISABLE_SPACE_ENCODE.
TAMULib · Oct 11, 2024 · e3b2a98 · e3b2a98
1 parent 128e90c
commit e3b2a98
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/src/main/java/edu/tamu/iiif/service/AbstractManifestService.java b/src/main/java/edu/tamu/iiif/service/AbstractManifestService.java
@@ -171,15 +171,20 @@ protected Model getRdfModel(String url) throws NotFoundException {
 
     private String getRdf(String url) throws NotFoundException {
         try {
-            url = URLDecoder.decode(url, StandardCharsets.UTF_8);
-            if (logger.isDebugEnabled()) {
-                logger.info("Requesting RDF for {}", url);
+            String doDecode = System.getenv("DEBUG_DISABLE_URL_DECODE");
+            System.out.print("\n\n\nDEBUG: getRdf(), url = " + url + ", url decoded = " + URLDecoder.decode(url, StandardCharsets.UTF_8) + ", (decoding is " + (doDecode == "true" ? "enabled" : "disabled") + ")\n\n\n");
+            if (doDecode == "true") {
+                url = URLDecoder.decode(url, StandardCharsets.UTF_8);
             }
-            Optional<String> rdf = Optional.ofNullable(restTemplate.getForObject(url, String.class));
-            if (rdf.isPresent()) {
-                logger.debug("RDF for {}: \n{}\n", url, rdf.get());
-                return rdf.get();
+
+            logger.debug("Requesting RDF for {}", url);
+            String rdf = restTemplate.getForObject(url, String.class);
+            if (rdf != null) {
+                logger.debug("RDF for {}: \n{}\n", url, rdf);
+                return rdf;
             }
+
+            logger.debug("RDF for {}: is not present\n", url);
         } catch (RestClientException e) {
             logger.error("Failed to get RDF for {}: {}", url, e.getMessage());
             logger.debug("Error while requesting RDF for {}: {}", url, e.getMessage(), e);

diff --git a/src/main/java/edu/tamu/iiif/utility/StringUtility.java b/src/main/java/edu/tamu/iiif/utility/StringUtility.java
@@ -17,6 +17,13 @@ public static String decode(String value) {
     }
 
     public static String encodeSpaces(String value) {
+        String doEncode = System.getenv("DEBUG_DISABLE_SPACE_ENCODE");
+        if (doEncode == "true") {
+            System.out.print("\n\n\nDEBUG: replacing spaces, from '" + value + "' to '" + value.replace(" ", "%20") + "'\n\n\n");
+            return value.replace(" ", "%20");
+        }
+
+        System.out.print("\n\n\nDEBUG: not replacing spaces, from '" + value + "'\n\n\n");
         return value;
     }