Changeset 8192 for trunk/Ohana/src/opihi/pantasks/task_trange.c

Timestamp:

Aug 5, 2006, 1:39:43 PM (20 years ago)

Author:

eugene

Message:

fixed up the trange concepts, fixed bugs in queuedrop/queuepop

File:

• trunk/Ohana/src/opihi/pantasks/task_trange.c (modified) (6 diffs)

trunk/Ohana/src/opihi/pantasks/task_trange.c

@@ -7 +7 @@
   TimeRange range;
 
-  /* add a -reset option? 
-  if (N = get_argument (argc, argv, "-reset")) {
+  /* reset the tranges for the current task */
+  if ((N = get_argument (argc, argv, "-reset"))) {
     remove_argument (N, &argc, argv);
-  } */
+    if (argc != 1) goto usage;
+
+    task = GetNewTask ();
+    if (task == NULL) {
+      gprint (GP_ERR, "ERROR: not defining or running a task\n");
+      return (FALSE);
+    }
+
+    task[0].Nranges = 0;
+    REALLOCATE (task[0].ranges, TimeRange, 1);
+    return (TRUE);
+  } 
 
   range.Nmax = 0;
   range.Nrun = 0;
-  if (N = get_argument (argc, argv, "-nmax")) {
+  if ((N = get_argument (argc, argv, "-nmax"))) {
     remove_argument (N, &argc, argv);
     range.Nmax = atoi (argv[N]);
@@ -22 +33 @@
   /* keep = true means the time range defines a valid time range
      keep = false means the time range defines an invalid range */
-  range.keep = TRUE;
+  range.include = TRUE;
   if ((N = get_argument (argc, argv, "-exclude"))) {
     remove_argument (N, &argc, argv);
-    range.keep = FALSE;
+    range.include = FALSE;
   }
 
@@ -38 +49 @@
   /* test for Mon[@HH:MM:SS] - both must match */
   if (day_to_sec (argv[1], &range.start)) {
-    if (!day_to_sec (argv[2], &range.stop)) goto usage;
+    if (!day_to_sec (argv[2], &range.stop)) {
+      gprint (GP_ERR, "invalid day/time %s\n", argv[2]);
+      goto usage;
+    }
     range.type = RANGE_WEEK;
     goto valid;
@@ -45 +59 @@
   /* test for HH:MM:SS */
   if (hms_to_sec (argv[1], &range.start)) {
-    if (!hms_to_sec (argv[2], &range.stop)) goto usage;
+    if (!hms_to_sec (argv[2], &range.stop)) {
+      gprint (GP_ERR, "invalid time %s\n", argv[2]);
+      goto usage;
+    }
     range.type = RANGE_DAY;
     goto valid;
@@ -53 +70 @@
   /* test for YYYY/MM/DD - both must match */
   if (str_to_time (argv[1], &range.start)) {
-    if (!str_to_time (argv[2], &range.stop)) goto usage;
+    if (!str_to_time (argv[2], &range.stop)) {
+      gprint (GP_ERR, "invalid date/time %s\n", argv[2]);
+      goto usage;
+    }
     range.type = RANGE_ABS;
     goto valid;
@@ -68 +88 @@
 
 usage:
-  gprint (GP_ERR, "USAGE: trange start end\n");
+  gprint (GP_ERR, "USAGE: trange start end [-nmax N]\n");
+  gprint (GP_ERR, "USAGE: trange -reset\n");
   return (FALSE);
 }