Changeset 8869

Timestamp:

2004-12-21T15:38:56+13:00 (19 years ago)

Author:

schweer

Message:

notifications will only be sent if the collectionConfig.xml of the collection has an entry <nofiy host=hostId/>, with hostId being the name and port of the host the notifications should be sent to (for most cases, this will be localhost:8080). note that the alerting service (/research/schweer/gsdl3/packages/gsdl-as) has to be deployed at /alerting for this to work, and soap for localsite has to be enabled.

Location:

trunk/gsdl3/src/java/org/greenstone/gsdl3

Files:

• gs3build/BuildManager.java (modified) (4 diffs)
• gs3build/CollectionManager.java (modified) (3 diffs)
• gs3build/notifier/NotifierManager.java (modified) (6 diffs)
• util/GSXML.java (modified) (1 diff)

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/BuildManager.java

@@ -3 +3 @@
 import org.greenstone.gsdl3.gs3build.doctypes.*;
 import org.greenstone.gsdl3.gs3build.indexers.*;
+import org.greenstone.gsdl3.gs3build.notifier.NotifierManager;
 import org.greenstone.gsdl3.gs3build.extractor.*;
 import org.greenstone.gsdl3.gs3build.classifier.*;
@@ -17 +18 @@
     ClassifierManager classifierManager;
     ExtractorManager  extractorManager;
+    NotifierManager   notifierManager;
     DocumentList      docList;
     List              inputRoots;
@@ -56 +58 @@
     this.classifierManager = new ClassifierManager(this.docList, collectionManager.getDatabase());
     this.indexerManager = new IndexerManager(this.docList);
+    this.notifierManager = new NotifierManager();
     
     // configure the collection - this will add classifiers, indexers, recognisers to the various managers.
@@ -129 +132 @@
     
     // TODO: validation phase
+    this.notifierManager.detectEvents(this.collectionManager);
     
     if (this.archiveDir != null) {

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/CollectionManager.java

@@ -66 +66 @@
   String             collectionName;
   String             qualifiedCollectionName; // used as the database name 
+  String             notifyHost;
 
   BuildManager       buildManager;
@@ -375 +376 @@
     { this.configureBrowsers(children.item(c), collectionConfig);
     }
+    else if (name.equals(GSXML.NOTIFY_ELEM))
+    {
+        this.notifyHost = ((Element) children.item(c)).getAttribute(GSXML.NOTIFY_HOST_ATT);
+    }
     // TODO: other elements - make a factory-method approach here...
     else
@@ -573 +578 @@
       return collectionName;
   }
+
+/**
+ * @return
+ */
+public String getNotifyHost() {
+    return notifyHost;
 }
-
+}
+

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

@@ -16 +16 @@
     
     public void detectEvents(CollectionManager collManager) {
+        String notifyHost = collManager.getNotifyHost();
+        if (notifyHost == null)
+            return;
         
         System.out.println("detecting events");
@@ -29 +32 @@
             // AccessionDate >= CollectionLastRebuiltDate
             ResultSet results = statement.executeQuery("SELECT DocID FROM document WHERE DocType != 'GSMETADATA' AND AccessionDate >= " + lastBuild);
-            notify(collectionName, host, results, collManager.getDatabase(), collManager.getBuildDate(), "new_document");
+            notify(collectionName, host, notifyHost, results, collManager.getDatabase(), collManager.getBuildDate(), "new_document");
             
             // detect modified documents. A document is modified if and only if
@@ -35 +38 @@
             // 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");
+            notify(collectionName, host, notifyHost, results, collManager.getDatabase(), collManager.getBuildDate(), "document_modified");
             
             // TODO deleted docs?
@@ -55 +58 @@
      * @throws SQLException
      */
-    private void notify(String collName, String hostURL, ResultSet results, GS3SQLConnection database, Date date, String eventType) {
+    private void notify(String collName, String hostURL, String notifyHost, ResultSet results, GS3SQLConnection database, Date date, String eventType) {
         try {
-            URL url = new URL("http://localhost:8080/alerting/service");
+            System.out.println("notifyHost is " + notifyHost);
+            URL url = new URL("http://" + notifyHost + "/alerting/service");
             System.out.println("trying to send to " + url);
             
@@ -82 +86 @@
                     writer.write("&collectionID=");
                     writer.write(URLEncoder.encode(collName, "UTF-8"));
-                    // TODO add collection name to event
                     writer.write("&hostID=");
                     writer.write(URLEncoder.encode(hostURL, "UTF-8"));
@@ -109 +112 @@
                     e1.printStackTrace();
                 }
-//              
-//              Call call = new Call();
-//              call.setTargetObjectURI("alerting");
-//              call.setMethodName("receiveEvent");
-//              call.setEncodingStyleURI(Constants.NS_URI_SOAP_ENC);
-//              Vector params = new Vector();
-//              params.addElement(new Parameter("event", Map.class, event, null));
-//              call.setParams(params);
-//              try {
-//                    Response resp = call.invoke(url, "");
-//                    if (!resp.generatedFault()) {
-//                        System.out.println("successfully posted event");
-//                        return;
-//                    }
-//                    System.err.println("Posting event was unsuccessful:");
-//                    System.err.println(resp.getFault().getFaultString());
-//                    
-//                    Vector entries = resp.getFault().getDetailEntries();
-//                    for (Iterator i = entries.iterator(); i.hasNext(); ) {
-//                      org.w3c.dom.Element entry = (org.w3c.dom.Element)i.next( );
-//                      System.err.println(entry.getFirstChild().getNodeValue( ));
-//                    }
-//                } catch (SOAPException e1) {
-//                    System.err.println("Exception while posting event: ");
-//                    e1.printStackTrace();
-//                }
             }
         } catch (SQLException e) {

trunk/gsdl3/src/java/org/greenstone/gsdl3/util/GSXML.java

@@ -58 +58 @@
     public static final String LEVEL_ELEM = "level";
     public static final String SHORTNAME_ATT = "shortname";
+    public static final String NOTIFY_ELEM = "notify";
+    public static final String NOTIFY_HOST_ATT = "host";
 
     // elems for the pages to be processed by xslt