svn commit: r1182708 - /incubator/lcf/branches/CONNECTORS-256/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java

[kw...@apache.org]

Author: kwright
Date: Thu Oct 13 07:49:37 2011
New Revision: 1182708

URL: http://svn.apache.org/viewvc?rev=1182708&view=rev
Log:
Fix problem with getTimestamp()

Modified:
    incubator/lcf/branches/CONNECTORS-256/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java

Modified: incubator/lcf/branches/CONNECTORS-256/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-256/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java?rev=1182708&r1=1182707&r2=1182708&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-256/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java (original)
+++ incubator/lcf/branches/CONNECTORS-256/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java Thu Oct 13 07:49:37 2011
@@ -1895,17 +1895,12 @@ public class WikiConnector extends org.a
 
     protected BaseProcessingContext createChild(String namespaceURI, String localName, String qName, Attributes atts)
     {
-      return new WikiGetTimestampPageContext(theStream,namespaceURI,localName,qName,atts);
+      return new WikiGetTimestampPageContext(theStream,namespaceURI,localName,qName,atts,versions);
     }
 
     protected void finishChild(BaseProcessingContext child)
       throws ManifoldCFException
     {
-      WikiGetTimestampPageContext pc = (WikiGetTimestampPageContext)child;
-      String pageID = pc.getPageID();
-      String version = pc.getLastEdit();
-      if (pageID != null && version != null)
-        versions.put(pageID,version);
     }
   }
 
@@ -1913,11 +1908,13 @@ public class WikiConnector extends org.a
   protected static class WikiGetTimestampPageContext extends BaseProcessingContext
   {
     protected String pageID = null;
-    protected String lastRevEdit = null;
+    protected Map<String,String> versions;
     
-    public WikiGetTimestampPageContext(XMLStream theStream, String namespaceURI, String localName, String qName, Attributes atts)
+    public WikiGetTimestampPageContext(XMLStream theStream, String namespaceURI, String localName, String qName, Attributes atts,
+      Map<String,String> versions)
     {
       super(theStream,namespaceURI,localName,qName,atts);
+      this.versions = versions;
     }
 
     protected XMLContext beginTag(String namespaceURI, String localName, String qName, Attributes atts)
@@ -1938,20 +1935,14 @@ public class WikiConnector extends org.a
       String theTag = theContext.getQname();
 
       if (theTag.equals("page"))
-        lastRevEdit = ((WikiGetTimestampRevisionsContext)theContext).getTimestamp();
+      {
+        String lastRevEdit = ((WikiGetTimestampRevisionsContext)theContext).getTimestamp();
+        versions.put(pageID,lastRevEdit);
+      }
       else
         super.endTag();
     }
     
-    public String getPageID()
-    {
-      return pageID;
-    }
-    
-    public String getLastEdit()
-    {
-      return lastRevEdit;
-    }
   }
 
   /** Class looking for the "api/query/pages/page/revisions" context of a "get timestamp" response */