Changeset 310 for SH_SHM/trunk

Timestamp:

01/26/2011 12:14:48 PM (13 years ago)

Author:

marcus

Message:

r152 | walther | 2011-01-26 12:13:52 +0100 (Mi, 26 Jan 2011) | 2 lines

• one-digit network codes are now supported (like G = GeoScope?).
• minor clean-up

File:

• SH_SHM/trunk/source/seed_io/sfd2db.c (modified) (4 diffs)

SH_SHM/trunk/source/seed_io/sfd2db.c

@@ -3 +3 @@
  *      ========
  *
- * $Revision: 149 $, $Date: 2011-01-14 05:46:15 +0100 (Fr, 14 Jan 2011) $
+ * $Revision: 152 $, $Date: 2011-01-26 12:13:52 +0100 (Mi, 26 Jan 2011) $
  *
  * reads lines from sfdfile and creates commands to insert into sfdb database
@@ -322 +322 @@
                     network[2] = '\0';
 
+                    /* one digit network codes are common */
+                    if (network[1] == '.')
+                        network[1] = '\0';
+
+                    /* no network set at all. */
+                    if (!strncmp(network, "..", 2))
+                        network[0] = '\0';
+
                     for (i=2; i<4; i++)
                         location[i-2] = descr.addinf[i];
                         location[2] = '\0';
 
-                    if (!strncmp(network, "..", 2))
-                        network[0] = '\0';
-
+                    /* The SEED manual states for the "Location identifier":
+                     * Left justify and pad with spaces. Especially for file
+                     * system this is quite weird, so we support 2 digits only.
+                     * (for now).
+                     */
                     if (!strncmp(location, "..", 2))
                         location[0] = '\0';
@@ -354 +364 @@
                 sfcnt++;
 
-                /* old lines for mysql 
-                                "insert %sinto sftab values ( \"%s\", \"%s\", \"%c\", \"%d\", \"%s\", \"%4d%02d%02d\", \"%2d%02d%02d.%03d\", \"%4d%02d%02d\", \"%2d%02d%02d.%03d\", \"%d\", \"%d\", \"%d\", \"%d\", \"%d\", \"%d\", \"%d\", NULL );\n",
-                                "update %ssftab set sdate=\"%4d%02d%02d\", stime=\"%2d%02d%02d.%03d\", edate=\"%4d%02d%02d\", etime=\"%2d%02d%02d.%03d\", recnum=\"%d\", dataflags=\"%d\", priority=\"%d\", dataformat=\"%d\", hswap=\"%d\" where pathid=\"%d\" and relpath=\"%s\";\n",
-                */
-
         } /*endwhile*/
 
@@ -367 +372 @@
                 fclose( out );
 
-                /*sprintf( shellcmd, "cat %s", tmpfile );*/
                 /*system( shellcmd );*/
                 sprintf( shellcmd, "%s sfdb < %s", sfdbreqscriptfile, tmpfile );