[med-svn] [Git][med-team/dazzdb][upstream] New upstream version 1.0+git20200727.d22ae58

[Andreas Tille]

Andreas Tille pushed to branch upstream at Debian Med / dazzdb


Commits:
4c2b548e by Andreas Tille at 2020-07-27T22:13:35+02:00
New upstream version 1.0+git20200727.d22ae58
- - - - -


3 changed files:

- Catrack.c
- DB.c
- DBshow.c


Changes:

=====================================
Catrack.c
=====================================
@@ -71,13 +71,20 @@ int main(int argc, char *argv[])
 
     plen = strlen(argv[1]);
     pwd  = PathTo(argv[1]);
-    if (strcmp(argv[1]+(plen-3),".dam") == 0)
+    if (strcmp(argv[1]+(plen-4),".dam") == 0)
       { root = Root(argv[1],".dam");
         stub = Read_DB_Stub(Catenate(pwd,"/",root,".dam"),0);
       }
     else
       { root = Root(argv[1],".db");
         stub = Read_DB_Stub(Catenate(pwd,"/",root,".db"),0);
+        if (stub == NULL)
+          { stub = Read_DB_Stub(Catenate(pwd,"/",root,".dam"),0);
+            if (stub == NULL)
+              { fprintf(stderr,"%s: Cannot open %s as either a DB or a DAM\n",Prog_Name,argv[1]);
+                exit (1);
+              }
+          }
       }
 
     nblocks = stub->nblocks;
@@ -185,7 +192,6 @@ int main(int argc, char *argv[])
             esize = 8;
           else
             esize = size;
-    
           if (nfiles == 0)
             { tracksiz = size;
               if (dfile != NULL)


=====================================
DB.c
=====================================
@@ -1758,7 +1758,6 @@ static int Late_Track_Trim(DAZZ_DB *db, DAZZ_TRACK *track, int ispart)
                 j += 1;
               }
           }
-        track->data = Realloc(track->data,anno4[j],NULL);
         track->alen = Realloc(track->alen,sizeof(int)*j,NULL);
         track->anno = Realloc(track->anno,track->size*(j+1),NULL);
       }
@@ -1779,7 +1778,6 @@ static int Late_Track_Trim(DAZZ_DB *db, DAZZ_TRACK *track, int ispart)
                 j += 1;
               }
           }
-        track->data = Realloc(track->data,anno8[j],NULL);
         track->alen = Realloc(track->alen,sizeof(int)*j,NULL);
         track->anno = Realloc(track->anno,track->size*(j+1),NULL);
       }


=====================================
DBshow.c
=====================================
@@ -617,10 +617,31 @@ int main(int argc, char *argv[])
                 else if (DOSEQ)
                   { int j;
     
+#ifdef COMPRESS
+  { int k, last;
+
+    last = 0;
+    for (j = fst; j+WIDTH < lst; j += WIDTH)
+      { for (k = j; k < j+WIDTH; k++)
+          if (read[k] != last)
+            { PRINTF("%c",read[k]);
+              last = read[k];
+            }
+        printf("\n");
+      }
+    for (k = j; k < lst; k++)
+      if (read[k] != last)
+        { PRINTF("%c",read[k]);
+          last = read[k];
+        }
+    printf("\n");
+  }
+#else
                     for (j = fst; j+WIDTH < lst; j += WIDTH)
                       PRINTF("%.*s\n",WIDTH,read+j)
                     if (j < lst)
                       PRINTF("%.*s\n",lst-j,read+j)
+#endif
                   }
               }
           }



View it on GitLab: https://salsa.debian.org/med-team/dazzdb/-/commit/4c2b548ed87167bde5daebde127503d297b40738

-- 
View it on GitLab: https://salsa.debian.org/med-team/dazzdb/-/commit/4c2b548ed87167bde5daebde127503d297b40738
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20200727/73e567b1/attachment-0001.html>