Changeset 25027 for branches/pap/ippMonitor/scripts/generate

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• ippMonitor/scripts/generate (modified) (1 diff)

branches/pap/ippMonitor/scripts/generate

@@ -308 +308 @@
         if ($value eq "*") { next; }
         if ($format[$i] eq "%s") {
-            print FILE "\$WHERE = check_restrict ('$value', \$WHERE, 'string');\n";
-        } else {
-            print FILE "\$WHERE = check_restrict ('$value', \$WHERE, 'string');\n";
-            print FILE "\$WHERE = check_restrict ('$value', \$WHERE, 'min');\n";
-            print FILE "\$WHERE = check_restrict ('$value', \$WHERE, 'max');\n";
-        }
+            print FILE "\$WHERE = check_restrict ('$value', \$WHERE, 'string', 1.0);\n";
+            next;
+        } 
+        if ($format[$i] eq "%C") {
+            # convert the RA & DEC limits to radians for comparison
+            print FILE "\$WHERE = check_restrict ('$value', \$WHERE, 'min', 0.017453);\n";
+            print FILE "\$WHERE = check_restrict ('$value', \$WHERE, 'max', 0.017453);\n";
+            next;
+        } 
+        print FILE "\$WHERE = check_restrict ('$value', \$WHERE, 'string', 1.0);\n";
+        print FILE "\$WHERE = check_restrict ('$value', \$WHERE, 'min', 1.0);\n";
+        print FILE "\$WHERE = check_restrict ('$value', \$WHERE, 'max', 1.0);\n";
     }
     print FILE "\$WHERE = check_ordering ('$GROUPS', \$WHERE);\n";