Changeset 5288

Timestamp:

Oct 12, 2005, 8:17:23 AM (21 years ago)

Author:

eugene

Message:

added Stars and Images to client/server comms

Location:

trunk/Ohana/src/addstar/src

Files:

• NewImage.c (modified) (4 diffs)
• addstarc.c (modified) (3 diffs)

trunk/Ohana/src/addstar/src/NewImage.c

@@ -3 +3 @@
 int NewImage (int BindSocket) {
 
-  int i, Nstars, Noptions;
+  int i, Nstars, Noptions, Nimage;
   Stars *stars;
+  Image *image;
   AddstarClientOptions *options;
 
@@ -13 +14 @@
   }
 
-# if (0)
-  if (!Recv_Image (BindSocket, &image)) {
+  if (!Recv_Image (BindSocket, &image, &Nimage)) {
     close (BindSocket);
     return (FALSE);
   }
-# endif
 
   if (!Recv_Stars (BindSocket, &stars, &Nstars)) {
@@ -24 +23 @@
     return (FALSE);
   }
+  /* XXX EAM : error check : 1 option, 1 image */
 
   /* add to db */
@@ -33 +33 @@
            options[0].skip_missed);
 
-  for (i = 0; i < Nstars; i++) {
-    fprintf (stderr, "R, D: %f, %f\n", stars[i].R, stars[i].D);
+//  for (i = 0; i < Nstars; i++) {
+//    fprintf (stderr, "R, D: %f, %f\n", stars[i].R, stars[i].D);
+//  }
+
+  for (i = 0; i < Nimage; i++) {
+    fprintf (stderr, "name: %s\n", image[i].name);
   }
 

trunk/Ohana/src/addstar/src/addstarc.c

@@ -3 +3 @@
 int main (int argc, char **argv) {
 
-  int Nstars;
+  int Nstars, Nimage;
   int BindSocket;
   AddstarClientOptions options;
   Stars *stars;
+  Image image;
 
   /* load config and options */
@@ -12 +13 @@
   options = args_client (argc, argv);
 
-# if (0)
   /* load data */
   stars = gstars (argv[1], &Nstars, &image);
-# endif
 
   /* set up server connection */
@@ -21 +20 @@
   SendCommand (BindSocket, strlen(PASSWORD), PASSWORD);
 
-  ALLOCATE (stars, Stars, 2);
-  Nstars = 2;
-
-  stars[0].R = 10.0;
-  stars[0].D = 40.0;
-
-  stars[1].R = 25.0;
-  stars[1].D = 60.0;
-
   /* send new data to server */
   SendCommand (BindSocket, 5, "IMAGE");
   Send_AddstarClientOptions (BindSocket, &options, 1, TRUE);
+  Send_Image (BindSocket, &image, 1, FALSE);
   Send_Stars (BindSocket, stars, Nstars, FALSE);
-
-# if (0)
-  SendImage (BindSocket, &image);
-# endif
 
   exit (0);