File cleanup

2 files changed, 17 insertions, 9 deletions

diff --git a/src/wcps/server/cli/grammar.java b/src/wcps/server/cli/grammar.java
index 879b814..47a64c0 100644
--- a/src/wcps/server/cli/grammar.java
+++ b/src/wcps/server/cli/grammar.java
@@ -25,29 +25,37 @@ public class grammar {
         {
             System.err.println("AbstractGrammarGen: no query as parameter !");
             // What is the meaning of AxisIterator variable and axis type? Query 15, 16
-            // Query 4: cast should not be this greedy! (float)a + b != (float) (a+b)
-            query = "for s in ( rgb, rgb, rgb ),    r in ( rgb ) return	count( ((s.0-s.1)/(s.0+s.1) > 0.6) * r )";
+            query = "for s in ( rgb, rgb, rgb ), r in ( rgb ) return " +
+                    "count( ((s.0-s.1)/(s.0+s.1) > 0.6) * r )";
         }
         else
             query = args[0];
 			
 		System.out.println("Running with the following query: " + query);
 
+        String xmlString = runQuery(query);
+        System.out.println("Output XML: \n****************\n" + xmlString);
+         
+        System.exit(0);
+
+    }
+
+    public static String runQuery(String query) throws IOException, RecognitionException
+    {
         InputStream stream = new ByteArrayInputStream(query.getBytes()); // defaults to ISO-1
         ANTLRInputStream inputStream = new ANTLRInputStream(stream);
 //        wcpsLexer lexer = new wcpsLexer( inputStream );
 		wcpsLexer lexer = new wcpsLexer( inputStream );
-		
+
         CommonTokenStream tokenStream = new CommonTokenStream(lexer);
 //        wcpsParser parser = new wcpsParser(tokenStream);
 		wcpsParser parser = new wcpsParser(tokenStream);
-		
+
         wcpsRequest_return rrequest = parser.wcpsRequest();
 		WCPSRequest request = rrequest.value;
-        System.out.println("Output XML: \n****************\n" + request.toXML());
-         
-        System.exit(0);
 
+        String result = request.toXML();
+        return result;
     }
 
 }
diff --git a/src/wcps/server/cli/xml.java b/src/wcps/server/cli/xml.java
index 725a878..10c201c 100644
--- a/src/wcps/server/cli/xml.java
+++ b/src/wcps/server/cli/xml.java
@@ -63,8 +63,8 @@ public class xml
             System.exit(1);

         }

 

-		String pcSchemaFileName = "src" + File.separator + "conf" + File.separator + "xml"

-                      + File.separator + "wcps"

+		String pcSchemaFileName =

+                "xml" + File.separator + "ogc" + File.separator + "wcps"

                       + File.separator + "1.0.0" + File.separator + "wcpsProcessCoverages.xsd";

 		File pcSchemaFile = new File(pcSchemaFileName);