Shot only search in SMOKA

chimari · Nov 27, 2017 · 2737580 · 2737580
1 parent 5d69c2e
commit 2737580
Show file tree

Hide file tree

Showing 12 changed files with 52 additions and 10 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+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 .
+
 2017.11.24 ver3.0.6 - Added SMOKA/HST/ESO data archive for database query
 	              in FC.
 	            - Added GEMINI/KECK data archive for web browser access.

diff --git a/README b/README
@@ -3,7 +3,7 @@
 #                         Document file
 #
 #
-#                                  ver 3.0.6    2017/11/24
+#                                  ver 3.0.7    2017/11/27
 #                               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.6    2017/11/24
+#                                  ver 3.0.7    2017/11/27
 #                               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=6
+MICRO_VERSION=7
 BUILD_REVISION=0
 EXTRA_VERSION=
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION

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=6
+MICRO_VERSION=7
 BUILD_REVISION=0
 EXTRA_VERSION=
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+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
+
 hskymon (3.0.6) unstable; urgency=medium
 
   * Support SMOKA, HST, ESO data archive for database query both in FC and web browser.

diff --git a/hskymon.spec b/hskymon.spec
@@ -1,6 +1,6 @@
 Summary: Sky-Monitor for Subaru Telescope, NAOJ
 Name: hskymon
-Version: 3.0.6
+Version: 3.0.7
 Release: 1%{?_dist_release}
 License: GPL3
 Group: Applications/Engineering

diff --git a/http-client.c b/http-client.c
@@ -2624,6 +2624,18 @@ int post_body(typHOE *hg, gboolean wflag, int command_socket, gchar *rand16){
 		    smoka_post[ip].key);
 	  }
 	}
+	else if(strcmp(smoka_post[ip].key,"frameorshot")==0){
+	  if(hg->fcdb_smoka_shot){
+	    sprintf(send_mesg,
+		    "%s=Shot&",
+		    smoka_post[ip].key);
+	  }
+	  else{
+	    sprintf(send_mesg,
+		    "%s=Frame&",
+		    smoka_post[ip].key);
+	  }
+	}
 	break;
 
       case POST_INST1:

diff --git a/main.c b/main.c
@@ -4386,6 +4386,7 @@ void create_fcdb_para_dialog (typHOE *hg)
     tmp_wise_mag, tmp_wise_diam;
   gboolean tmp_ned_ref, tmp_gsc_fil, tmp_ps1_fil, tmp_sdss_fil, tmp_usno_fil,
     tmp_gaia_fil, tmp_2mass_fil, tmp_wise_fil,
+    tmp_smoka_shot,
     tmp_smoka_subaru[NUM_SMOKA_SUBARU],
     tmp_smoka_kiso[NUM_SMOKA_KISO],
     tmp_smoka_oao[NUM_SMOKA_OAO],
@@ -4443,6 +4444,7 @@ void create_fcdb_para_dialog (typHOE *hg)
   tmp_wise_fil=hg->fcdb_wise_fil;
   tmp_wise_mag=hg->fcdb_wise_mag;
   tmp_wise_diam=hg->fcdb_wise_diam;
+  tmp_smoka_shot=hg->fcdb_smoka_shot;
   for(i=0;i<NUM_SMOKA_SUBARU;i++){
     tmp_smoka_subaru[i]=hg->fcdb_smoka_subaru[i];
   }
@@ -5583,9 +5585,17 @@ void create_fcdb_para_dialog (typHOE *hg)
   gtk_table_attach(GTK_TABLE(table), label, 0, 4, 0, 1,
 		   GTK_FILL,GTK_SHRINK,0,0);
 
+  check = gtk_check_button_new_with_label("Shot (Suprime-Cam, Hyper Suprime-Cam, and KWFC ONLY)");
+  gtk_table_attach(GTK_TABLE(table), check, 0, 4, 1, 2,
+		   GTK_FILL,GTK_SHRINK,0,0);
+  my_signal_connect (check, "toggled",
+		     cc_get_toggle,
+		     &tmp_smoka_shot);
+  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check),
+			       hg->fcdb_smoka_shot);
 
   vbox1 = gtk_vbox_new(FALSE,0);
-  gtk_table_attach(GTK_TABLE(table), vbox1, 0, 1, 1, 4,
+  gtk_table_attach(GTK_TABLE(table), vbox1, 0, 1, 2, 5,
 		   GTK_FILL,GTK_SHRINK,0,0);
   gtk_container_set_border_width (GTK_CONTAINER (vbox1), 0);
 
@@ -5608,7 +5618,7 @@ void create_fcdb_para_dialog (typHOE *hg)
   }
 
   vbox1 = gtk_vbox_new(FALSE,0);
-  gtk_table_attach(GTK_TABLE(table), vbox1, 1, 2, 1, 3,
+  gtk_table_attach(GTK_TABLE(table), vbox1, 1, 2, 2, 4,
 		   GTK_FILL|GTK_EXPAND,GTK_FILL,0,0);
   gtk_container_set_border_width (GTK_CONTAINER (vbox1), 0);
 
@@ -5649,7 +5659,7 @@ void create_fcdb_para_dialog (typHOE *hg)
   }
 
   vbox1 = gtk_vbox_new(FALSE,0);
-  gtk_table_attach(GTK_TABLE(table), vbox1, 2, 3, 1, 2,
+  gtk_table_attach(GTK_TABLE(table), vbox1, 2, 3, 2, 3,
 		   GTK_FILL|GTK_EXPAND,GTK_FILL,0,0);
   gtk_container_set_border_width (GTK_CONTAINER (vbox1), 0);
 
@@ -5689,7 +5699,7 @@ void create_fcdb_para_dialog (typHOE *hg)
   }
 
   vbox1 = gtk_vbox_new(FALSE,0);
-  gtk_table_attach(GTK_TABLE(table), vbox1, 3, 4, 1, 2,
+  gtk_table_attach(GTK_TABLE(table), vbox1, 3, 4, 2, 3,
 		   GTK_FILL|GTK_EXPAND,GTK_FILL,0,0);
 
 
@@ -6027,6 +6037,7 @@ void create_fcdb_para_dialog (typHOE *hg)
       hg->fcdb_wise_fil  = tmp_wise_fil;
       hg->fcdb_wise_mag  = tmp_wise_mag;
       hg->fcdb_wise_diam  = tmp_wise_diam;
+      hg->fcdb_smoka_shot  = tmp_smoka_shot;
       for(i=0;i<NUM_SMOKA_SUBARU;i++){
 	hg->fcdb_smoka_subaru[i]  = tmp_smoka_subaru[i];
       }
@@ -6104,6 +6115,7 @@ void create_fcdb_para_dialog (typHOE *hg)
       hg->fcdb_wise_fil = TRUE;
       hg->fcdb_wise_mag = 15;
       hg->fcdb_wise_diam = 25;
+      hg->fcdb_smoka_shot  = FALSE;
       for(i=0;i<NUM_SMOKA_SUBARU;i++){
 	hg->fcdb_smoka_subaru[i]  = TRUE;
       }
@@ -9614,6 +9626,7 @@ void param_init(typHOE *hg){
   hg->fcdb_wise_fil=TRUE;
   hg->fcdb_wise_mag=15;
   hg->fcdb_wise_diam=25;
+  hg->fcdb_smoka_shot  = FALSE;
   for(i=0;i<NUM_SMOKA_SUBARU;i++){
     hg->fcdb_smoka_subaru[i]  = TRUE;
   }

diff --git a/main.h b/main.h
@@ -1693,6 +1693,7 @@ struct _typHOE{
   gint fcdb_wise_mag;
   gint fcdb_wise_diam;
   gboolean fcdb_wise_fil;
+  gboolean fcdb_smoka_shot;
   gboolean fcdb_smoka_subaru[NUM_SMOKA_SUBARU];
   gboolean fcdb_smoka_kiso[NUM_SMOKA_KISO];
   gboolean fcdb_smoka_oao[NUM_SMOKA_OAO];

diff --git a/post_smoka.h b/post_smoka.h
@@ -78,7 +78,7 @@ static const PARAMpost smoka_post[] = {
   {POST_NULL,   "dataset",       NULL},
   {POST_NULL,   "dataset",       NULL},
   {POST_INPUT,  "asciitable",    NULL},  // "Table" or "Ascii"
-  {POST_CONST,  "frameorshot",   "Frame"},
+  {POST_INPUT,  "frameorshot",   NULL}, // "Frame" or "Shot"
   {POST_CONST,  "action",        "Search"},
   {POST_INST1,  "instruments",   NULL},
   {POST_INST2,  "instruments",   NULL},

diff --git a/treeview.c b/treeview.c
@@ -1785,6 +1785,12 @@ static wwwdb_item (GtkWidget *widget, gpointer data)
       break;
     }
 
+#ifndef USE_WIN32
+    if((chmod(hg->fcdb_file,(S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP |S_IROTH | S_IWOTH ))) != 0){
+    g_print("Cannot Chmod Temporary File %s!  Please check!!!\n",hg->fcdb_file);
+  }
+#endif
+
 #ifdef USE_WIN32
     ShellExecute(NULL, 
 		 "open",