Changeset 38424

Timestamp:

Jun 7, 2015, 11:41:31 AM (11 years ago)

Author:

eugene

Message:

escape messages need return chars in read_vectors

File:

• branches/eam_branches/ohana.20150429/src/opihi/cmd.data/read_vectors.c (modified) (4 diffs)

branches/eam_branches/ohana.20150429/src/opihi/cmd.data/read_vectors.c

@@ -524 +524 @@
 
     int Nfields;
-    if (!gfits_scan (&header, "TFIELDS", "%d", 1, &Nfields)) ESCAPE ("cannot find TFIELDS in header");
+    if (!gfits_scan (&header, "TFIELDS", "%d", 1, &Nfields)) ESCAPE ("cannot find TFIELDS in header\n");
     for (i = 0; i < Nfields; i++) {
       gfits_byteswap_varlength_column (&table, i+1);
     }
-    if (!gfits_uncompress_table (&table, &rawtable)) ESCAPE ("failed to uncompress table");
+    if (!gfits_uncompress_table (&table, &rawtable)) ESCAPE ("failed to uncompress table\n");
     dump_raw_table (&rawtable, "rd raw");
 
@@ -546 +546 @@
     Nval = 0;
     if (Binary) {
-      if (!gfits_get_bintable_column_type (outheader, argv[i], type, &Nval)) ESCAPE ("requested field not found");
-      if (!gfits_get_bintable_column_raw (outheader, outtable, argv[i], &data, IsCompressed)) ESCAPE ("error reading data from specified field");
+      if (!gfits_get_bintable_column_type (outheader, argv[i], type, &Nval)) ESCAPE ("requested field not found\n");
+      if (!gfits_get_bintable_column_raw (outheader, outtable, argv[i], &data, IsCompressed)) ESCAPE ("error reading data from specified field\n");
     } else {
-      if (!gfits_get_table_column_type (outheader, argv[i], type)) ESCAPE ("requested field not found");
-      if (!gfits_get_table_column (outheader, outtable, argv[i], &data)) ESCAPE ("error reading data from specified field");
-    }
-    if (Nval == 0) ESCAPE ("no data for field in table");
+      if (!gfits_get_table_column_type (outheader, argv[i], type)) ESCAPE ("requested field not found\n");
+      if (!gfits_get_table_column (outheader, outtable, argv[i], &data)) ESCAPE ("error reading data from specified field\n");
+    }
+    if (Nval == 0) ESCAPE ("no data for field in table\n");
     
     vecType = OPIHI_INT;
@@ -589 +589 @@
         else
           sprintf (name, "%s:%d", argv[i], j);
-        if ((vec[j] = SelectVector (name, ANYVECTOR, TRUE)) == NULL) ESCAPE ("bad vector name");
+        if ((vec[j] = SelectVector (name, ANYVECTOR, TRUE)) == NULL) ESCAPE ("bad vector name\n");
         ResetVector (vec[j], vecType, Ny);
       }
 
-      if (!VectorAssignData (vec, type, data, Ny, Nval)) ESCAPE ("bad column type %s", type);
+      if (!VectorAssignData (vec, type, data, Ny, Nval)) ESCAPE ("bad column type %s\n", type);
 
     } else {
@@ -603 +603 @@
         else
           sprintf (name, "%s:%d", argv[i], j);
-        if ((vec[j] = SelectVector (name, ANYVECTOR, TRUE)) == NULL) ESCAPE ("bad vector name");
+        if ((vec[j] = SelectVector (name, ANYVECTOR, TRUE)) == NULL) ESCAPE ("bad vector name\n");
         ResetVector (vec[j], vecType, Nval);
       }
 
-      if (!VectorAssignDataTranspose (vec, type, data, Ny, Nval)) ESCAPE ("bad column type %s", type);
+      if (!VectorAssignDataTranspose (vec, type, data, Ny, Nval)) ESCAPE ("bad column type %s\n", type);
     }
     free (data);