Open Source Projects Europe

--- a/src/main/java/org/sba_research/timbus/kb/importer/PronomImporter.java
+++ b/src/main/java/org/sba_research/timbus/kb/importer/PronomImporter.java
@@ -82,6 +82,7 @@
                 "}\n";// +
         //    "limit 250";
         if (!formats.exists()) {
+            LOG.info("Querying endpoint...");
             queryToFile(formats, sparqlQueryString);
         }
 
@@ -131,21 +132,24 @@
             QuerySolution result = results.next();
             String ext = Utils.cleanExtension(result.getLiteral("ext").toString());
             String puid = result.getLiteral("puid").toString();
+            if (puid.equals("fmt/null")) {
+                puid = result.getLiteral("xpuid").toString();
+            }
             if (ext.isEmpty() && puid.isEmpty()) {
                 LOG.severe("Neither extension nur PUID are set.");
                 continue;
             }
-            for (OWLNamedIndividual indiv : findFormat(jenaModel, ext, puid)) {
+            Set<OWLNamedIndividual> pronomFormats = findFormat(jenaModel, ext, puid);
+            for (OWLNamedIndividual indiv : pronomFormats) {
                 try {
                     OWLNamedIndividual registry = safeAddRegistry(indiv);
-                    if (result.contains("puid"))
+                    if (result.contains("puid") || result.contains("xpuid"))
                     {
-                        String pronomID = result.getLiteral("puid").getString();
-                        if (pronomID.toLowerCase().equals("fmt/null")) {
+                        if (puid.equals("fmt/null")) {
                             LOG.warning("Ignoring puid=fmt/null for: " + getName(indiv));
-                            continue;
+                        } else {
+                            addEntryToRegistry(getName(indiv), "id", puid, registry);
                         }
-                        addEntryToRegistry(getName(indiv), "id", pronomID, registry);
                     }
                     if (result.contains("mimetype")) {
                         addEntryToRegistry(getName(indiv), "mimetype", result.getLiteral("mimetype").getString(), registry);