Changeset 12033

Timestamp:

2006-07-06T13:09:34+12:00 (18 years ago)

Author:

kjdon

Message:

removed sqlconnection stuff as its not used, and we will get rid of mysql for gs3

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/BerryBasket.java (modified) (3 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/BerryBasket.java

@@ -63 +63 @@
     protected static final String delimiter ="|";
     protected static final int delay = 1800000;
-
-    protected SQLConnection connection = null;
 
     protected Hashtable userMap = null;
@@ -145 +143 @@
 
 
-    // check the database;
-    this.connection = GS3SQLConnectionFactory.getSQLConnection(DATABASE_NAME);
-    if (this.connection == null) {
-        System.err.println("db was null");
-        // connect to the default database, and create the new database
-        this.connection = GS3SQLConnectionFactory.getSQLConnection(); 
-        if (this.connection == null) {
-        // we can't do anything
-        return false;
-        }
-        System.err.println("connected to test");
-        // create the new one
-        if (!this.connection.createDatabase(DATABASE_NAME)) {
-        //this.connection.close();
-        this.connection = null;
-        return false;
-        }
-        System.err.println("created new one");
-        // connect to it
-        if (!this.connection.connectToDatabase(DATABASE_NAME)) {
-        //this.connection.close();
-        this.connection = null;
-        return false;
-        }
-        System.err.println("reconnected");
-        // set up the tables
-        if (!initialiseDatabase()) {
-        //this.connection.close();
-        this.connection = null;
-        return false;
-        }
-        System.err.println("initialised");
-    } else {
-        // check the database
-        if (!checkDatabase()) {
-        //this.connection.close();
-        this.connection = null;
-        return false;
-        }
-    }       
     return true;
     
@@ -239 +197 @@
 
     return null;
-    }
-
-    protected boolean initialiseDatabase() {
-
-    return true;
-    }
-    protected boolean checkDatabase() {
-    String command = "select * from items;";
-    try {
-        Statement s = this.connection.createStatement();
-        s.execute(command);
-        s.close();
-    } catch (Exception e) {
-        return false;
-    }
-    return true;
     }