Index: branches/czw_branch/20110406/ippTools/src/laptool.c
===================================================================
--- branches/czw_branch/20110406/ippTools/src/laptool.c	(revision 31428)
+++ branches/czw_branch/20110406/ippTools/src/laptool.c	(revision 31429)
@@ -473,5 +473,4 @@
       }
     }
-
   }
 
@@ -690,4 +689,5 @@
   PXOPT_LOOKUP_S64(set_chip_id, config->args, "-set_chip_id", false, false);
   PXOPT_LOOKUP_S64(set_pair_id, config->args, "-set_pair_id", false, false);
+  PXOPT_LOOKUP_STR(set_data_state, config->args, "-set_data_state", false, false);
   PXOPT_LOOKUP_BOOL(private,    config->args, "-private",     false);
   PXOPT_LOOKUP_BOOL(public,     config->args, "-public",      false);
@@ -711,5 +711,5 @@
   PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "==");
   PXOPT_COPY_S64(config->args, where, "-chip_id", "chip_id", "==");
-  PXOPT_COPY_STR(config->args, where, "-set_data_state", "data_state", "==");
+
 
   psMetadata *values = psMetadataAlloc();
@@ -738,5 +738,7 @@
     psMetadataAddBool(values, PS_LIST_TAIL, "pairwise", 0, "==", false);
   }
-  
+  if (set_data_state) {
+    PXOPT_COPY_STR(config->args, values, "-set_data_state", "data_state", "==");
+  }
   long rows = psDBUpdateRows(config->dbh,"lapExp",where,values);
   if (rows) {
@@ -755,5 +757,6 @@
 {
   PS_ASSERT_PTR_NON_NULL(config, false);
-
+  PXOPT_LOOKUP_S64(lap_id,          config->args, "-lap_id",          true, false);
+  
   psMetadata *where = psMetadataAlloc();
   PXOPT_COPY_S64(config->args, where, "-lap_id", "lap_id", "==");