Changeset 7005 for FCSSimpleEndpoint

Timestamp:

03/16/16 13:24:28 (8 years ago)

Author:

Leif-Jöran

Message:

Proofed some strings and method names.

File:

• FCSSimpleEndpoint/trunk/src/main/java/eu/clarin/sru/server/fcs/utils/SimpleEndpointDescriptionParser.java (modified) (18 diffs)

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

@@ -75 +75 @@
     private static final URI CAP_ADVANCED_SEARCH =
             URI.create("http://clarin.eu/fcs/capability/advanced-search");
-    private static final String MINETYPE_HITS = "application/x-clarin-fcs-hits+xml";
-    private static final String MINETYPE_ADV = "application/x-clarin-fcs-adv+xml";
+    private static final String MIMETYPE_HITS = "application/x-clarin-fcs-hits+xml";
+    private static final String MIMETYPE_ADV = "application/x-clarin-fcs-adv+xml";
     private static final String LANG_EN = "en";
     private static final String POLICY_SEND_DEFAULT = "send-by-default";
@@ -181 +181 @@
                 } catch (URISyntaxException e) {
                     throw new SRUConfigException("capability is not encoded " +
-                            "as proper URI: " + s);
+                            "as a proper URI: " + s);
                 }
             }
@@ -190 +190 @@
         if (!capabilities.contains(CAP_BASIC_SEARCH)) {
             logger.warn("capability '{}' was not defined in endpoint " +
-                    "description; added it to meet specification. Please " +
+                    "description; it was added to meet the specification. Please " +
                     "update your endpoint description!", CAP_BASIC_SEARCH);
             capabilities.add(CAP_BASIC_SEARCH);
@@ -210 +210 @@
                 if (id == null) {
                     throw new SRUConfigException("Element <SupportedDataView> "
-                            + "must carry a proper 'id' attribute");
+                            + "must have a proper 'id' attribute");
                 }
 
@@ -222 +222 @@
                 if (p == null) {
                     throw new SRUConfigException("Element <SupportedDataView> "
-                            + "must carry a 'delivery-policy' attribute");
+                            + "must have a 'delivery-policy' attribute");
                 }
                 DeliveryPolicy policy = null;
@@ -275 +275 @@
 
         for (DataView dataView : supportedDataViews) {
-            if (dataView.getMimeType().equals(MINETYPE_HITS)) {
+            if (dataView.getMimeType().equals(MIMETYPE_HITS)) {
                 hasHitsView = true;
-            } else if (dataView.getMimeType().equals(MINETYPE_ADV)) {
+            } else if (dataView.getMimeType().equals(MIMETYPE_ADV)) {
                 hasAdvView = true;
             }
@@ -283 +283 @@
         if (!hasHitsView) {
             throw new SRUConfigException("Generic Hits Data View (" +
-                    MINETYPE_HITS + ") was not declared in <SupportedDataViews>");
+                    MIMETYPE_HITS + ") was not declared in <SupportedDataViews>");
         }
         if (capabilities.contains(CAP_ADVANCED_SEARCH) && !hasAdvView) {
             throw new SRUConfigException("Endpoint claimes to support " +
                     "Advanced FCS but does not declare Advanced Data View (" +
-                    MINETYPE_ADV + ") in <SupportedDataViews>");
+                    MIMETYPE_ADV + ") in <SupportedDataViews>");
 
         }
@@ -304 +304 @@
                 if (id == null) {
                     throw new SRUConfigException("Element <SupportedLayer> "
-                            + "must carry a proper 'id' attribute");
+                            + "must have a proper 'id' attribute");
                 }
 
@@ -316 +316 @@
                 if (s == null) {
                     throw new SRUConfigException("Element <SupportedLayer> "
-                            + "must carry a proper 'result-id' attribute");
+                            + "must have a proper 'result-id' attribute");
                 }
                 URI resultId = null;
@@ -400 +400 @@
         list = (NodeList) exp.evaluate(doc, XPathConstants.NODESET);
         final Set<String> pids = new HashSet<String>();
-        List<ResourceInfo> resources = parseRessources(xpath, list, pids,
+        List<ResourceInfo> resources = parseResources(xpath, list, pids,
                 supportedDataViews, supportedLayers, hasAdvView);
         if ((resources == null) || resources.isEmpty()) {
@@ -415 +415 @@
 
 
-    private static List<ResourceInfo> parseRessources(XPath xpath,
+    private static List<ResourceInfo> parseResources(XPath xpath,
             NodeList nodes, Set<String> pids, List<DataView> supportedDataViews,
             List<Layer> supportedLayers, boolean hasAdv)
@@ -434 +434 @@
           if (pid == null) {
               throw new SRUConfigException("Element <ResourceInfo> " +
-                      "must carry a proper 'pid' attribute");
+                      "must have a proper 'pid' attribute");
           }
           if (pids.contains(pid)) {
@@ -450 +450 @@
                   final String lang = getLangAttribute(n);
                   if (lang == null) {
-                      throw new SRUConfigException("Element <Title> must " +
-                              "carry a proper 'xml:lang' attribute");
+                      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 " +
-                              "carry a non-empty 'xml:lang' attribute");
+                      throw new SRUConfigException("Element <Title> " +
+                              "must have a non-empty 'xml:lang' attribute");
                   }
 
@@ -486 +486 @@
                   if (lang == null) {
                       throw new SRUConfigException("Element <Description> " +
-                              "must carry a proper 'xml:lang' attribute");
+                              "must have a proper 'xml:lang' attribute");
 
                   }
@@ -537 +537 @@
                   if ((s == null) || (s.length() != 3)) {
                       throw new SRUConfigException("Element <Language> " +
-                              "must use ISO-632-3 three letter " +
+                              "must use ISO-639-3 three letter " +
                               "language codes");
                   }
@@ -554 +554 @@
               if (ref == null) {
                   throw new SRUConfigException("Element <AvailableDataViews> " +
-                          "must carry a 'ref' attribute");
+                          "must have a 'ref' attribute");
               }
               String[] refs = ref.split("\\s+");
@@ -598 +598 @@
               if (ref == null) {
                   throw new SRUConfigException("Element <AvailableLayers> " +
-                          "must carry a 'ref' attribute");
+                          "must have a 'ref' attribute");
               }
               String[] refs = ref.split("\\s+");
@@ -636 +636 @@
           list = (NodeList) exp.evaluate(node, XPathConstants.NODESET);
           if ((list != null) && (list.getLength() > 0)) {
-              sub = parseRessources(xpath, list, pids,
+              sub = parseResources(xpath, list, pids,
                       supportedDataViews, supportedLayers, hasAdv);
           }