Changeset 34772 for branches/czw_branch/20120906/Ohana/src/opihi/cmd.data/dbselect.c

Timestamp:

Dec 6, 2012, 6:32:19 PM (14 years ago)

Author:

watersc1

Message:

merge from trunk. Preliminary versions of stacktool/warptool updates and regenerate_background.pl script. The warp code is finished and tested, and I still need to get the stack version resolved.

Location:

branches/czw_branch/20120906/Ohana

Files:

• . (modified) (1 prop)
• src/opihi (modified) (1 prop)
• src/opihi/cmd.data (modified) (1 prop)
• src/opihi/cmd.data/dbselect.c (modified) (1 diff)

branches/czw_branch/20120906/Ohana/src/opihi/cmd.data/dbselect.c

@@ -61 +61 @@
   ALLOCATE (vec, Vector *, Ncols);
   for (i = 0; i < Ncols; i++) {
-    if ((vec[i] = SelectVector (fields[i].name, ANYVECTOR, TRUE)) == NULL) {
-      gprint (GP_ERR, "trouble creating vector named %s\n", fields[i].name);
+    char *name = fields[i].name ? fields[i].name : fields[i].org_name;
+    if ((vec[i] = SelectVector (name, ANYVECTOR, TRUE)) == NULL) {
+      gprint (GP_ERR, "trouble creating vector named %s\n", name);
       free (query);
       free (vec);