Changeset 1890

Timestamp:

04/17/12 19:30:27 (12 years ago)

Author:

oschonef

Message:

• fix parsing of /indexInfo/index/map settings
• sanity check for existing set

Location:

SRUServer/trunk/src/main

Files:

• java/eu/clarin/sru/server/SRUServerConfig.java (modified) (4 diffs)
• resources/META-INF/sru-server-config.xsd (modified) (1 diff)

SRUServer/trunk/src/main/java/eu/clarin/sru/server/SRUServerConfig.java

@@ -636 +636 @@
             List<SchemaInfo> schemaInfo = buildSchemaInfo(xpath, doc);
 
-
             String transport = params.get(SRU_TRANSPORT);
             if ((transport == null) || transport.isEmpty()) {
@@ -755 +754 @@
                 String identifier = e.getAttribute("identifier");
                 String name       = e.getAttribute("name");
+                if (identifier.isEmpty()) {
+                    throw new SRUConfigException("attribute 'identifier' may "+
+                            "on element '/indexInfo/set' may not be empty");
+                }
+                if (name.isEmpty()) {
+                    throw new SRUConfigException("attribute 'name' may on " +
+                            "element '/indexInfo/set' may not be empty");
+                }
                 List<LocalizedString> title =
                         fromNodeList(e.getElementsByTagName("title"));
@@ -788 +795 @@
                             foundPrimary = true;
                         }
-                        String set = e2.getAttribute("set");
-                        String name = e2.getTextContent();
+                        String set  = null;
+                        String name = null;
+                        NodeList result3 = e2.getElementsByTagName("name");
+                        if ((result3 != null) && (result3.getLength() > 0)) {
+                            Element e3 = (Element) result3.item(0);
+                            set  = e3.getAttribute("set");
+                            name = e3.getTextContent();
+                            if (set.isEmpty()) {
+                                throw new SRUConfigException("attribute 'set'" +
+                                        " on element '/indexInfo/index/map/" + 
+                                        "name' may not be empty");
+                            }
+                            if ((name == null) || name.isEmpty()) {
+                                throw new SRUConfigException("element " +
+                                        "'/indexInfo/index/map/name' may not " +
+                                        "be empty");
+                            }
+                        }
                         maps.add(new IndexInfo.Index.Map(primary, set, name));
                     }
                 }
-                indexes.add(new IndexInfo.Index(title, can_search, can_scan, can_sort, maps));
+                indexes.add(new IndexInfo.Index(title, can_search, can_scan,
+                        can_sort, maps));
             } // for
+            
+            // sanity check (/index/map/name/@set exists in any set/@name)
+            if (sets != null) {
+                for (IndexInfo.Index index : indexes) {
+                    if (index.getMaps() != null) {
+                        for (IndexInfo.Index.Map maps : index.getMaps()) {
+                            if (findSetByName(sets, maps.getSet()) == null) {
+                                throw new SRUConfigException("/index/map/" +
+                                        "name refers to nonexitsing set (" +
+                                        maps.getSet() + ")");
+                            }
+                        }
+                    }
+                }
+            }
         } // if
         return new IndexInfo(sets, indexes);
@@ -828 +867 @@
 
 
+    private static IndexInfo.Set findSetByName(List<IndexInfo.Set> sets,
+            String name) {
+        for (IndexInfo.Set set : sets) {
+            if (set.getName().equals(name)) {
+                return set;
+            }
+        }
+        return null;
+    }
+
+    
     private static List<LocalizedString> buildList(XPath xpath, Document doc,
             String expression) throws SRUConfigException,

SRUServer/trunk/src/main/resources/META-INF/sru-server-config.xsd

@@ -74 +74 @@
             <xsd:simpleContent>
               <xsd:extension base="xsd:string">
-                <xsd:attribute name="set" type="xsd:string" />
+                <xsd:attribute name="set" type="xsd:string" use="required" />
               </xsd:extension>
             </xsd:simpleContent>