Index: /trunk/Ohana/src/addstar/doc/notes.txt
===================================================================
--- /trunk/Ohana/src/addstar/doc/notes.txt	(revision 5289)
+++ /trunk/Ohana/src/addstar/doc/notes.txt	(revision 5290)
@@ -1,2 +1,56 @@
+
+2005.10.12
+
+  By friday (2005.10.07), I managed to get the update process
+  working well, and tested it with some example data to demonstrate
+  that the partial update improved speed hugely.  Saturday, I started
+  to work on the client/server separation of addstar.  The first step
+  was to test out socket communication issues.  I set up a simple
+  client/server pair, in which one program listens on a socket while
+  the client connects to the socket and sends some command.  I set up
+  two autocode functions to send and receive complete structures
+  (Send_*, Recv_*) and added these to libautocode.  I have been able
+  to demonstrate sending Stars, Image, and Options to the server.
+
+  The next difficulty is in pulling out the command-line and
+  configuration options.  My original, somewhat lazy, design over-used
+  global variables to pass information between program sections.  This
+  needs to be cleaned up, especially if the server needs to have
+  multiple threads interacting with the db tables.  
+
+  Of the global variables that get set, some simply carry options on
+  how gstars should behave when it loads the data (including the
+  header interpretation information).  This can probably stay in the
+  globals for now.  Another group are configuration information used
+  only by the server-related functions, such as defining the location
+  of the database files and their format, etc.  These can also stay as
+  global, at least for now.  Another set of variables basically pass
+  information from the client to the server on how to behave *this
+  time*.  I have defined the AddstarClientOptions structure to carry
+  these, and will pass them from the client to the server along with
+  the stars and the image data.
+
+  Some outstanding issues:
+
+  sidereal time / latitude
+
+  I am carrying these as globals simply because the image structure
+  did not have them.  This is silly: I can define them as part of the
+  internal image structure without breaking any of the I/O issues.  
+
+  thiscode
+
+  I have been using this as a static photcode structure.  The
+  Send_*/Recv_* mechanisms are better suited to simple structures.  I
+  probably need to change this to just the code, and use the lookup
+  functions to the full structures where needed.  It can be part of
+  the options, and I should re-write functions which use it to accept
+  the options as an argument rather than rely on it as a global.
+
+  mosaic
+
+  this stores the coords structure for a needed mosaic.  this should
+  be kept, filled as needed by the client, and sent to the server with
+  the image.  perhaps it can be moved out of global.
 
 2005.10.06
Index: unk/Ohana/src/addstar/generate
===================================================================
--- /trunk/Ohana/src/addstar/generate	(revision 5289)
+++ 	(revision )
@@ -1,349 +1,0 @@
-#!/usr/bin/env perl
-
-$VERBOSE = 0;
-if ($ARGV[0] eq "-v") { $VERBOSE = 1; shift @ARGV; }
-if (@ARGV != 3) { die "generate (schema) (template) (output)\n"; }
-
-$schema   = $ARGV[0];
-$template = $ARGV[1];
-$output   = $ARGV[2];
-
-&parse_schema;
-&parse_template;
-exit 0;
-
-sub parse_schema {
-    open (FILE, "$schema");
-    @list = <FILE>;
-    close (FILE);
-
-    $NAME    = "";
-    $FILE    = "";
-    $Nfield  = 0;
-    $TIMEOUT = 0;
-
-    &init_key ("TIMEOUT");
-    &init_key ("NAME");
-    &init_key ("EXTNAME");
-    &init_key ("STRUCT");
-    &init_key ("FILE");
-    &init_key ("SIZE");
-    &init_key ("TYPE");
-
-    foreach $line (@list) {
-	chop $line;
-	($key, $value) = split (" ", $line, 2);
-	
-	# strip white space from the following
-	if ($key eq "TYPE")    { ($value) = $value =~ m|\s*(\S+)\s*|; }
-	if ($key eq "SIZE")    { ($value) = $value =~ m|\s*(\S+)\s*|; }
-	if ($key eq "STRUCT")  { ($value) = $value =~ m|\s*(\S+)\s*|; }
-	if ($key eq "EXTNAME") { ($value) = $value =~ m|\s*(\S+)\s*|; }
-
-	&set_keypair ($key, $value);
-
-	# there are used internally (not just a replacement)
-	if ($key eq "TYPE")    { $TYPE = $value;   }
-	if ($key eq "SIZE")    { $SIZE = $value;   }
-	if ($key eq "STRUCT")  { $STRUCT = $value; }
-
-	# not a simple key/value entry
- 	if (($key eq "FIELD") || ($key eq "SUBSTRUCT") || ($key eq "SUBFIELD")) {
-	    ($element, $field, $format, $comment, $unit) = split (/,\s+/, $value, 5);
-	    if ($VERBOSE) { printf "%-20s %-20s %-15s %-35s %-10s\n", $element, $field, $format, $comment, $unit; }
-	    push @element, $element;
-	    push @field,   $field;
-	    push @format,  $format;
-	    push @comment, $comment;
-	    push @unit,    $unit;
-	    push @mode,    $key;
-	}
-    }
-    $Nexpect = 0;
-    if ($TYPE eq "BINTABLE") { $Nexpect = &count_bintablesize; }
-    if ($TYPE eq "TABLE")    { $Nexpect = &count_tablesize;    }
-    if (! $Nexpect) { die "missing valid TYPE\n"; }
-    if ($Nexpect != $SIZE) { die "size mismatch: $Nexpect vs $SIZE\n"; }
-}
-
-sub parse_template {
-    open (FILE, $template);
-    @list = <FILE>;
-    close (FILE);
-
-    open (FILE, ">$output");
-
-    foreach $line (@list) {
-	
-	&check_keypairs;
-
-	print FILE $line;
-
-	# fill in structure
-	if ($line =~ m|/\*\* STRUCT DEFINITION \*\*/|) {
-	    &write_structure;
-	}
-
-	# fill in structure
-	if ($line =~ m|/\*\* TABLE DEFINITION \*\*/|) {
-	    if ($TYPE eq "BINTABLE") { &write_bintabledefs; }
-	    if ($TYPE eq "TABLE")    { &write_tabledefs; }
-	}
-
-	# fill in swaps
-	if ($line =~ m|/\*\* BYTE SWAP \*\*/|) {
-	    &write_byteswaps;
-	}
-    }
-    close (FILE);
-}
-
-sub write_bintabledefs {
-
-    for ($i = 0; $i < @field; $i++) {
-	# skip SUBSTRUCT type of entries:
-	if ($mode[$i] eq "SUBSTRUCT") { next; }
-
-	($type, $Np) = &get_type_array ($format[$i]);
-	
-	# rawshort is a short without byteswapping
-
-	$pt1 = 0;
-	if ($type eq "char")          { $pt1 = "A"; }
-	if ($type eq "byte")   	      { $pt1 = "B"; }
-	if ($type eq "unsigned char") { $pt1 = "B"; }
-	if ($type eq "rawshort")      { $pt1 = "I"; }
-	if ($type eq "short")  	      { $pt1 = "I"; }
-	if ($type eq "unsigned short"){ $pt1 = "I"; }
-	if ($type eq "int")    	      { $pt1 = "J"; }
-	if ($type eq "unsigned int")  { $pt1 = "J"; }
-	if ($type eq "e_time") 	      { $pt1 = "J"; }
-	if ($type eq "float")  	      { $pt1 = "E"; }
-	if ($type eq "double") 	      { $pt1 = "D"; }
-	if (!$pt1) { die "unknown type $type"; }
-
-	if ($Np == 1) {
-	    $pt2 = $pt1;
-	} else {
-	    $pt2 = sprintf "%d%s", $Np, $pt1;
-	}
-
-	printf FILE "  fits_define_bintable_column (header, ";
-	printf FILE "%-8s",               "\"$pt2\", ";
-	printf FILE "%-20s",              "\"$field[$i]\", ";
-	printf FILE "%-35s",              "\"$comment[$i]\", ";
-	printf FILE "%-20s 1.0, 0.0);\n", "\"$unit[$i]\", ";
-    }
-
-}
-
-sub get_type_array {
-    
-    my ($format) = $_[0];
-    my ($type);
-    my ($Np, $N1, $N2, $N3);
-
-    $type = $N1 = $N2 = $N3 = $Np = 0;
-    if (!$type) {
-	($type, $N1, $N2, $N3) = $format =~ m|^(.w+)\[(\d+)\]\[(\d+)\]\[(\d+)\]|;
-	$Np = $N1*$N2*$N3;
-    }
-    if (!$type) {
-	($type, $N1, $N2)      = $format =~ m|^(.+)\[(\d+)\]\[(\d+)\]|;
-	$Np = $N1*$N2;
-    } 
-    if (!$type) {
-	($type, $N1)           = $format =~ m|^(.+)\[(\d+)\]|;
-	$Np = $N1;
-    }
-    if (!$type) { 
-	$type                  = $format; 
-	$Np = 1;
-    }
-    # print "type: $type, Np: $Np\n";
-    if ($Np == 0) { die "syntax error in format/array\n"; }
-    return ($type, $Np);
-}
-
-sub write_tabledefs {
-
-    for ($i = 0; $i < @field; $i++) {
-	# skip SUBSTRUCT type of entries:
-	if ($mode[$i] eq "SUBSTRUCT") { next; }
-
-	($type, $N1, $N2)      = $format[$i] =~ m|^(\w+)\[(\d+)\]\[(\d+)\]|;
-	if ($N2) { die "ASCII table cannot have multi-valued column"; }
-
-	($type, $length) = $format[$i] =~ m|^(\w+)\[([\d\.]+)\]|;
-	if (!$type && !$length) { die "format must be specified for ASCII table"; }
-
-	$pt1 = 0;
-	if ($type eq "char")   	      { $pt1 = sprintf "A%s", $length; }
-	if ($type eq "byte")   	      { $pt1 = sprintf "I%s", $length; }
-	if ($type eq "unsigned char") { $pt1 = sprintf "I%s", $length; }
-	if ($type eq "rawshort")      { $pt1 = sprintf "I%s", $length; }
-	if ($type eq "short")  	      { $pt1 = sprintf "I%s", $length; }
-	if ($type eq "unsigned short"){ $pt1 = sprintf "I%s", $length; }
-	if ($type eq "int")    	      { $pt1 = sprintf "I%s", $length; }
-	if ($type eq "unsigned int")  { $pt1 = sprintf "I%s", $length; }
-	if ($type eq "e_time") 	      { $pt1 = sprintf "I%s", $length; }
-	if ($type eq "float")  	      { $pt1 = sprintf "F%s", $length; }
-	if ($type eq "double") 	      { $pt1 = sprintf "F%s", $length; }
-	if (!$pt1) { die "unknown type $type"; }
-
-	printf FILE "  fits_define_table_column (header, ";
-	printf FILE "%-8s",      "\"$pt1\", ";
-	printf FILE "%-20s",     "\"$field[$i]\", ";
-	printf FILE "%-35s",     "\"$comment[$i]\", ";
-	printf FILE "%-20s);\n", "\"$unit[$i]\"";
-    }
-
-}
-
-sub write_structure {
-    print FILE "typedef struct {\n";
-    for ($i = 0; $i < @element; $i++) {
-	# skip SUBFIELD entries
-	if ($mode[$i] eq "SUBFIELD") { next; }
-
-	# here we only want to match the pattern [1][2][3]..[N]
-	($type, $array) = $format[$i] =~ m|^(\w+)(\[.*\])|;
-	# print "type: $type, array: $array\n";
-	if (!$type && !$array) { $type = $format[$i]; }
-
-	if ($array && (($TYPE eq "BINTABLE") || ($type eq "char"))) {
-	    $pt2 = sprintf "%s%s;", $element[$i], $array;
-	} else {
-	    $pt2 = sprintf "%s;", $element[$i];
-	}
-
-	if ($unit[$i] eq "") {
-	    $pt3 = sprintf "// %s", $comment[$i];
-	} else {
-	    $pt3 = sprintf "// %s (%s)", $comment[$i], $unit[$i];
-	}
-	printf FILE "  %-16s %-21s %s\n", $type, $pt2, $pt3;
-    }    
-    print FILE "} $STRUCT;\n";
-}
-
-# this does not work with ASCII tables, 
-# but should not be needed for ASCII tables!
-sub write_byteswaps {
-    if ($TYPE eq "TABLE") {
-	printf FILE "/*** no byteswaps for ASCII tables ***/\n";
-	return;
-    }
-    $N = 0;
-    for ($i = 0; $i < @field; $i++) {
-	# skip SUBSTRUCT type of entries:
-	if ($mode[$i] eq "SUBSTRUCT") { next; }
-
-	($type, $Np) = &get_type_array ($format[$i]);
-
-	# rawshort is a patch for old photreg tables: provide a fix for the tables
-	# some photreg tables were not byteswapped for certain columns
-
-	$n = 0;
-	if ($type eq "char") 	      { $N +=   $Np; next; }
-	if ($type eq "byte") 	      { $N +=   $Np; next; }
-	if ($type eq "unsigned char") { $N +=   $Np; next; }
-	if ($type eq "rawshort")      { $N += 2*$Np; next; }
-	if ($type eq "short")  	      { $T = "BYTE"; $n = 2; }
-	if ($type eq "unsigned short"){ $T = "BYTE"; $n = 2; }
-	if ($type eq "int")    	      { $T = "WORD"; $n = 4; }
-	if ($type eq "unsigned int")  { $T = "WORD"; $n = 4; }
-	if ($type eq "e_time") 	      { $T = "WORD"; $n = 4; }
-	if ($type eq "float")  	      { $T = "WORD"; $n = 4; }
-	if ($type eq "double") 	      { $T = "DBLE"; $n = 8; }
-	if (!$n) { die "unknown type $type"; }
-	for ($j = 0; $j < $Np; $j++) {
-	    printf FILE "    SWAP_%s (%d); // %s\n", $T, $N, $field[$i];
-	    $N += $n;
-	}
-    }
-}
-
-sub count_bintablesize {
-
-    $Nbytes = 0;
-    for ($i = 0; $i < @field; $i++) {
-	# skip SUBSTRUCT type of entries:
-	if ($mode[$i] eq "SUBSTRUCT") { next; }
-
-	# add [\d\.] to match ascii-type formats
-	($type, $Np) = &get_type_array ($format[$i]);
-
-	$valid = 0;
-	if ($type eq "char")   	       { $Nbytes += 1*$Np; $valid = 1; }
-	if ($type eq "byte")   	       { $Nbytes += 1*$Np; $valid = 1; }
-	if ($type eq "unsigned char")  { $Nbytes += 1*$Np; $valid = 1; }
-	if ($type eq "rawshort")       { $Nbytes += 2*$Np; $valid = 1; }
-	if ($type eq "short")  	       { $Nbytes += 2*$Np; $valid = 1; }
-	if ($type eq "unsigned short") { $Nbytes += 2*$Np; $valid = 1; }
-	if ($type eq "int")    	       { $Nbytes += 4*$Np; $valid = 1; }
-	if ($type eq "unsigned int")   { $Nbytes += 4*$Np; $valid = 1; }
-	if ($type eq "e_time") 	       { $Nbytes += 4*$Np; $valid = 1; }
-	if ($type eq "float")  	       { $Nbytes += 4*$Np; $valid = 1; }
-	if ($type eq "double") 	       { $Nbytes += 8*$Np; $valid = 1; }
-	if (!$valid) { die "unknown type $type"; }
-    }
-    return ($Nbytes);
-}
-
-sub count_tablesize {
-
-    $Nbytes = 0;
-    for ($i = 0; $i < @field; $i++) {
-	# skip SUBSTRUCT type of entries:
-	if ($mode[$i] eq "SUBSTRUCT") { next; }
-
-	($fpt) = $format[$i] =~ m|^\w+\[([\d\.]+)\]|;
-	$length = int($fpt);
-	# print "$format[$i], $length, $fpt\n";
-	if ($length == 0) { die "ASCII table format requires field size"; }
-	$Nbytes += $length;
-    }
-    return ($Nbytes);
-}
-
-sub init_key {
-    my ($key)   = $_[0];
-
-    push @key, $key;
-    push @value, "";
-}
-
-sub set_keypair {
-    my ($i);
-    my ($key)   = $_[0];
-    my ($value) = $_[1];
-
-    for ($i = 0; $i < @key; $i++) {
-	if ($key eq $key[$i]) {
-	    if ($value[$i] ne "") { die "key is multiply defined\n"; }
-	    $value[$i] = $value;
-	    return;
-	}
-    }
-}
-
-sub check_keypairs {
-    my ($i);
-    for ($i = 0; $i < @key; $i++) {
-	# if ($VERBOSE) { print "$key[$i]  -- $value[$i]\n"; }
-	if ($line =~ m|\$$key[$i]|) {
-	    if ($value[$i] eq "") { die "missing value for required key $key[$i]\n"; }
-	    $line =~ s|\$$key[$i]|$value[$i]|g;
-	}
-    }
-}
-
-# we need to find the structure size, including padding 
-# i'm not sure I know the answer to this: it is probably 
-# the total number of bytes rounded up to the largest 
-# data item in the structure (ie, 8 for a double, etc)
-# if we have the size, then we can double check the structure
-# against the expectation at runtime.  for the moment,
-# calculate by hand and add to def.d file 
-