firebug-cvs

[<do...@us...>]

Update of /cvsroot/firebug/firebug/project/java/src/org/firebug
In directory sc8-pr-cvs1:/tmp/cvs-serv24954/src/org/firebug

Modified Files:
	DBLogger.java ListenFB.java 
Log Message:
Fixed the database naming problem.

Index: DBLogger.java
===================================================================
RCS file: /cvsroot/firebug/firebug/project/java/src/org/firebug/DBLogger.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** DBLogger.java	10 Jul 2003 09:02:58 -0000	1.17
--- DBLogger.java	18 Jul 2003 18:03:26 -0000	1.18
***************
*** 16,21 ****
      private Random rand = new Random();
  
!     public DBLogger () {
! 	dbh = new MysqlDBHandler("localhost","3306","root","",true);
      }
  
--- 16,21 ----
      private Random rand = new Random();
  
!     public DBLogger (String dbname) {
! 	dbh = new MysqlDBHandler("localhost","3306","root","",dbname,true);
      }
  
***************
*** 148,152 ****
      private static void test() {
  
! 	DBLogger dbl = new DBLogger();
  
  	while (true) {
--- 148,152 ----
      private static void test() {
  
! 	DBLogger dbl = new DBLogger("test");
  
  	while (true) {

Index: ListenFB.java
===================================================================
RCS file: /cvsroot/firebug/firebug/project/java/src/org/firebug/ListenFB.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ListenFB.java	15 May 2003 22:51:16 -0000	1.9
--- ListenFB.java	18 Jul 2003 18:03:26 -0000	1.10
***************
*** 199,217 ****
  
      private static void printUsage() {
! 	System.err.println("usage: java listen [options] <port>");
  	System.err.println("options are:");
  	System.err.println("  -h, --help:    usage help");
  	System.err.println("  -p:            print available ports");
  	System.err.println("  -e:            display entire message");
          System.exit(-1);
      }
  
  
      static void handle_args(String [] args) {
  
!       if ((args.length < 1) || (args.length > 2)) {
  	printUsage();
        }
  	
  	for (int i = 0; i < args.length; i++) {
  	    if (args[i].equals("-h") || args[i].equals("--help")) {
--- 199,226 ----
  
      private static void printUsage() {
! 	//System.err.println("usage: java ListenFB [options] <port>");
! 	System.err.println("usage: java ListenFB <database name> <port>");
! 	/*
  	System.err.println("options are:");
  	System.err.println("  -h, --help:    usage help");
  	System.err.println("  -p:            print available ports");
  	System.err.println("  -e:            display entire message");
+ 	*/
          System.exit(-1);
      }
  
  
+     /** Kinda kludgy */
+     static String dbname;
+ 
      static void handle_args(String [] args) {
  
!       if (args.length != 3) {
  	printUsage();
        }
  	
+ 
+       /** None of the following is currently being used. */
+       /*
  	for (int i = 0; i < args.length; i++) {
  	    if (args[i].equals("-h") || args[i].equals("--help")) {
***************
*** 225,228 ****
--- 234,240 ----
  	    }
  	}
+       */
+ 
+       dbname = args[1];
  
  	if (args[args.length - 1].charAt(0) == '-') {
***************
*** 235,239 ****
--- 247,257 ----
      public static void main(String args[]) {
  
+ 	System.out.println(args[0]);
+ 	System.out.println(args[1]);
+ 	System.out.println(args[2]);
+ 
  	handle_args(args);
+ 
+ 
          Vector printers = new Vector(5);
  
***************
*** 243,247 ****
          //PrettyPacket print = new PrettyPacket();
          SensorPacket print = new SensorPacket();
!         DBLogger dblogger = new DBLogger();
  
  	printers.add(print);
--- 261,265 ----
          //PrettyPacket print = new PrettyPacket();
          SensorPacket print = new SensorPacket();
!         DBLogger dblogger = new DBLogger(dbname);
  
  	printers.add(print);