Changeset 7115

Timestamp:

03/07/17 15:52:25 (7 years ago)

Author:

Oliver Schonefeld

Message:

• add version to endpoint description

Location:

FCSSimpleEndpoint/trunk

Files:

• pom.xml (modified) (1 diff)
• src/main/java/eu/clarin/sru/server/fcs/EndpointDescription.java (modified) (2 diffs)
• src/main/java/eu/clarin/sru/server/fcs/SimpleEndpointSearchEngineBase.java (modified) (5 diffs)
• src/main/java/eu/clarin/sru/server/fcs/utils/AbstractEndpointDescriptionBase.java (modified) (4 diffs)
• src/main/java/eu/clarin/sru/server/fcs/utils/SimpleEndpointDescription.java (modified) (2 diffs)
• src/main/java/eu/clarin/sru/server/fcs/utils/SimpleEndpointDescriptionParser.java (modified) (10 diffs)

FCSSimpleEndpoint/trunk/pom.xml

@@ -46 +46 @@
             <groupId>eu.clarin.sru.fcs</groupId>
             <artifactId>fcs-ql</artifactId>
-            <version>0.1</version>
+            <version>0.1-SNAPSHOT</version>
         </dependency>
         

FCSSimpleEndpoint/trunk/src/main/java/eu/clarin/sru/server/fcs/EndpointDescription.java

@@ -33 +33 @@
 public interface EndpointDescription {
     /**
+     * Constant for endpoint description version number for FCS 1.0
+     */
+    public static final int VERSION_1 = 1;
+    /**
+     * Constant for endpoint description version number for FCS 1.0
+     */
+    public static final int VERSION_2 = 2;
+    
+    /**
      * Constant for a (synthetic) persistent identifier identifying the top-most
      * (= root) resources in the resource inventory.
      */
     public static final String PID_ROOT = "root";
+
 
     /**
@@ -46 +56 @@
 
 
+    /**
+     * Get the version number of this endpoint description. <br>
+     * Valid version are 1 for FCS 1.0 and 2 fpr FCS 2.0.
+     * 
+     * @return the version number for this endpoint description
+     */
+    public int getVersion();
+
+
+    /**
+     * Check if this endpoint description is in a certain version.
+     * 
+     * @param version
+     *            the version to check for
+     * 
+     * @return <code>true</code>, if version number matches
+     */
+    public boolean isVersion(int version);
+
+    
     /**
      * Get the list of capabilities supported by this endpoint. The list

FCSSimpleEndpoint/trunk/src/main/java/eu/clarin/sru/server/fcs/SimpleEndpointSearchEngineBase.java

@@ -56 +56 @@
             "http://clarin.eu/fcs/endpoint-description";
     private static final String ED_PREFIX = "ed";
-    private static final int ED_VERSION = 2;
     private static final Logger logger =
             LoggerFactory.getLogger(SimpleEndpointSearchEngineBase.class);
@@ -257 +256 @@
         writer.writeStartElement(ED_NS, "EndpointDescription");
         writer.writeNamespace(ED_PREFIX, ED_NS);
-        writer.writeAttribute("version", Integer.toString(ED_VERSION));
+        writer.writeAttribute("version",
+                Integer.toString(endpointDescription.getVersion()));
 
         // Capabilities
@@ -292 +292 @@
         writer.writeEndElement(); // "SupportedDataViews" element
 
-        // SupportedLayers
-        final List<Layer> layers = endpointDescription.getSupportedLayers();
-        if (layers != null) {
-            writer.writeStartElement(ED_NS, "SupportedLayers");
-            for (Layer layer : layers) {
-                writer.writeStartElement(ED_NS, "SupportedLayer");
-                writer.writeAttribute("id", layer.getId());
-                writer.writeAttribute("result-id",
-                        layer.getResultId().toString());
-                if (layer.getContentEncoding() == Layer.ContentEncoding.EMPTY) {
-                    writer.writeAttribute("type", "empty");
-                }
-                if (layer.getQualifier() != null) {
-                    writer.writeAttribute("qualifier", layer.getQualifier());
-                }
-                if (layer.getAltValueInfo() != null) {
-                    writer.writeAttribute("alt-value-info",
-                            layer.getAltValueInfo());
-                    if (layer.getAltValueInfoURI() != null) {
-                        writer.writeAttribute("alt-value-info-uri",
-                                layer.getAltValueInfoURI().toString());
-                    }
-                }
-                writer.writeCharacters(layer.getType());
-                writer.writeEndElement(); // "SupportedLayer" element
+        if (endpointDescription.isVersion(EndpointDescription.VERSION_2)) {
+            // SupportedLayers
+            final List<Layer> layers = endpointDescription.getSupportedLayers();
+            if (layers != null) {
+                writer.writeStartElement(ED_NS, "SupportedLayers");
+                for (Layer layer : layers) {
+                    writer.writeStartElement(ED_NS, "SupportedLayer");
+                    writer.writeAttribute("id", layer.getId());
+                    writer.writeAttribute("result-id",
+                            layer.getResultId().toString());
+                    if (layer.getContentEncoding() ==
+                            Layer.ContentEncoding.EMPTY) {
+                        writer.writeAttribute("type", "empty");
+                    }
+                    if (layer.getQualifier() != null) {
+                        writer.writeAttribute("qualifier",
+                                layer.getQualifier());
+                    }
+                    if (layer.getAltValueInfo() != null) {
+                        writer.writeAttribute("alt-value-info",
+                                layer.getAltValueInfo());
+                        if (layer.getAltValueInfoURI() != null) {
+                            writer.writeAttribute("alt-value-info-uri",
+                                    layer.getAltValueInfoURI().toString());
+                        }
+                    }
+                    writer.writeCharacters(layer.getType());
+                    writer.writeEndElement(); // "SupportedLayer" element
+                }
+                writer.writeEndElement(); // "SupportedLayers" element
             }
-            writer.writeEndElement(); // "SupportedLayers" element
-
         }
 
@@ -329 +332 @@
             writeResourceInfos(writer, resources);
         } catch (SRUException e) {
-            throw new XMLStreamException("error retriving top-level resources",
-                    e);
+            throw new XMLStreamException(
+                    "error retriving top-level resources", e);
         }
         writer.writeEndElement(); // "EndpointDescription" element
@@ -401 +404 @@
                 writer.writeAttribute("ref", sb.toString());
 
-                final List<Layer> layers = resource.getAvailableLayers();
-                if (layers != null) {
-                    sb = new StringBuilder();
-                    for (Layer layer : resource.getAvailableLayers()) {
-                        if (sb.length() > 0) {
-                            sb.append(" ");
+                if (endpointDescription.isVersion(
+                        EndpointDescription.VERSION_2)) {
+                    final List<Layer> layers = resource.getAvailableLayers();
+                    if (layers != null) {
+                        sb = new StringBuilder();
+                        for (Layer layer : resource.getAvailableLayers()) {
+                            if (sb.length() > 0) {
+                                sb.append(" ");
+                            }
+                            sb.append(layer.getId());
                         }
-                        sb.append(layer.getId());
-                    }
-                    writer.writeEmptyElement(ED_NS, "AvailableLayers");
-                    writer.writeAttribute("ref", sb.toString());
+                        writer.writeEmptyElement(ED_NS, "AvailableLayers");
+                        writer.writeAttribute("ref", sb.toString());
+                    }
                 }
 

FCSSimpleEndpoint/trunk/src/main/java/eu/clarin/sru/server/fcs/utils/AbstractEndpointDescriptionBase.java

@@ -33 +33 @@
  *
  */
-public abstract class AbstractEndpointDescriptionBase implements EndpointDescription {
+public abstract class AbstractEndpointDescriptionBase
+        implements EndpointDescription {
+    protected final int version;
     protected final List<URI> capabilities;
     protected final List<DataView> supportedDataViews;
@@ -42 +44 @@
      * Constructor.
      *
+     * @param version
+     *            version of this endpoint description
      * @param capabilities
      *            a list of capabilities supported by this endpoint
@@ -49 +53 @@
      *            a list of layers that are supported by this endpoint
      */
-    protected AbstractEndpointDescriptionBase(List<URI> capabilities,
-            List<DataView> supportedDataViews, List<Layer> supportedLayers) {
+    protected AbstractEndpointDescriptionBase(int version,
+            List<URI> capabilities, List<DataView> supportedDataViews,
+            List<Layer> supportedLayers) {
+        if ((version != 1) && (version != 2)) {
+            throw new IllegalArgumentException("version must be either 1 or 2");
+        }
+        this.version = version;
+
         if (capabilities == null) {
             throw new NullPointerException("capabilities == null");
@@ -96 +106 @@
 
     @Override
+    public int getVersion() {
+        return version;
+    }
+
+
+    @Override
+    public boolean isVersion(int version) {
+        return this.version == version;
+    }
+
+
+    @Override
     public List<URI> getCapabilities() {
         return capabilities;

FCSSimpleEndpoint/trunk/src/main/java/eu/clarin/sru/server/fcs/utils/SimpleEndpointDescription.java

@@ -45 +45 @@
      * Constructor.
      *
+     * @param version
+     *            version of this endpoint description
      * @param capabilities
      *            a list of capabilities supported by this endpoint
@@ -59 +61 @@
      *            otherwise
      */
-    public SimpleEndpointDescription(List<URI> capabilities,
+    public SimpleEndpointDescription(int version, List<URI> capabilities,
             List<DataView> supportedDataViews,
             List<Layer> supportedLayers,
             List<ResourceInfo> resources,
             boolean pidCaseSensitive) {
-        super(capabilities, supportedDataViews, supportedLayers);
+        super(version, capabilities, supportedDataViews, supportedLayers);
 
         if (resources == null) {

FCSSimpleEndpoint/trunk/src/main/java/eu/clarin/sru/server/fcs/utils/SimpleEndpointDescriptionParser.java

@@ -161 +161 @@
         });
 
+        // version
+        int version = -1;
+        XPathExpression exp =
+                xpath.compile("//ed:EndpointDescription/@version");
+        String v = (String) exp.evaluate(doc, XPathConstants.STRING);
+        if (v != null) {
+            try {
+                version = Integer.parseInt(v);
+                if ((version != 1) && (version != 2)) {
+                    throw new SRUConfigException("Attribute @version " +
+                            "element <EndpointDescription> must have a " +
+                            "value of either '1' or '2' ");
+                }
+            } catch (NumberFormatException e) {
+                throw new SRUConfigException("Cannot parse version number", e);
+            }
+        }
+        if (version == -1) {
+            throw new SRUConfigException("Attribute @version missing on "+
+                    "element <EndpointDescription>");
+        }
+        logger.debug("endpoint description version is {}", version);
+
         // capabilities
         List<URI> capabilities = new ArrayList<URI>();
-        XPathExpression exp =
-                xpath.compile("//ed:Capabilities/ed:Capability");
+        exp = xpath.compile("//ed:Capabilities/ed:Capability");
         NodeList list =
                 (NodeList) exp.evaluate(doc, XPathConstants.NODESET);
@@ -194 +216 @@
             capabilities.add(CAP_BASIC_SEARCH);
         }
+        if (capabilities.contains(CAP_ADVANCED_SEARCH) && (version < 2)) {
+            logger.warn("Endpoint description is declared as version " +
+                    "FCS 1.0 (@version = 1), but contains support for " +
+                    "Advanced Search in capabilities list! FCS 1.0 only " +
+                    "supports Basic Search");
+        }
         logger.debug("CAPS:'{}'", capabilities);
 
-        // used to check for id attribute uniqueness
+        // used to check for uniqueness of id attribute
         final Set<String> xml_ids = new HashSet<String>();
 
@@ -215 +243 @@
                 if (xml_ids.contains(id)) {
                     throw new SRUConfigException("The value of attribute " +
-                            "'id' of element <SupportedDataView> must be unique: " + id);
+                            "'id' of element <SupportedDataView> must be " +
+                            "unique: " + id);
                 }
                 xml_ids.add(id);
@@ -289 +318 @@
                     "Advanced FCS but does not declare Advanced Data View (" +
                     MIMETYPE_ADV + ") in <SupportedDataViews>");
-
-        }
-
+        }
 
         // supported layers
@@ -309 +336 @@
                 if (xml_ids.contains(id)) {
                     throw new SRUConfigException("The value of attribute " +
-                            "'id' of element <SupportedLayer> must be unique: " + id);
+                            "'id' of element <SupportedLayer> must be " +
+                            "unique: " + id);
                 }
                 xml_ids.add(id);
@@ -355 +383 @@
                         encoding = Layer.ContentEncoding.EMPTY;
                     } else {
-                        throw new SRUConfigException("invalid layer encoding: " + s);
+                        throw new SRUConfigException(
+                                "invalid layer encoding: " + s);
                     }
                 }
@@ -368 +397 @@
                           altValueInfoURI = new URI(s);
                         } catch (URISyntaxException e) {
-                            throw new SRUConfigException("Attribute 'alt-value-info-uri' on " +
-                                    "Element <SupportedLayer> is not encoded " +
+                            throw new SRUConfigException("Attribute " +
+                                    "'alt-value-info-uri' on Element " +
+                                    "<SupportedLayer> is not encoded " +
                                     "as proper URI: " + s);
                         }
-                    } else {
-
                     }
                 }
@@ -401 +429 @@
         final Set<String> pids = new HashSet<String>();
         List<ResourceInfo> resources = parseResources(xpath, list, pids,
-                supportedDataViews, supportedLayers, hasAdvView);
+                supportedDataViews, supportedLayers, version, hasAdvView);
         if ((resources == null) || resources.isEmpty()) {
             throw new SRUConfigException("No resources where " +
@@ -407 +435 @@
         }
 
-        return new SimpleEndpointDescription(capabilities,
+        return new SimpleEndpointDescription(version,
+                capabilities,
                 supportedDataViews,
                 supportedLayers,
@@ -417 +446 @@
     private static List<ResourceInfo> parseResources(XPath xpath,
             NodeList nodes, Set<String> pids, List<DataView> supportedDataViews,
-            List<Layer> supportedLayers, boolean hasAdv)
+            List<Layer> supportedLayers, int version, boolean hasAdv)
                     throws SRUConfigException, XPathExpressionException {
         List<ResourceInfo> ris = null;
-      for (int k = 0; k < nodes.getLength(); k++) {
-          final Element node                = (Element) nodes.item(k);
-          String pid                        = null;
-          Map<String, String> titles        = null;
-          Map<String, String> descrs        = null;
-          String link                       = null;
-          List<String> langs                = null;
-          List<DataView> availableDataViews = null;
-          List<Layer> availableLayers       = null;
-          List<ResourceInfo> sub            = null;
-
-          pid = getAttribute(node, "pid");
-          if (pid == null) {
-              throw new SRUConfigException("Element <ResourceInfo> " +
-                      "must have a proper 'pid' attribute");
-          }
-          if (pids.contains(pid)) {
-              throw new SRUConfigException("Another element <Resource> " +
-                      "with pid '" + pid + "' already exists");
-          }
-          pids.add(pid);
-
-          XPathExpression exp = xpath.compile("ed:Title");
-          NodeList list = (NodeList) exp.evaluate(node, XPathConstants.NODESET);
-          if ((list != null) && (list.getLength() > 0)) {
-              for (int i = 0; i < list.getLength(); i++) {
-                  final Element n = (Element) list.item(i);
-
-                  final String lang = getLangAttribute(n);
-                  if (lang == null) {
-                      throw new SRUConfigException("Element <Title> " +
-                              "must have a proper 'xml:lang' attribute");
-                  }
-
-                  final String title = cleanString(n.getTextContent());
-                  if (title == null) {
-                      throw new SRUConfigException("Element <Title> " +
-                              "must have a non-empty 'xml:lang' attribute");
-                  }
-
-                  if (titles == null) {
-                      titles = new HashMap<String, String>();
-                  }
-                  if (titles.containsKey(lang)) {
-                      logger.warn("title with language '{}' already exists",
-                              lang);
-                  } else {
-                      logger.debug("title: '{}' '{}'", lang, title);
-                      titles.put(lang, title);
-                  }
-              }
-              if ((titles != null) && !titles.containsKey(LANG_EN)) {
-                  throw new SRUConfigException(
-                          "A <Title> with language 'en' is mandatory");
-              }
-          }
-
-          exp = xpath.compile("ed:Description");
-          list = (NodeList) exp.evaluate(node, XPathConstants.NODESET);
-          if ((list != null) && (list.getLength() > 0)) {
-              for (int i = 0; i < list.getLength(); i++) {
-                  Element n = (Element) list.item(i);
-
-                  String lang = getLangAttribute(n);
-                  if (lang == null) {
-                      throw new SRUConfigException("Element <Description> " +
-                              "must have a proper 'xml:lang' attribute");
-
-                  }
-                  String desc = cleanString(n.getTextContent());
-
-                  if (descrs == null) {
-                      descrs = new HashMap<String, String>();
-                  }
-
-                  if (descrs.containsKey(lang)) {
-                      logger.warn("description with language '{}' "
-                              + "already exists", lang);
-                  } else {
-                      logger.debug("description: '{}' '{}'", lang, desc);
-                      descrs.put(lang, desc);
-                  }
-              }
-              if ((descrs != null) && !descrs.containsKey(LANG_EN)) {
-                  throw new SRUConfigException(
-                          "A <Description> with language 'en' is mandatory");
-              }
-          }
-
-          exp = xpath.compile("ed:LandingPageURI");
-          list = (NodeList) exp.evaluate(node, XPathConstants.NODESET);
-          if ((list != null) && (list.getLength() > 0)) {
-              for (int i = 0; i < list.getLength(); i++) {
-                  Element n = (Element) list.item(i);
-                  link = cleanString(n.getTextContent());
-              }
-          }
-
-          exp = xpath.compile("ed:Languages/ed:Language");
-          list = (NodeList) exp.evaluate(node, XPathConstants.NODESET);
-          if ((list != null) && (list.getLength() > 0)) {
-              for (int i = 0; i < list.getLength(); i++) {
-                  Element n = (Element) list.item(i);
-
-                  String s = n.getTextContent();
-                  if (s != null) {
-                      s = s.trim();
-                      if (s.isEmpty()) {
-                          s = null;
-                      }
-                  }
-
-                  /*
-                   * enforce three letter codes
-                   */
-                  if ((s == null) || (s.length() != 3)) {
-                      throw new SRUConfigException("Element <Language> " +
-                              "must use ISO-639-3 three letter " +
-                              "language codes");
-                  }
-
-                  if (langs == null) {
-                      langs = new ArrayList<String>();
-                  }
-                  langs.add(s);
-              }
-          }
-
-          exp = xpath.compile("ed:AvailableDataViews");
-          Node n = (Node) exp.evaluate(node, XPathConstants.NODE);
-          if ((n != null) && (n instanceof Element)) {
-              String ref = getAttribute((Element) n, "ref");
-              if (ref == null) {
-                  throw new SRUConfigException("Element <AvailableDataViews> " +
-                          "must have a 'ref' attribute");
-              }
-              String[] refs = ref.split("\\s+");
-              if ((refs == null) || (refs.length < 1)) {
-                  throw new SRUConfigException("Attribute 'ref' on element " +
-                          "<AvailableDataViews> must contain a whitespace " +
-                          "seperated list of data view references");
-              }
-
-
-              for (int i = 0; i < refs.length; i++) {
-                  DataView dataview = null;
-                  for (DataView dv : supportedDataViews) {
-                      if (refs[i].equals(dv.getIdentifier())) {
-                          dataview = dv;
-                          break;
-                      }
-                  }
-                  if (dataview != null) {
-                      if (availableDataViews == null) {
-                          availableDataViews = new ArrayList<DataView>();
-                      }
-                      availableDataViews.add(dataview);
-                  } else {
-                      throw new SRUConfigException("A data view with " +
-                              "identifier '" + refs[i] + "' was not defined " +
-                              "in <SupportedDataViews>");
-                  }
-              }
-          } else {
-              throw new SRUConfigException(
-                      "missing element <AvailableDataViews>");
-          }
-          if (availableDataViews == null) {
-              throw new SRUConfigException("No available data views where " +
-                      "defined for resource with PID '" + pid + "'");
-          }
-
-          exp = xpath.compile("ed:AvailableLayers");
-          n = (Node) exp.evaluate(node, XPathConstants.NODE);
-          if ((n != null) && (n instanceof Element)) {
-              String ref = getAttribute((Element) n, "ref");
-              if (ref == null) {
-                  throw new SRUConfigException("Element <AvailableLayers> " +
-                          "must have a 'ref' attribute");
-              }
-              String[] refs = ref.split("\\s+");
-              if ((refs == null) || (refs.length < 1)) {
-                  throw new SRUConfigException("Attribute 'ref' on element " +
-                          "<AvailableLayers> must contain a whitespace " +
-                          "seperated list of data view references");
-              }
-
-
-              for (int i = 0; i < refs.length; i++) {
-                  Layer layer = null;
-                  for (Layer l : supportedLayers) {
-                      if (refs[i].equals(l.getId())) {
-                          layer = l;
-                          break;
-                      }
-                  }
-                  if (layer != null) {
-                      if (availableLayers == null) {
-                          availableLayers = new ArrayList<Layer>();
-                      }
-                      availableLayers.add(layer);
-                  } else {
-                      throw new SRUConfigException("A layer with " +
-                              "identifier '" + refs[i] + "' was not defined " +
-                              "in <SupportedLayers>");
-                  }
-              }
-          } else {
-              if (hasAdv) {
-                  logger.debug("no <SupportedLayers> for ressource '{}'", pid);
-              }
-          }
-
-          exp = xpath.compile("ed:Resources/ed:Resource");
-          list = (NodeList) exp.evaluate(node, XPathConstants.NODESET);
-          if ((list != null) && (list.getLength() > 0)) {
-              sub = parseResources(xpath, list, pids,
-                      supportedDataViews, supportedLayers, hasAdv);
-          }
-
-          if (ris == null) {
-              ris = new ArrayList<ResourceInfo>();
-          }
-          ris.add(new ResourceInfo(pid,
-                  titles,
-                  descrs,
-                  link,
-                  langs,
-                  availableDataViews,
-                  availableLayers,
-                  sub));
-      }
-      return ris;
+        for (int k = 0; k < nodes.getLength(); k++) {
+            final Element node = (Element) nodes.item(k);
+            String pid = null;
+            Map<String, String> titles = null;
+            Map<String, String> descrs = null;
+            String link = null;
+            List<String> langs = null;
+            List<DataView> availableDataViews = null;
+            List<Layer> availableLayers = null;
+            List<ResourceInfo> sub = null;
+
+            pid = getAttribute(node, "pid");
+            if (pid == null) {
+                throw new SRUConfigException("Element <ResourceInfo> " +
+                        "must have a proper 'pid' attribute");
+            }
+            if (pids.contains(pid)) {
+                throw new SRUConfigException("Another element <Resource> " +
+                        "with pid '" + pid + "' already exists");
+            }
+            pids.add(pid);
+
+            XPathExpression exp = xpath.compile("ed:Title");
+            NodeList list = (NodeList) exp.evaluate(node,
+                    XPathConstants.NODESET);
+            if ((list != null) && (list.getLength() > 0)) {
+                for (int i = 0; i < list.getLength(); i++) {
+                    final Element n = (Element) list.item(i);
+
+                    final String lang = getLangAttribute(n);
+                    if (lang == null) {
+                        throw new SRUConfigException("Element <Title> " +
+                                "must have a proper 'xml:lang' attribute");
+                    }
+
+                    final String title = cleanString(n.getTextContent());
+                    if (title == null) {
+                        throw new SRUConfigException("Element <Title> " +
+                                "must have a non-empty 'xml:lang' attribute");
+                    }
+
+                    if (titles == null) {
+                        titles = new HashMap<String, String>();
+                    }
+                    if (titles.containsKey(lang)) {
+                        logger.warn("title with language '{}' already exists",
+                                lang);
+                    } else {
+                        logger.debug("title: '{}' '{}'", lang, title);
+                        titles.put(lang, title);
+                    }
+                }
+                if ((titles != null) && !titles.containsKey(LANG_EN)) {
+                    throw new SRUConfigException(
+                            "A <Title> with language 'en' is mandatory");
+                }
+            }
+
+            exp = xpath.compile("ed:Description");
+            list = (NodeList) exp.evaluate(node, XPathConstants.NODESET);
+            if ((list != null) && (list.getLength() > 0)) {
+                for (int i = 0; i < list.getLength(); i++) {
+                    Element n = (Element) list.item(i);
+
+                    String lang = getLangAttribute(n);
+                    if (lang == null) {
+                        throw new SRUConfigException("Element <Description> " +
+                                "must have a proper 'xml:lang' attribute");
+
+                    }
+                    String desc = cleanString(n.getTextContent());
+
+                    if (descrs == null) {
+                        descrs = new HashMap<String, String>();
+                    }
+
+                    if (descrs.containsKey(lang)) {
+                        logger.warn("description with language '{}' " +
+                                "already exists", lang);
+                    } else {
+                        logger.debug("description: '{}' '{}'", lang, desc);
+                        descrs.put(lang, desc);
+                    }
+                }
+                if ((descrs != null) && !descrs.containsKey(LANG_EN)) {
+                    throw new SRUConfigException(
+                            "A <Description> with language 'en' is mandatory");
+                }
+            }
+
+            exp = xpath.compile("ed:LandingPageURI");
+            list = (NodeList) exp.evaluate(node, XPathConstants.NODESET);
+            if ((list != null) && (list.getLength() > 0)) {
+                for (int i = 0; i < list.getLength(); i++) {
+                    Element n = (Element) list.item(i);
+                    link = cleanString(n.getTextContent());
+                }
+            }
+
+            exp = xpath.compile("ed:Languages/ed:Language");
+            list = (NodeList) exp.evaluate(node, XPathConstants.NODESET);
+            if ((list != null) && (list.getLength() > 0)) {
+                for (int i = 0; i < list.getLength(); i++) {
+                    Element n = (Element) list.item(i);
+
+                    String s = n.getTextContent();
+                    if (s != null) {
+                        s = s.trim();
+                        if (s.isEmpty()) {
+                            s = null;
+                        }
+                    }
+
+                    /*
+                     * enforce three letter codes
+                     */
+                    if ((s == null) || (s.length() != 3)) {
+                        throw new SRUConfigException("Element <Language> " +
+                                "must use ISO-639-3 three letter " +
+                                "language codes");
+                    }
+
+                    if (langs == null) {
+                        langs = new ArrayList<String>();
+                    }
+                    langs.add(s);
+                }
+            }
+
+            exp = xpath.compile("ed:AvailableDataViews");
+            Node n = (Node) exp.evaluate(node, XPathConstants.NODE);
+            if ((n != null) && (n instanceof Element)) {
+                String ref = getAttribute((Element) n, "ref");
+                if (ref == null) {
+                    throw new SRUConfigException(
+                            "Element <AvailableDataViews> " +
+                                    "must have a 'ref' attribute");
+                }
+                String[] refs = ref.split("\\s+");
+                if ((refs == null) || (refs.length < 1)) {
+                    throw new SRUConfigException("Attribute 'ref' on element " +
+                            "<AvailableDataViews> must contain a whitespace " +
+                            "seperated list of data view references");
+                }
+
+                for (int i = 0; i < refs.length; i++) {
+                    DataView dataview = null;
+                    for (DataView dv : supportedDataViews) {
+                        if (refs[i].equals(dv.getIdentifier())) {
+                            dataview = dv;
+                            break;
+                        }
+                    }
+                    if (dataview != null) {
+                        if (availableDataViews == null) {
+                            availableDataViews = new ArrayList<DataView>();
+                        }
+                        availableDataViews.add(dataview);
+                    } else {
+                        throw new SRUConfigException(
+                                "A data view with " + "identifier '" + refs[i] +
+                                        "' was not defined " +
+                                        "in <SupportedDataViews>");
+                    }
+                }
+            } else {
+                throw new SRUConfigException(
+                        "missing element <AvailableDataViews>");
+            }
+            if (availableDataViews == null) {
+                throw new SRUConfigException("No available data views where " +
+                        "defined for resource with PID '" + pid + "'");
+            }
+
+            exp = xpath.compile("ed:AvailableLayers");
+            n = (Node) exp.evaluate(node, XPathConstants.NODE);
+            if ((n != null) && (n instanceof Element)) {
+                String ref = getAttribute((Element) n, "ref");
+                if (ref == null) {
+                    throw new SRUConfigException("Element <AvailableLayers> " +
+                            "must have a 'ref' attribute");
+                }
+                String[] refs = ref.split("\\s+");
+                if ((refs == null) || (refs.length < 1)) {
+                    throw new SRUConfigException("Attribute 'ref' on element " +
+                            "<AvailableLayers> must contain a whitespace " +
+                            "seperated list of data view references");
+                }
+
+                for (int i = 0; i < refs.length; i++) {
+                    Layer layer = null;
+                    for (Layer l : supportedLayers) {
+                        if (refs[i].equals(l.getId())) {
+                            layer = l;
+                            break;
+                        }
+                    }
+                    if (layer != null) {
+                        if (availableLayers == null) {
+                            availableLayers = new ArrayList<Layer>();
+                        }
+                        availableLayers.add(layer);
+                    } else {
+                        throw new SRUConfigException("A layer with " +
+                                "identifier '" + refs[i] +
+                                "' was not defined " + "in <SupportedLayers>");
+                    }
+                }
+            } else {
+                if (hasAdv) {
+                    logger.debug("no <SupportedLayers> for ressource '{}'",
+                            pid);
+                }
+            }
+
+            exp = xpath.compile("ed:Resources/ed:Resource");
+            list = (NodeList) exp.evaluate(node, XPathConstants.NODESET);
+            if ((list != null) && (list.getLength() > 0)) {
+                sub = parseResources(xpath, list, pids, supportedDataViews,
+                        supportedLayers, version, hasAdv);
+            }
+
+            if (ris == null) {
+                ris = new ArrayList<ResourceInfo>();
+            }
+            if ((availableLayers != null) && (version < 1)) {
+                logger.warn("Endpoint claims to support FCS 1.0, but " +
+                        "includes information about <AvailableLayers> for " +
+                        "resource with pid '{}'", pid);
+            }
+            ris.add(new ResourceInfo(pid, titles, descrs, link, langs,
+                    availableDataViews, availableLayers, sub));
+        }
+        return ris;
     }