Changeset 352 for SH_SHM/trunk

Timestamp:

03/28/2011 10:49:42 AM (13 years ago)

Author:

marcus

Message:

r189 | klaus | 2011-03-25 18:54:37 +0100 (Fr, 25 Mär 2011) | 1 line

find blockette 1000 within multipleblockettes

Location:

SH_SHM/trunk/source/seed_io

Files:

• seed_lib.c (modified) (3 diffs)
• seedquickdump.c (modified) (4 diffs)

SH_SHM/trunk/source/seed_io/seed_lib.c

@@ -3 +3 @@
  *      ==========
  *
- * $Revision: 180 $, $Date: 2011-03-09 16:27:03 +0100 (Mi, 09 MÀr 2011) $
+ * $Revision: 189 $, $Date: 2011-03-25 18:54:37 +0100 (Fr, 25 MÀr 2011) $
  *
  * SEED library
@@ -3316 +3316 @@
         UWORD    *uw;           /* pointer to UWORD */
         char     *cp;           /* pointer to char */
+    int      offset;        /* offset from record start */
+    WORD     *next;         /* next blockette */
+    int      blkcnt;        /* blockette counter */
 
         /* executable code */
@@ -3328 +3331 @@
                 return 0;
         } /*endif*/
-        if  (b1000)  {
-                uw = (UWORD *)((char *)rec + (int)(rec->first));
-                if  (*uw != 1000 && *uw != 59395)  b1000 = FALSE;
-        } /*endif*/
         if  (!b1000)  return 0;
-
-        cp = (char *)rec + (int)(rec->first) + 4;
+    b1000 = FALSE;
+    offset = (int)(rec->first);
+    blkcnt = 0;
+        while  (!b1000)  {
+                uw = (UWORD *)((char *)rec + offset);
+                if  (*uw == 1000 || *uw == 59395)  {
+            b1000 = TRUE;
+            break;
+        } /*endif*/
+        next = (WORD *)((char *)rec + offset + 2);
+        if  ((int)(*next) <= offset || (int)(*next) > 4096)  break;
+        offset = (int)(*next);
+        blkcnt++;
+        if  (blkcnt >= rec->no_of_blockettes)  break;
+        } /*endwhile*/
+        if  (!b1000)  return 0;
+
+        cp = (char *)rec + offset + 4;
         return (int)(*cp);
 

SH_SHM/trunk/source/seed_io/seedquickdump.c

@@ -3 +3 @@
  *      ===============
  *
- * $Revision: 180 $, $Date: 2011-03-09 16:27:03 +0100 (Mi, 09 MÀr 2011) $
+ * $Revision: 189 $, $Date: 2011-03-25 18:54:37 +0100 (Fr, 25 MÀr 2011) $
  *
  * Dumps out Headerinfo of SEED files.
@@ -83 +83 @@
         int      jitter_count=0;            /* counts very small 'gaps' (<dt/2) */
         BOOLEAN  write_newline;             /* write a new line after record */
+    int      compression;               /* compression ID of record data */
 
         /* executable code */
@@ -238 +239 @@
                         gaplth = tc_tdiff( sfd_t_start, lasttime, &status );
 
+        compression = SeedGetCompression( (SeedDataHeaderT *)seedrec );
                 b1000found = FALSE;
                 time_quality = -1;
@@ -305 +307 @@
                         } else if  (strcmp(showinfo,"b1000") == 0)  {
                                 printf( "%d ", b1000found );
+                        } else if  (strcmp(showinfo,"compression") == 0)  {
+                printf( "%d ", compression );
                         } else {
                                 write_newline = FALSE;