Changeset 8868

Timestamp:

2004-12-21T14:16:50+13:00 (19 years ago)

Author:

schweer

Message:

unify Strings used

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/notifier/NotifierManager.java (modified) (6 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/notifier/NotifierManager.java

@@ -17 +17 @@
     public void detectEvents(CollectionManager collManager) {
         
+        System.out.println("detecting events");
+        
         String collectionName = collManager.getCollectionName();
         String host = "http://localhost:8080/soap/servlet/rpcrouter";
         
         String lastBuild = dateToSqlString(collManager.getBuildDate());
+        System.out.println("last build was " + lastBuild);
         Statement statement = collManager.getDatabase().createStatement();
         try {
@@ -30 +33 @@
             // detect modified documents. A document is modified if and only if
             // AccessionDate < CollectionLastRebuiltDate (ie, it is not new) and 
-            // ModifiedDate >= IndexedDate
-            results = statement.executeQuery("SELECT DocID FROM document WHERE DocType != 'GSMETADATA' AND AccessionDate < " + lastBuild + " AND ModifiedDate >= IndexedDate");
+            // IndexedDate >= CollectionLastRebuiltDate 
+            results = statement.executeQuery("SELECT DocID FROM document WHERE DocType != 'GSMETADATA' AND AccessionDate < " + lastBuild + " AND IndexedDate >= " + lastBuild);
             notify(collectionName, host, results, collManager.getDatabase(), collManager.getBuildDate(), "document_modified");
+            
+            // TODO deleted docs?
         } catch (SQLException e) {
             // TODO Auto-generated catch block
@@ -56 +61 @@
             
             while(results.next()) {
-                System.out.println("new document: " + results.getString("DocID"));
+                System.out.println(eventType + ": " + results.getString("DocID"));
                 
                 String documentID = results.getString("DocID");
@@ -77 +82 @@
                     writer.write("&collectionID=");
                     writer.write(URLEncoder.encode(collName, "UTF-8"));
-                    writer.write("&host_url=");
+                    // TODO add collection name to event
+                    writer.write("&hostID=");
                     writer.write(URLEncoder.encode(hostURL, "UTF-8"));
                     writer.write("&document_title=");
@@ -145 +151 @@
      */
     private String getDocumentTitle(String documentID, GS3SQLConnection database) {
+        System.out.println("getting title for document " + documentID + " from database");
         Statement statement = database.createStatement();
 
@@ -161 +168 @@
             results = statement.executeQuery(sqlString);
             if (results.next()) {
-                return results.getString(0);
+                String title = results.getString("value");
+                System.out.println("title is " + title);
+                return title;
             }
         } catch (SQLException e) {
+            e.printStackTrace();
         }
         return "";