Improved help message

diff --git a/webservices/compbio/ws/client/Constraints.java b/webservices/compbio/ws/client/Constraints.java
index b9437f0..1c4283d 100644 (file)
--- a/webservices/compbio/ws/client/Constraints.java
+++ b/webservices/compbio/ws/client/Constraints.java
@@ -25,7 +25,7 @@ class Constraints {
        final static String hostkey = "-h";\r
        final static String servicekey = "-s";\r
 \r
-       final static String listServices = "-list_services";\r
+       final static String listServices = "-list";\r
        final static String testKey = "-test";\r
 \r
        // Actions\r
@@ -42,70 +42,51 @@ class Constraints {
        final static String presetkey = "-r";\r
 \r
        final static String help_text = "\r\n" + \r
-                       "JABAWS2 client August 2011 http://www.compbio.dundee.ac.uk/jabaws \r\n" + \r
-                       " \r\n" + \r
-                       "Usage: <Class or Jar file name> -h=host_and_context <-s=serviceName> ACTION [OPTIONS] \r\n" + \r
-                       "\r\n" + \r
-                       "-h=<host_context>  - a full URL to the JABAWS web server including context \r\n" + \r
-                       "                     path e.g. http://10.31.1.159:8080/ws\r\n" + \r
-                       "-s=<ServiceName>   - one of [MafftWS, MuscleWS, ClustalWS, ClustalOWS, TcoffeeWS, \r\n" + \r
-                       "                                        ProbconsWS, AAConWS, JronnWS, DisemblWS, GlobPlotWS, IUPredWS]\r\n" + \r
-                       "                     <serviceName> is required for all ACTIONS but -list_services\r\n" + \r
+                       "Usage: java -jar <JAR file name> -h=host_and_context <-s=serviceName> ACTION [OPTIONS] \r\n" + \r
                        "\r\n" + \r
+                       "       -h=<host_context> - a full URL to the JABAWS web server including context path e.g. http://10.31.1.159:8080/ws\r\n" + \r
+                       "       -s=<ServiceName>  - a name of servise (the full list can be obtain with the option -list)\r\n" + \r
+                       "                           <serviceName> is required for all ACTIONS except -list\r\n\r\n" + \r
                        "ACTIONS: \r\n" + \r
-                       "-list_services    - list available services\r\n" + \r
-                       "-test             - test service \r\n" + \r
-                       "-i=<inputFile>    - full path to fasta formatted sequence file, from which to align \r\n" + \r
-                       "                    sequences\r\n" + \r
-                       "-parameters       - lists parameters supported by web service\r\n" + \r
-                       "-presets          - lists presets supported by web service\r\n" + \r
-                       "-limits           - lists web services limits\r\n" + \r
-                       "\r\n" + \r
-                       "Please note that if input file is specified other actions are ignored\r\n" + \r
-                       "\r\n" + \r
-                       "OPTIONS (only for use with -i action):\r\n" + \r
-                       "-r=<presetName>   - name of the preset to use\r\n" + \r
-                       "-o=<outputFile>   - full path to the file where to write an alignment\r\n" + \r
-                       "-f=<PrmInputFile> - the name of the file with the list of parameters to use.\r\n" + \r
-                       "\r\n" + \r
-                       "Please note that -r and -f options cannot be used together. Alignment is done with \r\n" + \r
-                       "either preset or a parameters from the file, but not both!\r\n" + \r
-                       "\r\n" + \r
-                       "EXAMPLES: \r\n" + \r
-                       "\r\n" + \r
-                       "1) List all available services on the host \r\n" + \r
-                       "\r\n" + \r
-                       "Jws2Client -h=http://www.compbio.dundee.ac.uk/jabaws -list_services\r\n" + \r
-                       "\r\n" + \r
-                       "2) Test Clustal web service \r\n" + \r
-                       "\r\n" + \r
-                       "Jws2Client -h=http://www.compbio.dundee.ac.uk/jabaws -s=ClustalWS -test \r\n" + \r
+                       "        -i=<inputFile>  - defines an input file. For most services this is a FASTA file with initial sequences\r\n" + \r
+                       "        -list           - lists all available web services\r\n" + \r
+                       "        -test           - tests functioning of <ServiceName> \r\n" + \r
+                       "        -parameters     - lists parameters supported by <ServiceName>\r\n" + \r
+                       "        -presets        - lists presets supported by <ServiceName>\r\n" + \r
+                       "        -limits         - lists limits of <ServiceName>\r\n" + \r
+                       "\r\n" + \r
+                       "N.B. If an input file is specified with -i other actions are ignored!\r\n\r\n" + \r
+                       "OPTIONS (used with the -i action only):\r\n" + \r
+                       "        -r=<presetName>  - name of the preset to use\r\n" + \r
+                       "        -o=<outputFile>  - file with output results\r\n" + \r
+                       "        -f=<paramFile>   - file with the list of parameters to use.\r\n\r\n" + \r
+                       "Please note that -r and -f options cannot be used together. \r\n" + \r
+                       "Alignment/Prediction is done with either preset or a parameters from the file, but not both!\r\n\r\n" + \r
+                       "EXAMPLES: \r\n" +\r
+                       "<THECLIENT> is java -jar <JAR file name>\r\n\r\n" +\r
+                       "1) List all available services on the host:\r\n" + \r
+                       "   <THECLIENT> -h=http://www.compbio.dundee.ac.uk/jabaws -list\r\n" + \r
+                       "\r\n" + \r
+                       "2) Test Clustal web service:\r\n" + \r
+                       "   <THECLIENT> -h=http://www.compbio.dundee.ac.uk/jabaws -s=ClustalWS -test \r\n" + \r
                        "\r\n" + \r
                        "3) Align sequence from file input.txt with Probcons. Record resulting alignment \r\n" + \r
-                       "into the output.txt \r\n" + \r
-                       "\r\n" + \r
-                       "Jws2Client -h=http://www.compbio.dundee.ac.uk/jabaws -s=ProbconsWS -i=input.txt -o=output.txt\r\n" + \r
-                       "\r\n" + \r
-                       "4) Calculate disorder with Disembl take input from input.txt, output results to \r\n" + \r
-                       "the console \r\n" + \r
+                       "   into the output.txt:\r\n" + \r
+                       "   <THECLIENT> -h=http://www.compbio.dundee.ac.uk/jabaws -s=ProbconsWS -i=input.txt -o=output.txt\r\n" + \r
                        "\r\n" + \r
-                       "Jws2Client -h=http://www.compbio.dundee.ac.uk/jabaws -s=DisemblWS -i=input.txt \r\n" + \r
+                       "4) Calculate disorder with Disembl take input from input.txt with output results\r\n " +\r
+                       "   to be printed out to the standard output:\r\n" + \r
+                       "    <THECLIENT> -h=http://www.compbio.dundee.ac.uk/jabaws -s=DisemblWS -i=input.txt \r\n" + \r
                        "\r\n" + \r
-                       "5) List all parameters available for AAconWS service \r\n" + \r
-                       "\r\n" + \r
-                       "Jws2Client -h=http://www.compbio.dundee.ac.uk/jabaws -s=AAconWS -parameters\r\n" + \r
+                       "5) List all parameters available for AAconWS service:\r\n" + \r
+                       "   <THECLIENT> -h=http://www.compbio.dundee.ac.uk/jabaws -s=AAconWS -parameters\r\n" + \r
                        "\r\n" + \r
                        "6) Calculate conservation with AAConWS using LANDGRAF method, for Clustal alignment \r\n" + \r
-                       "from input.txt and report  the scores to the console \r\n" + \r
-                       "\r\n" + \r
-                       "Jws2Client -h=http://www.compbio.dundee.ac.uk/jabaws -s=AAconWS -i=input.txt -f=prm.txt \r\n" + \r
-                       "\r\n" + \r
-                       "Where the content of prm.txt file is -m=LANDGRAF\r\n" + \r
-                       "The list of the supported parameters can be obtained as shown in the example 5. \r\n" + \r
+                       "   from input.txt and report the scores to the standard output:\r\n" + \r
+                       "   <THECLIENT> -h=http://www.compbio.dundee.ac.uk/jabaws -s=AAconWS -i=input.txt -f=prm.txt \r\n" + \r
                        "\r\n" + \r
-                       "Citation: Peter V. Troshin, James B. Procter and Geoffrey J. Barton - \"Java \r\n" + \r
-                       "Bioinformatics Analysis Web Services for Multiple Sequence Alignment - \r\n" + \r
-                       "JABAWS:MSA\" Bioinformatics 2011; doi: 10.1093/bioinformatics/btr304.\r\n" + \r
+                       "   Where the content of prm.txt file is -m=LANDGRAF\r\n" + \r
+                       "N.B. The list of the supported parameters can be obtained as shown in the example 5.\r\n" + \r
                        "";\r
 \r
 }\r