Changeset 8867 for trunk/greenstone3-extensions/gsdl-as/src/org/greenstone/gsdlas/profiles/Subscription.java

Timestamp:

2004-12-21T12:11:00+13:00 (19 years ago)

Author:

schweer

Message:

fixed BTS 12: restore subscriptions/predicates from database

File:

• trunk/greenstone3-extensions/gsdl-as/src/org/greenstone/gsdlas/profiles/Subscription.java (modified) (4 diffs)

trunk/greenstone3-extensions/gsdl-as/src/org/greenstone/gsdlas/profiles/Subscription.java

@@ -78 +78 @@
         rssNotification = valueMap.containsKey("way") && ((List)valueMap.get("way")).contains("rss");
         eventsSincePageNotification = valueMap.containsKey("way") && ((List)valueMap.get("way")).contains("page");
-        id = saveToDatabase(true);
+        id = saveToDatabase();
         
         for (Iterator iter = getPredicates().iterator(); iter.hasNext();) {
@@ -157 +157 @@
     }
     
-    private int saveToDatabase(boolean initial) throws DatabaseException, SQLException {
+    private int saveToDatabase() throws DatabaseException, SQLException {
         Connection conn = DatabaseManager.getInstance().getDatabaseConnection();
         Statement statement = conn.createStatement();
         String sqlString;
+        boolean initial = true;
+        
+        sqlString = "SELECT id FROM subscriptions WHERE name like '" + name + 
+                    "' AND email like '" + email + "' AND rss=" + (rssNotification ? 1 : 0) 
+                    + " AND page=" + (eventsSincePageNotification ? 1 : 0) + " AND user like '" +
+                    username + "';";
+        ResultSet result = statement.executeQuery(sqlString);
+        if (result.next()) {
+            initial = false;
+            this.id = result.getInt("id");
+        }
+        
         if (initial) {
             sqlString = "INSERT INTO subscriptions (name, email, rss, page, user) " +
@@ -168 +180 @@
             sqlString = "UPDATE subscriptions SET name='" + name + "', email='" +
                     email + "', rss=" + (rssNotification ? 1 : 0) + ",page=" + 
-                    (eventsSincePageNotification ? 1 : 0)+ "WHERE id=" + id + ";";
+                    (eventsSincePageNotification ? 1 : 0)+ " WHERE id=" + this.id + ";";
             // cannot change user
         }
@@ -178 +190 @@
                     username + "';";
         System.out.println(sqlString);
-        ResultSet result = statement.executeQuery(sqlString);
-        int id;
+        result = statement.executeQuery(sqlString);
+        
         if (result.next()) {
             id = result.getInt("id");