Improved handling of unknown licenses

src/main/java/de/landsh/opendata/csw2dcat/MDMetadata2Dataset.java

@@ -546,29 +546,36 @@ public class MDMetadata2Dataset {
     
         if (licenseInformation != null) {
             resource.addLiteral(DCATAPde.licenseAttributionByText, licenseInformation.getString("quelle"));
+    
             if (licenseInformation.has("url")) {
-                // Some publishers specify the licence as the URL and not the id.
                 String licenseURL = licenseInformation.getString("url");
+    
                 if (licenseURL.startsWith("http://dcat-ap.de/def/licenses/")) {
-                  resource.addProperty(DCTerms.license, model.createResource(licenseInformation.getString("url")));
+                    resource.addProperty(DCTerms.license, model.createResource(licenseURL));
                 } else {
                     final JSONObject license = url2license.get(licenseURL);
+    
                     if (license != null && license.has("uri")) {
                         resource.addProperty(DCTerms.license, model.createResource(license.getString("uri")));
                     } else {
                         log.info("Unknown license: {}", licenseURL);
+                        handleUnknownLicense(resource, licenseInformation.getString("id"));
                     }
                 }
             } else {
-              String licenseId = licenseInformation.getString("id");
+                handleUnknownLicense(resource, licenseInformation.getString("id"));
+            }
+        }
+    }
+  
+    private void handleUnknownLicense(Resource resource, String licenseId) {
         try {
             licenseId = URLEncoder.encode(licenseId, "UTF-8");
+            resource.addProperty(DCTerms.license, model.createResource("http://dcat-ap.de/def/licenses/" + licenseId));
+            log.info("Falling back to: {}", licenseId);
         } catch (UnsupportedEncodingException e) {
             log.info("Unable to encode licenseId: {}", e);
         }
-              resource.addProperty(DCTerms.license, model.createResource("http://dcat-ap.de/def/licenses/" + licenseId));
-            }
-        }
     }
   
     private Resource guessFormat(String url) {