Changeset 30580

Timestamp:

Feb 11, 2011, 3:07:40 PM (15 years ago)

Author:

eugene

Message:

handle error in where expressions

Location:

branches/eam_branches/ipp-20101205/Ohana/src/opihi/dvo

Files:

• avextract.c (modified) (2 diffs)
• imextract.c (modified) (1 diff)
• mextract.c (modified) (1 diff)
• mmextract.c (modified) (2 diffs)

branches/eam_branches/ipp-20101205/Ohana/src/opihi/dvo/avextract.c

@@ -44 +44 @@
 
   // parse skyregion options
-  if ((selection = SetRegionSelection (&argc, argv)) == NULL) goto escape;
+  if ((selection = SetRegionSelection (&argc, argv)) == NULL) {
+    print_error(); 
+    goto escape; 
+  }
 
   // command-line is of the form: avextract field,field, field [where (field op value)...]
@@ -68 +71 @@
   // construct the db Boolean math stack (frees cstack)
   stack = dbRPN (Ncstack, cstack, &Nstack);
+  if (Ncstack && !Nstack) {
+    print_error(); 
+    goto escape; 
+  }
 
   // add the skyregion limits to the where statement (or create)

branches/eam_branches/ipp-20101205/Ohana/src/opihi/dvo/imextract.c

@@ -62 +62 @@
   // construct the db Boolean math stack (frees cstack)
   stack = dbRPN (Ncstack, cstack, &Nstack);
+  if (Ncstack && !Nstack) {
+    print_error(); 
+    goto escape; 
+  }
 
   // add the skyregion limits to the where statement (or create)

branches/eam_branches/ipp-20101205/Ohana/src/opihi/dvo/mextract.c

@@ -68 +68 @@
   // construct the db Boolean math stack (frees cstack)
   stack = dbRPN (Ncstack, cstack, &Nstack);
-  if ((Ncstack > 0) && (Nstack < 1)) {
+  if (Ncstack && !Nstack) {
     print_error ();
     goto escape;

branches/eam_branches/ipp-20101205/Ohana/src/opihi/dvo/mmextract.c

@@ -106 +106 @@
   // construct the db Boolean math stack (frees cstack)
   stack1 = dbRPN (Ncstack1, cstack1, &Nstack1);
-  if ((Ncstack1 > 0) && (Nstack1 < 1)) {
+  if (Ncstack1 && !Nstack1) {
     print_error ();
     goto escape;
@@ -113 +113 @@
   // construct the db Boolean math stack (frees cstack)
   stack2 = dbRPN (Ncstack2, cstack2, &Nstack2);
-  if ((Ncstack2 > 0) && (Nstack2 < 1)) {
+  if (Ncstack2 && !Nstack2) {
     print_error ();
     goto escape;