svn commit: r1499066 - in /jena/trunk/jena-arq/src/main/java/arq: qparse.java uparse.java

[andy]

Author: andy
Date: Tue Jul  2 19:18:18 2013
New Revision: 1499066

URL: http://svn.apache.org/r1499066
Log:
Add "no print" options so these can be used to check files for syntax in shell 
scripts.

Modified:
    jena/trunk/jena-arq/src/main/java/arq/qparse.java
    jena/trunk/jena-arq/src/main/java/arq/uparse.java

Modified: jena/trunk/jena-arq/src/main/java/arq/qparse.java
URL: 
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/arq/qparse.java?rev=1499066&r1=1499065&r2=1499066&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/arq/qparse.java (original)
+++ jena/trunk/jena-arq/src/main/java/arq/qparse.java Tue Jul  2 19:18:18 2013
@@ -53,6 +53,7 @@ public class qparse extends CmdARQ
     protected final ArgDecl argDeclOpt      = new ArgDecl(ArgDecl.NoValue, 
"opt", "optimize") ;
     protected final ArgDecl argDeclExplain  = new ArgDecl(ArgDecl.NoValue, 
"explain") ;
     
+    protected boolean printNone             = false ;
     protected boolean printQuery            = false ;
     protected boolean printOp               = false ;
     protected boolean printOpt              = false ;
@@ -103,11 +104,12 @@ public class qparse extends CmdARQ
             else if ( arg.equalsIgnoreCase("opt"))      { printOpt = true ; }
             else if ( arg.equalsIgnoreCase("optquad"))  { printQuadOpt = true 
; }
             else if ( arg.equalsIgnoreCase("quadopt"))  { printQuadOpt = true 
; }
+            else if ( arg.equalsIgnoreCase("none"))     { printNone = true ; }
             else
                 throw new CmdException("Not a recognized print form: "+arg+" : 
Choices are: query, op, quad, opt, optquad") ;
         }
         
-        if ( ! printQuery && ! printOp && ! printQuad && ! printPlan && ! 
printOpt && ! printQuadOpt )
+        if ( ! printQuery && ! printOp && ! printQuad && ! printPlan && ! 
printOpt && ! printQuadOpt && ! printNone )
             printQuery = true ;
     }
 

Modified: jena/trunk/jena-arq/src/main/java/arq/uparse.java
URL: 
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/arq/uparse.java?rev=1499066&r1=1499065&r2=1499066&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/arq/uparse.java (original)
+++ jena/trunk/jena-arq/src/main/java/arq/uparse.java Tue Jul  2 19:18:18 2013
@@ -24,6 +24,7 @@ import java.util.List ;
 
 import org.apache.jena.atlas.io.IndentedLineBuffer ;
 
+import arq.cmd.CmdException ;
 import arq.cmdline.ArgDecl ;
 import arq.cmdline.CmdARQ ;
 
@@ -37,10 +38,13 @@ import com.hp.hpl.jena.util.FileUtils ;
 
 public class uparse extends CmdARQ
 {
-    protected static final ArgDecl fileArg = new ArgDecl(ArgDecl.HasValue, 
"file", "update") ;
-    protected static final ArgDecl syntaxArg = new ArgDecl(ArgDecl.HasValue, 
"syntax", "syn") ;
+    protected static final ArgDecl fileArg          = new 
ArgDecl(ArgDecl.HasValue, "file", "update") ;
+    protected static final ArgDecl syntaxArg        = new 
ArgDecl(ArgDecl.HasValue, "syntax", "syn") ;
+    protected static final ArgDecl argDeclPrint     = new 
ArgDecl(ArgDecl.HasValue, "print") ;
     List<String> requestFiles = null ;
     protected Syntax updateSyntax = Syntax.defaultUpdateSyntax ;
+    private boolean printUpdate = false ;
+    private boolean printNone  = false ;
     
     public static void main (String... argv)
     { new uparse(argv).mainRun() ; }
@@ -50,6 +54,7 @@ public class uparse extends CmdARQ
         super(argv) ;
         super.add(fileArg, "--file=FILE",  "Update commands to parse") ;
         super.add(syntaxArg, "--syntax=name", "Update syntax") ;
+        super.add(argDeclPrint, "--print", "Print in various forms [update, 
none]") ;
     }
 
     @Override
@@ -59,6 +64,19 @@ public class uparse extends CmdARQ
         super.processModulesAndArgs() ;
         if ( super.cmdStrictMode )
             updateSyntax = Syntax.syntaxSPARQL_11 ;
+        
+        for ( Iterator<String> iter = getValues(argDeclPrint).iterator() ; 
iter.hasNext() ; )
+        {
+            String arg = iter.next() ;
+            if ( arg.equalsIgnoreCase("query"))         { printUpdate = true ; 
}
+            else if ( arg.equalsIgnoreCase("none"))     { printNone = true ; }
+            else
+                throw new CmdException("Not a recognized print form: "+arg+" : 
Choices are: query, op, quad, opt, optquad") ;
+        }
+        
+        if ( !printUpdate && ! printNone )
+            printUpdate = true ;
+        
     }
     
     @Override
@@ -112,7 +130,11 @@ public class uparse extends CmdARQ
             return ; 
         }
         //req.output(IndentedWriter.stderr) ;
-        System.out.print(req) ;
+        if ( printUpdate )
+            System.out.print(req) ;
+        
+        if ( printNone )
+            return ;
         
         // And some checking.
         IndentedLineBuffer w = new IndentedLineBuffer() ;