Changeset 304

Timestamp:

01/12/2011 04:40:56 PM (12 years ago)

Author:

marcus

Message:

r146 | walther | 2011-01-12 16:33:37 +0100 (Mi, 12 Jan 2011) | 3 lines

Network and location code are now saved in database. NOTE: Unpredicted
behaviour if 1-digit codes are used!

File:

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

SH_SHM/trunk/source/seed_io/sfd2db.c

@@ -3 +3 @@
  *      ========
  *
- * $Revision: 101 $, $Date: 2009-11-27 11:48:20 +0100 (Fr, 27 Nov 2009) $
+ * $Revision: 146 $, $Date: 2011-01-12 16:33:37 +0100 (Mi, 12 Jan 2011) $
  *
  * reads lines from sfdfile and creates commands to insert into sfdb database
@@ -37 +37 @@
         char     chan[cBcShortStrLth+1];    /* channel name */
         char     comp;                      /* component name */
+        char     network[3];                /* network name */
+        char     location[3];               /* location code */
         int      i;                         /* counter */
         char     rpath[cBcFileLth+1];       /* relative path name */
@@ -58 +60 @@
         TSyBoolean invhdr;                  /* invert header info in sfd entry */
         TSyBoolean baynet;                  /* convert SH to BH for Bayernnetz */
-    TSyBoolean modgec2;                 /* modify gec2a and gec2b to gec2 */
+        TSyBoolean modgec2;                 /* modify gec2a and gec2b to gec2 */
         TSyBoolean go;                      /* end tmpfile with insert statements with \g */
 
@@ -315 +317 @@
                 } /*endif*/
 
+                /* check for additional information (network and location code) */
+                if (descr.addinf[0] != '\0') {
+                    strncpy(network, descr.addinf, 2);
+                    network[2] = '\0';
+
+                    for (i=2; i<4; i++)
+                        location[i-2] = descr.addinf[i];
+
+                    if (!strncmp(network, "..", 2))
+                        network[0] = '\0';
+
+                    if (!strncmp(location, "..", 2))
+                        location[0] = '\0';
+                } else {
+                    network[0] = '\0';
+                    location[0] = '\0';
+                }
+
                 /* write command line */
                 if  (!noinsert)
                         fprintf( out,
-                                "insert %sinto sftab ( station, chan, comp, pathid, relpath, sdate, stime, edate, etime, recnum, hswap, recsize, offset, dataflags, priority, dataformat ) 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);\n",
+                                "insert %sinto sftab ( station, chan, comp, pathid, relpath, sdate, stime, edate, etime, recnum, hswap, recsize, offset, dataflags, priority, dataformat, network, location ) 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, \'%s\', \'%s\');\n",
                                 ignstr, station, chan, comp, pathid, rpath, stime.year, stime.month, stime.day,
                                 stime.hour, stime.min, stime.sec, stime.ms, etime.year, etime.month,
                                 etime.day, etime.hour, etime.min, etime.sec, etime.ms, descr.recno,
                                 descr.swap_hdr, descr.reclth, descr.byteoff, descr.dataflags, priority,
-                                dataformat );
+                                dataformat, network, location );
                 if  (update)
                         fprintf( out,