--- loncom/Attic/lonManage	2003/08/12 10:22:35	1.3
+++ loncom/Attic/lonManage	2003/08/12 10:55:42	1.5
@@ -3,9 +3,9 @@
 #
 #  lonManage supports remote management of nodes in a LonCAPA cluster.
 #
-#  $Id: lonManage,v 1.3 2003/08/12 10:22:35 foxr Exp $
+#  $Id: lonManage,v 1.5 2003/08/12 10:55:42 foxr Exp $
 #
-# $Id: lonManage,v 1.3 2003/08/12 10:22:35 foxr Exp $
+# $Id: lonManage,v 1.5 2003/08/12 10:55:42 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -50,6 +50,12 @@
 #    not the IP address of the host.
 #
 #  $Log: lonManage,v $
+#  Revision 1.5  2003/08/12 10:55:42  foxr
+#  Complete command line parsing (tested)
+#
+#  Revision 1.4  2003/08/12 10:40:44  foxr
+#  Get switch parsing right.
+#
 #  Revision 1.3  2003/08/12 10:22:35  foxr
 #  Put in parameter parsing infrastructure
 #
@@ -95,23 +101,94 @@ USAGE
 #
 #   This function does not validation of the parameters of push and
 #   reinit.
+#
+#   returns a list.  The first element of the list is the operation name
+#   (e.g. reinit or push).  The second element is the switch parameter.
+#   for push, this is the table name, for reinit, this is the process name.
+#   Additional elements of the list are the command argument.  The count of
+#   command arguments is validated, but not their semantics.
+#
 #   returns an empty list if the parse fails.
 #
 
 sub ParseArgs {
-    return ();
+    my $pushing   = '';
+    my $reiniting = '';
+
+    if(!GetOptions('push=s'    => \$pushing,
+	           'reinit=s'  => \$reinitting)) {
+	return ();
+    }
+
+    #  Require exactly   one of --push and --reinit
+
+    my $command    = '';
+    my $commandarg = '';
+    my $paramcount = @ARGV; 	# Number of additional arguments.
+    
+
+    if($pushing ne '') {
+
+        # --push takes in addition a table, and a host:
+        #
+	if($paramcount != 2) {
+	    print "Bad count $paramcount\n";
+	    return ();		# Invalid parameter count.
+	}
+	if($command ne '') {
+	    return ();
+	} else {
+	    
+	    $command    = 'push';
+	    $commandarg = $pushing;
+	}
+    }
+
+    if ($reinitting ne '') {
+
+	# --reinit takes in addition just a host name
+
+	if($paramcount != 1) {
+	    print "Bad count $paramcount\n";
+	    return ();
+	}
+	if($command ne '') {
+	    return ();
+	} else {
+	    $command    = 'reinit';
+	    $commandarg = $reinitting; 
+	}
+    }
+
+    #  Build the result list:
+
+    my @result = ($command, $commandarg);
+    my $i;
+    for($i = 0; $i < $paramcount; $i++) {
+	push(@result, $ARGV[$i]);
+    }
+    
+    return @result;
 }
 
 #
 #    If command parsing failed, then print usage:
 
-@status = ParseArgs;=
+@status = ParseArgs;
 $nparam   = @status;
 
 if($nparam == 0) {
     Usage;
+    exit -1;
+}
+
+print "---- params ---\n";
+for($i = 0; $i < $nparam; $i++) {
+    print "Param[$i] = $status[$i]\n";
 }
 
+exit 0;
+
 =head1 NAME
     lonManage - Command line utility for remote management of lonCAPA
     cluster nodes.