Index: /branches/eam_branches/ipp-20150616/Ohana/src/addstar/Makefile
===================================================================
--- /branches/eam_branches/ipp-20150616/Ohana/src/addstar/Makefile	(revision 38520)
+++ /branches/eam_branches/ipp-20150616/Ohana/src/addstar/Makefile	(revision 38521)
@@ -37,7 +37,7 @@
 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
Index: /branches/eam_branches/ipp-20150616/Ohana/src/addstar/doc/ff.and.diff.txt
===================================================================
--- /branches/eam_branches/ipp-20150616/Ohana/src/addstar/doc/ff.and.diff.txt	(revision 38521)
+++ /branches/eam_branches/ipp-20150616/Ohana/src/addstar/doc/ff.and.diff.txt	(revision 38521)
@@ -0,0 +1,11 @@
+
+full-forced warp and diffs need to be loaded in a more efficient manner.
+
+I need to load a bunch of images at once, then merge them into the database.
+
+for the full-force skycells, the individual images need to be mutually merged
+
+things I need to add:
+
+1) associate neb names with real files names read from a list:
+   realname = nebname
Index: /branches/eam_branches/ipp-20150616/Ohana/src/addstar/src/LoadStars.c
===================================================================
--- /branches/eam_branches/ipp-20150616/Ohana/src/addstar/src/LoadStars.c	(revision 38520)
+++ /branches/eam_branches/ipp-20150616/Ohana/src/addstar/src/LoadStars.c	(revision 38521)
@@ -5,5 +5,5 @@
   off_t *extsize;
   int i, Nfile, NFILE, mode;
-  char **file, line[1024];
+  char **file, line[4096];
   FILE *f;
   glob_t globList;
@@ -20,6 +20,19 @@
     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);