[Yanel-commits] rev 23703 - public/yanel/trunk/src/resources/add-realm/src/java/org/wyona/yanel/impl/resources

[michi at wyona.com]

Author: michi
Date: 2007-04-13 00:16:38 +0200 (Fri, 13 Apr 2007)
New Revision: 23703

Modified:
   public/yanel/trunk/src/resources/add-realm/src/java/org/wyona/yanel/impl/resources/AddRealmResource2.java
Log:
remove event log when dump is done

Modified: public/yanel/trunk/src/resources/add-realm/src/java/org/wyona/yanel/impl/resources/AddRealmResource2.java
===================================================================
--- public/yanel/trunk/src/resources/add-realm/src/java/org/wyona/yanel/impl/resources/AddRealmResource2.java	2007-04-12 21:56:27 UTC (rev 23702)
+++ public/yanel/trunk/src/resources/add-realm/src/java/org/wyona/yanel/impl/resources/AddRealmResource2.java	2007-04-12 22:16:38 UTC (rev 23703)
@@ -310,7 +310,9 @@
         Element rootElement = doc.getDocumentElement();
         Element fromExistingWebsiteElement = (Element) rootElement.appendChild(doc.createElementNS(NAMESPACE, "from-existing-website"));
 
-        EventLog eventLog = (EventLog) request.getSession().getAttribute(SESSION_ATTR_EVENT_LOG);
+        HttpSession session = request.getSession();
+
+        EventLog eventLog = (EventLog) session.getAttribute(SESSION_ATTR_EVENT_LOG);
         if (eventLog != null) {
             Element deElement = (Element) fromExistingWebsiteElement.appendChild(doc.createElementNS(NAMESPACE, "downloadevents"));
             deElement.appendChild(doc.createTextNode(eventLog.getDownloadEvents()));
@@ -323,6 +325,22 @@
 
             Element isdoneElement = (Element) fromExistingWebsiteElement.appendChild(doc.createElementNS(NAMESPACE, "isdone"));
             isdoneElement.appendChild(doc.createTextNode("" + eventLog.isDone()));
+
+            // TODO: Move this into the ImportSiteThread because it can lead to confusing results if two imports are happening at the same time within the same session!
+            if (eventLog.isDone()) {
+                session.removeAttribute(SESSION_ATTR_EVENT_LOG);
+                session.removeAttribute(SESSION_ATTR_CRAWLER);
+
+                Element realmIdElement = (Element) fromExistingWebsiteElement.appendChild(doc.createElementNS(NAMESPACE, "realm-id"));
+                realmIdElement.appendChild(doc.createTextNode((String) session.getAttribute(SESSION_ATTR_REALM_ID)));
+                session.removeAttribute(SESSION_ATTR_REALM_ID);
+
+                Element realmNameElement = (Element) fromExistingWebsiteElement.appendChild(doc.createElementNS(NAMESPACE, "realm-name"));
+                realmNameElement.appendChild(doc.createTextNode((String) session.getAttribute(SESSION_ATTR_REALM_NAME)));
+                session.removeAttribute(SESSION_ATTR_REALM_NAME);
+            }
+        } else {
+            // TODO: Import should be finished if no eventLog exists. Provide back link ...
         }
         return doc;
     }