Changeset 38977

Timestamp:

Oct 27, 2015, 3:54:14 PM (11 years ago)

Author:

eugene

Message:

add option to supply the output table name

File:

• branches/eam_branches/ipp-20150625/Ohana/src/tools/src/fits_to_mysql.c (modified) (7 diffs)

branches/eam_branches/ipp-20150625/Ohana/src/tools/src/fits_to_mysql.c

@@ -51 +51 @@
 char        *DATABASE_PASS;
 char        *DATABASE_NAME;
+char        *TABLENAME;
 
 int args (int *argc, char **argv);
@@ -94 +95 @@
 
   int Nsection = 0;
+  int Ntable = 0;
   while (gfits_fread_header (f, &header)) {
 
@@ -143 +145 @@
     InitIOBuffer (&insert, 1024);
 
+    if ((Ntable > 0) && TABLENAME) {
+      fprintf (stderr, "WARNING: table name is supplied but more than one table is read: earlier tables will be replaced\n");
+    } 
     create_table (columns, Ncolumns, extname, &insert, mysqlReal);
 
@@ -174 +179 @@
     fseeko (f, Nbytes, SEEK_CUR);
     Nsection ++;
+    Ntable ++;
 
     FreeColumnDef (columns, Ncolumns);
@@ -186 +192 @@
   FREE (DATABASE_PASS);
   FREE (DATABASE_NAME);
+  FREE (TABLENAME);
 
   ohana_memdump (TRUE);
@@ -301 +308 @@
   InitIOBuffer (&buffer, 1024);
 
-  char *tablename = strcreate (extname);
+  char *tablename = TABLENAME ? strcreate (TABLENAME) : strcreate (extname);
   replace_dot_with_underscore (tablename);
 
@@ -688 +695 @@
   } else usage();
 
+  TABLENAME = NULL;
+  if ((N = get_argument (*argc, argv, "-tablename"))) {
+    remove_argument (N, argc, argv);
+    TABLENAME = strcreate (argv[N]);
+    remove_argument (N, argc, argv);
+  }
+
   return TRUE;
 }