[Firebug-cvs] fireboard/beta/tools/src/xlisten/boards fireboard.c,1.9,1.10 pg_test.c,1.2,1.3

[David M. D. <do...@us...>]

Update of /cvsroot/firebug/fireboard/beta/tools/src/xlisten/boards
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18091/boards

Modified Files:
	fireboard.c pg_test.c 
Log Message:
GGA_Data pg logging handled in external function with
new location table rather than firebug_results table.

Index: pg_test.c
===================================================================
RCS file: /cvsroot/firebug/fireboard/beta/tools/src/xlisten/boards/pg_test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pg_test.c	1 Jun 2005 13:14:19 -0000	1.2
--- pg_test.c	1 Jun 2005 18:06:08 -0000	1.3
***************
*** 11,14 ****
--- 11,15 ----
  
  // TODO: Change these to cooked values.
+ // TODO: Remove the SQL command.
  const char *fb_pg_weather_schema = 
  "CREATE TABLE %s%s ( "
***************
*** 31,45 ****
  "accel_y integer)";
  
  const char *fb_pg_location_schema = 
  "CREATE TABLE %s%s ( "
  "Hours integer, "
  "Minutes integer, "
! "seconds integer, "
  "Latitudedegree integer, "
! "Latitudeminutes integer, "
  "Longitudedegree integer, "
! "Longitudeminute integer, "
! "NSEWind integer, "
! "Fixed integer)";
  
  
--- 32,47 ----
  "accel_y integer)";
  
+ // TODO: Remove the SQL command.
  const char *fb_pg_location_schema = 
  "CREATE TABLE %s%s ( "
+ "nodeid integer, "
  "Hours integer, "
  "Minutes integer, "
! "seconds float, "
  "Latitudedegree integer, "
! "Latitudeminutes float, "
  "Longitudedegree integer, "
! "Longitudeminute float, "
! "NSEWind integer)";
  
  
***************
*** 136,151 ****
    sprintf(pg_statement, 
  	  "INSERT into %s "
! 	  "(result_time,nodeid,parent,Hours,Minutes,seconds,"
  	  "Latitudedegree,Latitudeminutes,Longitudedegree,Longitudeminute,"
! 	  "NSEWind,Fixed)"
! 	  " values (now(),%u,%u,%u,%u,%f,%u,%f,%u,%f,%u)", 
  	  "cumulative_location",
! 	  packet->node_id, packet->parent, 
! 	  data->hours, data->minutes, data->dec_sec,
! 	  data->Lat_deg, data->Lat_dec_min,
! 	  data->Long_deg, data->Long_dec_min, data->NSEWind);	
  
    xdb_execute(pg_statement);
  
    // TODO: This needs to be changed to a REPLACE statement.
    sprintf(pg_statement, 
--- 138,163 ----
    sprintf(pg_statement, 
  	  "INSERT into %s "
! 	  "(nodeid,Hours,Minutes,seconds,"
  	  "Latitudedegree,Latitudeminutes,Longitudedegree,Longitudeminute,"
! 	  "NSEWind) "
! 	  "values (%u,%u,%u,%f,%u,%f,%u,%f,%u)", 
  	  "cumulative_location",
! 	  packet->node_id,
! 	  data->hours,
! 	  data->minutes,
! 	  data->dec_sec,
! 	  data->Lat_deg,
! 	  data->Lat_dec_min,
! 	  data->Long_deg,
! 	  data->Long_dec_min,
! 	  data->NSEWind);	
! 
!   //printf("pg_statement: %s\n", pg_statement);
!   //printf("table: %s\n", xdb_get_table());
  
    xdb_execute(pg_statement);
  
+   // TODO: Replace this with a rules cache statement.
+ #if 0
    // TODO: This needs to be changed to a REPLACE statement.
    sprintf(pg_statement, 
***************
*** 153,157 ****
  	  "(result_time,nodeid,parent,Hours,Minutes,seconds,"
  	  "Latitudedegree,Latitudeminutes,Longitudedegree,Longitudeminute,"
! 	  "NSEWind,Fixed)"
  	  " values (now(),%u,%u,%u,%u,%f,%u,%f,%u,%f,%u)", 
  	  "current_location",
--- 165,169 ----
  	  "(result_time,nodeid,parent,Hours,Minutes,seconds,"
  	  "Latitudedegree,Latitudeminutes,Longitudedegree,Longitudeminute,"
! 	  "NSEWind)"
  	  " values (now(),%u,%u,%u,%u,%f,%u,%f,%u,%f,%u)", 
  	  "current_location",
***************
*** 162,165 ****
  
    xdb_execute(pg_statement);
! 
  }
--- 174,177 ----
  
    xdb_execute(pg_statement);
! #endif
  }

Index: fireboard.c
===================================================================
RCS file: /cvsroot/firebug/fireboard/beta/tools/src/xlisten/boards/fireboard.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** fireboard.c	1 Jun 2005 13:14:19 -0000	1.9
--- fireboard.c	1 Jun 2005 18:06:08 -0000	1.10
***************
*** 773,776 ****
--- 773,778 ----
    char command[512];
    char *table = xdb_get_table();
+ 
+ 
    if (!*table) table = "fireboard_results";
  
***************
*** 851,857 ****
    }
    case AM_GGA_DATA:{
! 
      fb_pg_log_gga_data(packet);
!     /*
      GGA_Data * data = (GGA_Data*)packet->data;
      sprintf(command, 
--- 853,860 ----
    }
    case AM_GGA_DATA:{
! #if 1
      fb_pg_log_gga_data(packet);
!     return;
! #else
      GGA_Data * data = (GGA_Data*)packet->data;
      sprintf(command, 
***************
*** 859,873 ****
  	    "(result_time,nodeid,parent,Hours,Minutes,seconds,"
  	    "Latitudedegree,Latitudeminutes,Longitudedegree,Longitudeminute,"
! 	    "NSEWind,Fixed)"
  	    " values (now(),%u,%u,%u,%u,%f,%u,%f,%u,%f,%u)", 
  	    table,
! 	    //timestring,
! 	    packet->node_id, packet->parent, 
! 	    data->hours, data->minutes, data->dec_sec,
! 	    data->Lat_deg, data->Lat_dec_min,
! 	    data->Long_deg, data->Long_dec_min, data->NSEWind);
      break;
!     */
!     return;
    }
    case 3: {
--- 862,880 ----
  	    "(result_time,nodeid,parent,Hours,Minutes,seconds,"
  	    "Latitudedegree,Latitudeminutes,Longitudedegree,Longitudeminute,"
! 	    "NSEWind)"
  	    " values (now(),%u,%u,%u,%u,%f,%u,%f,%u,%f,%u)", 
  	    table,
! 	    packet->node_id,
! 	    packet->parent, 
! 	    data->hours,
! 	    data->minutes,
! 	    data->dec_sec,
! 	    data->Lat_deg,
! 	    data->Lat_dec_min,
! 	    data->Long_deg,
! 	    data->Long_dec_min,
! 	    data->NSEWind);
      break;
! #endif
    }
    case 3: {
***************
*** 943,947 ****
    xpacket_add_type(&fireboard_packet_handler);
    // Use this for testing the db setup.
!   //fb_pg_recreate_tables();
  }
  
--- 950,954 ----
    xpacket_add_type(&fireboard_packet_handler);
    // Use this for testing the db setup.
!   fb_pg_recreate_tables();
  }