Index: FragmentLoader.java =================================================================== RCS file: /home/cvs/jasig/portal/source/org/jasig/portal/layout/utils/FragmentLoader.java,v retrieving revision 1.2 diff -u -r1.2 FragmentLoader.java --- FragmentLoader.java 17 Oct 2004 19:18:07 -0000 1.2 +++ FragmentLoader.java 3 Nov 2004 18:14:08 -0000 @@ -14,6 +14,7 @@ import java.util.Map; import java.util.Set; import java.util.Iterator; +import java.util.StringTokenizer; import javax.xml.transform.TransformerFactory; import javax.xml.transform.sax.SAXTransformerFactory; @@ -368,11 +369,22 @@ if(ai.getIndex("name")!=-1 && rMap.containsKey(ai.getValue("name")) && (!ai.getValue("type").equals((String)rMap.get(ai.getValue("name"))))) { System.out.println("ERROR: specified restriction type \""+ai.getValue("type")+"\" does not match the specified name \""+ai.getValue("name")+"\" in the database. name \""+ai.getValue("name")+"\" matches restriction type \""+(String)rMap.get(ai.getValue("name"))+"\""); System.exit(1); - } else { + } else { super.startElement(uri,localName,qName,ai); } } } else { + //Check priority of fragment to see if valid + String priority = ai.getValue("value"); + StringTokenizer st = new StringTokenizer(priority, "-"); + if (st.countTokens() == 2){ + String minPriority = st.nextToken(); + String maxPriority = st.nextToken(); + if (maxPriority.compareTo(minPriority) < 0){ + System.out.println("ERROR: Invalid priority. Check priorities to ensure they are valid."); + System.exit(1);} + } + String restrName=ai.getValue("name"); restrType=(String)rMap.get(restrName); if(restrType!=null) {