Fix issue #140 by making sure that if a saxon-configuration file is s…

…pecified, the parser settings it contains trump any parser settings requested elsewhere. As a consequence, attempting to request an HE parser when your saxon configuration specifies an EE parser will mean you get an EE parser. Don't do that, if that's not what you want.

src/com/xmlcalabash/core/XProcConfiguration.java

@@ -154,10 +154,17 @@ private void init(String proctype, boolean schemaAware, Input saxoncfg) {
         // If we got a schema aware processor, make sure it's reflected in our config
         // FIXME: are there other things that should be reflected this way?
         this.schemaAware = cfgProcessor.isSchemaAware();
-        this.saxonProcessor = Configuration.softwareEdition.toLowerCase();
+        saxonProcessor = Configuration.softwareEdition.toLowerCase();
 
-        if (!(proctype == null || saxonProcessor.equals(proctype)) || schemaAware != this.schemaAware ||
-            (saxoncfg == null && saxonConfig != null)) {
+        if (saxoncfg != null) {
+            // If there was a Saxon configuration, then it wins
+            schemaAware = this.schemaAware;
+            proctype = saxonProcessor;
+        }
+
+        if (!(proctype == null || saxonProcessor.equals(proctype))
+                || schemaAware != this.schemaAware
+                || (saxoncfg == null && saxonConfig != null)) {
             // Drat. We have to restart to get the right configuration.
             nsBindings.clear();
             inputs.clear();
@@ -173,7 +180,7 @@ private void init(String proctype, boolean schemaAware, Input saxoncfg) {
             // If we got a schema aware processor, make sure it's reflected in our config
             // FIXME: are there other things that should be reflected this way?
             this.schemaAware = cfgProcessor.isSchemaAware();
-            this.saxonProcessor = Configuration.softwareEdition.toLowerCase();
+            saxonProcessor = Configuration.softwareEdition.toLowerCase();
         }
     }