CSV output for FCDB query list

chimari · Nov 29, 2017 · 4faeb09 · 4faeb09
1 parent 2737580
commit 4faeb09
Show file tree

Hide file tree

Showing 26 changed files with 2,801 additions and 37 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,5 @@
+2017.11.28 ver3.0.8 - CSV output for FCDB query results.
+
 2017.11.27 ver3.0.7 - Shot only button (SUP, HSC, and KWFC only) for SMOKA
 	              frame search.
                     - Chmod 666 for /tmp/database_fc.html .

diff --git a/Makefile.am b/Makefile.am
@@ -1,9 +1,9 @@
 bin_PROGRAMS    = hskymon
-SUBDIRS = . libnova std_data debian
+SUBDIRS = . libnova std_data debian sample
 hskymon_SOURCES   =\
-	 main.c calcpa.c fc.c adc.c lunar.c solar.c earth.c mercury.c venus.c mars.c jupiter.c saturn.c uranus.c neptune.c pluto.c rise_set.c sidereal_time.c vsop87.c julian_day.c utility.c transform.c precession.c nutation.c dynamical_time.c http-client.c main.h configfile.c skymon.c treeview.c telstat.c remoteObjects.c hsc.h votable.c votable.h remoteObjects.h configfile.h hskymon_icon.h google_icon.h esostd.h ssl.h gen2.h post_lamost.h post_smoka.h post_hst.h post_eso.h
+	 main.c calcpa.c fc.c fc_output.c adc.c lunar.c solar.c earth.c mercury.c venus.c mars.c jupiter.c saturn.c uranus.c neptune.c pluto.c rise_set.c sidereal_time.c vsop87.c julian_day.c utility.c transform.c precession.c nutation.c dynamical_time.c http-client.c main.h configfile.c skymon.c treeview.c telstat.c remoteObjects.c hsc.h votable.c votable.h remoteObjects.h configfile.h hskymon_icon.h google_icon.h esostd.h ssl.h gen2.h post_lamost.h post_smoka.h post_hst.h post_eso.h
 
-CLEANFILES      = *~ libnova/*~ std_data/*~ debian/*~
+CLEANFILES      = *~ libnova/*~ std_data/*~ debian/*~ sample/*~
 DISTCLEANFILES  = .deps/*.P
 AM_CPPFLAGS = -DLOCALEDIR=\""$(localedir)"\"
 
@@ -19,11 +19,6 @@ endif
 
 EXTRA_DIST = autogen.sh\
 	     README.jp\
-	     standard.list\
-             brightest.lst\
-             messier.lst\
-	     sample.list\
-	     samplePS.list\
              subaru_logo.ico\
              hskymon.ico\
              hskymon_res.rc.in\

diff --git a/Makefile.in b/Makefile.in
@@ -100,16 +100,16 @@ CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
 PROGRAMS = $(bin_PROGRAMS)
 am_hskymon_OBJECTS = main.$(OBJEXT) calcpa.$(OBJEXT) fc.$(OBJEXT) \
-	adc.$(OBJEXT) lunar.$(OBJEXT) solar.$(OBJEXT) earth.$(OBJEXT) \
-	mercury.$(OBJEXT) venus.$(OBJEXT) mars.$(OBJEXT) \
-	jupiter.$(OBJEXT) saturn.$(OBJEXT) uranus.$(OBJEXT) \
-	neptune.$(OBJEXT) pluto.$(OBJEXT) rise_set.$(OBJEXT) \
-	sidereal_time.$(OBJEXT) vsop87.$(OBJEXT) julian_day.$(OBJEXT) \
-	utility.$(OBJEXT) transform.$(OBJEXT) precession.$(OBJEXT) \
-	nutation.$(OBJEXT) dynamical_time.$(OBJEXT) \
-	http-client.$(OBJEXT) configfile.$(OBJEXT) skymon.$(OBJEXT) \
-	treeview.$(OBJEXT) telstat.$(OBJEXT) remoteObjects.$(OBJEXT) \
-	votable.$(OBJEXT)
+	fc_output.$(OBJEXT) adc.$(OBJEXT) lunar.$(OBJEXT) \
+	solar.$(OBJEXT) earth.$(OBJEXT) mercury.$(OBJEXT) \
+	venus.$(OBJEXT) mars.$(OBJEXT) jupiter.$(OBJEXT) \
+	saturn.$(OBJEXT) uranus.$(OBJEXT) neptune.$(OBJEXT) \
+	pluto.$(OBJEXT) rise_set.$(OBJEXT) sidereal_time.$(OBJEXT) \
+	vsop87.$(OBJEXT) julian_day.$(OBJEXT) utility.$(OBJEXT) \
+	transform.$(OBJEXT) precession.$(OBJEXT) nutation.$(OBJEXT) \
+	dynamical_time.$(OBJEXT) http-client.$(OBJEXT) \
+	configfile.$(OBJEXT) skymon.$(OBJEXT) treeview.$(OBJEXT) \
+	telstat.$(OBJEXT) remoteObjects.$(OBJEXT) votable.$(OBJEXT)
 hskymon_OBJECTS = $(am_hskymon_OBJECTS)
 hskymon_LDADD = $(LDADD)
 am__DEPENDENCIES_1 =
@@ -419,22 +419,17 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = . libnova std_data debian
+SUBDIRS = . libnova std_data debian sample
 hskymon_SOURCES = \
-	 main.c calcpa.c fc.c adc.c lunar.c solar.c earth.c mercury.c venus.c mars.c jupiter.c saturn.c uranus.c neptune.c pluto.c rise_set.c sidereal_time.c vsop87.c julian_day.c utility.c transform.c precession.c nutation.c dynamical_time.c http-client.c main.h configfile.c skymon.c treeview.c telstat.c remoteObjects.c hsc.h votable.c votable.h remoteObjects.h configfile.h hskymon_icon.h google_icon.h esostd.h ssl.h gen2.h post_lamost.h post_smoka.h post_hst.h post_eso.h
+	 main.c calcpa.c fc.c fc_output.c adc.c lunar.c solar.c earth.c mercury.c venus.c mars.c jupiter.c saturn.c uranus.c neptune.c pluto.c rise_set.c sidereal_time.c vsop87.c julian_day.c utility.c transform.c precession.c nutation.c dynamical_time.c http-client.c main.h configfile.c skymon.c treeview.c telstat.c remoteObjects.c hsc.h votable.c votable.h remoteObjects.h configfile.h hskymon_icon.h google_icon.h esostd.h ssl.h gen2.h post_lamost.h post_smoka.h post_hst.h post_eso.h
 
-CLEANFILES = *~ libnova/*~ std_data/*~ debian/*~
+CLEANFILES = *~ libnova/*~ std_data/*~ debian/*~ sample/*~
 DISTCLEANFILES = .deps/*.P
 AM_CPPFLAGS = -DLOCALEDIR=\""$(localedir)"\"
 @HAVE_WINDRES_FALSE@HSKYMON_RES = 
 @HAVE_WINDRES_TRUE@HSKYMON_RES = hskymon.res
 EXTRA_DIST = autogen.sh\
 	     README.jp\
-	     standard.list\
-             brightest.lst\
-             messier.lst\
-	     sample.list\
-	     samplePS.list\
              subaru_logo.ico\
              hskymon.ico\
              hskymon_res.rc.in\
@@ -582,6 +577,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dynamical_time.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earth.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fc_output.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/http-client.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/julian_day.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jupiter.Po@am__quote@

diff --git a/README b/README
@@ -3,7 +3,7 @@
 #                         Document file
 #
 #
-#                                  ver 3.0.7    2017/11/27
+#                                  ver 3.0.8    2017/11/28
 #                               Copyright (C) 2003-17 Akito Tajitsu
 #                                               tajitsu_at_naoj.org
 #      Subaru Telescope, National Astronomical Observatory of Japan

diff --git a/README.jp b/README.jp
@@ -3,7 +3,7 @@
 #                         Document file
 #
 #
-#                                  ver 3.0.7    2017/11/27
+#                                  ver 3.0.8    2017/11/28
 #                               Copyright (C) 2003-17 Akito Tajitsu
 #                                               tajitsu_at_naoj.org
 #      Subaru Telescope, National Astronomical Observatory of Japan

diff --git a/configure b/configure
@@ -2322,7 +2322,7 @@ PACKAGE=hskymon
 
 MAJOR_VERSION=3
 MINOR_VERSION=0
-MICRO_VERSION=7
+MICRO_VERSION=8
 BUILD_REVISION=0
 EXTRA_VERSION=
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
@@ -14126,7 +14126,7 @@ fi
 
 
 
-ac_config_files="$ac_config_files Makefile version.h hskymon_res.rc libnova/Makefile std_data/Makefile debian/Makefile"
+ac_config_files="$ac_config_files Makefile version.h hskymon_res.rc libnova/Makefile std_data/Makefile debian/Makefile sample/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -15146,6 +15146,7 @@ do
     "libnova/Makefile") CONFIG_FILES="$CONFIG_FILES libnova/Makefile" ;;
     "std_data/Makefile") CONFIG_FILES="$CONFIG_FILES std_data/Makefile" ;;
     "debian/Makefile") CONFIG_FILES="$CONFIG_FILES debian/Makefile" ;;
+    "sample/Makefile") CONFIG_FILES="$CONFIG_FILES sample/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac

diff --git a/configure.ac b/configure.ac
@@ -5,7 +5,7 @@ PACKAGE=hskymon
 dnl version number
 MAJOR_VERSION=3
 MINOR_VERSION=0
-MICRO_VERSION=7
+MICRO_VERSION=8
 BUILD_REVISION=0
 EXTRA_VERSION=
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
@@ -193,6 +193,7 @@ hskymon_res.rc
 libnova/Makefile
 std_data/Makefile
 debian/Makefile
+sample/Makefile
 ])
 
 

diff --git a/debian/changelog b/debian/changelog
@@ -1,8 +1,14 @@
+hskymon (3.0.8) unstable; urgency=medium
+
+  * CSV output for FCDB query results.
+
+ -- Akito Tajitsu <tajitsu@naoj.org>  Tue, 28 Nov 2017 13:49:14 -1000
+
 hskymon (3.0.7) unstable; urgency=medium
 
   * Added Shot only search for SMOKA.
 
- -- Akito Tajitsu <taji@zekamashi>  Mon, 27 Nov 2017 09:16:56 -1000
+ -- Akito Tajitsu <tajitsu@naoj.org>  Mon, 27 Nov 2017 09:16:56 -1000
 
 hskymon (3.0.6) unstable; urgency=medium