Index: trunk/DataStoreServer/scripts/dsprodtool
===================================================================
--- trunk/DataStoreServer/scripts/dsprodtool	(revision 17885)
+++ trunk/DataStoreServer/scripts/dsprodtool	(revision 18570)
@@ -41,7 +41,6 @@
 
 GetOptions(
-        'add'           =>      \$add,
-        'del'           =>      \$del,
-	'product=s'	=>	\$product,
+        'add=s'         =>      \$add,
+        'del=s'         =>      \$del,
 	'type=s'	=>	\$ptype,
         'description=s' =>      \$description,
@@ -61,6 +60,4 @@
 my $err = "";
 
-$err .= "product is required\n" unless defined $product;
-
 # will exit if neither or both -add and -del were specified
 $err .= "Must specify either --add or --del.\n"
@@ -68,4 +65,5 @@
 
 if ($add) {
+    $product = $add;
     if (!$ptype) {
         $err .= "need to specify Product type to add\n";
@@ -75,4 +73,6 @@
     }
 
+} else {
+    $product = $del;
 }
 
@@ -208,5 +208,5 @@
     pod2usage(
         -msg => 
-"usage: $tmp[$#tmp] [--add|--del] --product prod_name --type prod_type [options]
+"usage: $tmp[$#tmp] [--add prod_name |--del prod_name ] --type prod_type [options]
 
 Commands: