Changeset 38521

Timestamp:

Jun 23, 2015, 8:49:32 AM (11 years ago)

Author:

eugene

Message:

ff and diff work

Location:

branches/eam_branches/ipp-20150616/Ohana/src/addstar

Files:

• Makefile (modified) (1 diff)
• doc/ff.and.diff.txt (added)
• src/LoadStars.c (modified) (2 diffs)

branches/eam_branches/ipp-20150616/Ohana/src/addstar/Makefile

@@ -37 +37 @@
 mkcmf        : $(BIN)/mkcmf.$(ARCH)
 
-all: addstar addstar_client sedstar load2mass loadstarpar loadstarpar_client loadICRF loadICRF_client skycells mkcmf loadwise loadtycho loadsupercos dumpskycells findskycell
-
-INSTALL = addstar addstar_client sedstar load2mass loadstarpar loadstarpar_client loadICRF loadICRF_client skycells mkcmf loadwise loadtycho loadsupercos dumpskycells findskycell
+all: addstar addstar_client sedstar load2mass loadgalphot loadstarpar loadstarpar_client loadICRF loadICRF_client skycells mkcmf loadwise loadtycho loadsupercos dumpskycells findskycell
+
+INSTALL = addstar addstar_client sedstar load2mass loadgalphot loadstarpar loadstarpar_client loadICRF loadICRF_client skycells mkcmf loadwise loadtycho loadsupercos dumpskycells findskycell
 
 # I need to fix the client/server version of addstar now that I have dropped Stars

branches/eam_branches/ipp-20150616/Ohana/src/addstar/src/LoadStars.c

@@ -5 +5 @@
   off_t *extsize;
   int i, Nfile, NFILE, mode;
-  char **file, line[1024];
+  char **file, line[4096];
   FILE *f;
   glob_t globList;
@@ -20 +20 @@
     NFILE = 10;
     ALLOCATE (file, char *, NFILE);
-    for (i = 0; (fscanf (f, "%s", line) != EOF); i++) {
-      // filename limited to 1024 chars
+    for (i = 0; (scan_line (f, line) != EOF); i++) {
+      // find first non-whitespace char & skip commented lines
+      for (i = 0; OHANA_WHITESPACE (line[i]); i++);
+      if (line[i] == '#') continue;
+      if (line[i] == 0) continue;
+
+      // file lines may have:
+      // filename
+      // filename = nebname
+      // filename limited to 4096 chars
+      Nfield = sscanf (line, "%s %s %s", word1, sep, word2);
+      if ((Nfield != 1) && (Nfield != 3)) {
+        fprintf (stderr, "invalid *line: %s
+      }
+
       fprintf (stderr, "file: %s\n", line);
       file[i] = strcreate (line);