Changeset 41630

Timestamp:

Jun 2, 2021, 10:04:18 AM (5 years ago)

Author:

eugene

Message:

strip neb dir elements from filename (merged from trunk)

Location:

tags/ipp-ps1-20210510/Ohana/src/getstar

Files:

• . (modified) (1 prop)
• src/ReadImageFiles.c (modified) (3 diffs)

tags/ipp-ps1-20210510/Ohana/src/getstar/src/ReadImageFiles.c

@@ -1 +1 @@
 # include "dvoImageOverlaps.h"
+
+// given FOO:BAR:file.ext return file.ext 
+char *nebbasename (char *name) {
+ 
+  char *c, *file;
+
+  ALLOCATE (file, char, strlen(name) + 16);
+
+  c = strrchr (name, ':');
+  if (c == (char *) NULL) {
+    strcpy (file, name);
+  } else {
+    strcpy (file, c+1);
+  }
+  return (file);
+}
 
 Image *ReadImageFiles (char *filename, off_t *Nimages) {
@@ -63 +79 @@
         continue;
       }
+
+      // the image name just needs to be a useful identifier
+      // remove the full path and in the case of nebulous files, remove the rest of
+      // the nebulous path:
+      // 14508045500.gpc1:ipp.tdbtest.tag.ps1.20210527.gentoo:o8966g0113o.1602706:o8966g0113o.1602706.cm.2417132.smf
+      // -> o8966g0113o.1602706.cm.2417132.smf
       
       /* find image rootname */
-      name = filebasename (file[i]);
+      char *rawname = filebasename (file[i]);
+      name = nebbasename (rawname); // 
+      free (rawname);
+
       snprintf (image[N].name, DVO_IMAGE_NAME_LEN, "%s", name);
       free (name);
@@ -188 +213 @@
 
   /* find image rootname */
-  name = filebasename (file[0]);
-
+  char *rawname = filebasename (file[0]);
+  name = nebbasename (rawname);
+  free (rawname);
+  
   // now run through the images, interpret the headers and read the stars
   for (i = N = 0; i < Nimage; i++) {