[jboss-svn-commits] JBL Code SVN: r32321 - labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/java/org/jboss/labs/sbs/plugin/bm.

[jboss-svn-commits at lists.jboss.org]

Author: lkrzyzanek
Date: 2010-03-31 08:51:40 -0400 (Wed, 31 Mar 2010)
New Revision: 32321

Modified:
   labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/java/org/jboss/labs/sbs/plugin/bm/DbOldBlogsManager.java
Log:
Commented migration of root directory.
Removed calling wikiToJiveDocument - content is sincerally not wiki document.

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/java/org/jboss/labs/sbs/plugin/bm/DbOldBlogsManager.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/java/org/jboss/labs/sbs/plugin/bm/DbOldBlogsManager.java	2010-03-31 12:01:01 UTC (rev 32320)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/java/org/jboss/labs/sbs/plugin/bm/DbOldBlogsManager.java	2010-03-31 12:51:40 UTC (rev 32321)
@@ -134,9 +134,11 @@
 
     // migrate admin
     long count = 0;
-    log.info("Migrating user: admin");
-    long categoryCount = migrateCategory(repo, "admin");
-    count = count + categoryCount;
+    // root directory is not migrated - it's not listed on jboss.org - most of
+    // these posts are saved here as mistake and are saved in right category.
+    // log.info("Migrating user: admin");
+    // long categoryCount = migrateCategory(repo, "admin");
+    // count = count + categoryCount;
 
     // categories in blogs.jboss.org is used for authors name
     // (each author has one category called by his name)
@@ -148,7 +150,7 @@
         final String authorName = category.getName();
         log.info("Migrating user: " + authorName + " (" + (i + 1) + "/" + categories.length + ")");
 
-        categoryCount = migrateCategory(category, authorName);
+        long categoryCount = migrateCategory(category, authorName);
         count = count + categoryCount;
       }
     }
@@ -228,13 +230,13 @@
     return username;
   }
 
-  private BlogPost insertBlogEntry(Blog b, OldBlogEntryBean oldBlogEntry) {
-    if (log.isDebugEnabled()) {
-      log.debug("Insert Blog entry '" + oldBlogEntry.getTitle() + "' from author: " + oldBlogEntry.getAuthor());
+  private BlogPost insertBlogEntry(Blog b, OldBlogEntryBean oldBlogEntry) throws Exception {
+    if (log.isInfoEnabled()) {
+      log.info("Insert Blog entry: " + oldBlogEntry.getCode());
     }
     BlogPost post = b.createBlogPost(b.getUser());
     post.setSubject(oldBlogEntry.getTitle());
-    post.setBody(parseHtmlBasedWikiContent(oldBlogEntry.getBody()));
+    post.setBody(parseHtmlBasedWikiContent(oldBlogEntry.getBody(), oldBlogEntry.getCode()));
     post.setCreationDate(oldBlogEntry.getCreated());
     post.setModificationDate(oldBlogEntry.getCreated());
     post.setPublishDate(oldBlogEntry.getCreated());
@@ -250,51 +252,46 @@
    * @return
    * @see WikiContentHelper#parseHtmlBasedWikiContent
    */
-  private static Document parseHtmlBasedWikiContent(String textBody) {
+  private static Document parseHtmlBasedWikiContent(String textBody, String postCode) throws Exception {
     textBody = StringUtils.replaceAll(textBody, "<p />", "<p>&nbsp;</p>");
     textBody = StringUtils.replaceAll(textBody, "<div />", "<div>&nbsp;</div>");
-    try {
-      String html = HtmlRenderUtils.tidy(textBody, true, true);
-      html = StringUtils.replaceHtmlEntitiesWithValueOpt(html);
-      if (html == null || html.length() == 0) {
-        throw new UnsupportedEncodingException("unable to tidy document");
-      }
-      Document document = JAXPUtils.toBodyXml(html);
-      // Following lines are commented because messages are not Wiki articles.
-
-      // List<org.w3c.dom.Element> elementList =
-      // JAXPUtils.selectAllNodes(document, "div");
-      // elementList.addAll(JAXPUtils.selectAllNodes(document, "span"));
-      // elementList.addAll(JAXPUtils.selectAllNodes(document, "p"));
-      // elementList.addAll(JAXPUtils.selectAllNodes(document, "li"));
-      // elementList.addAll(JAXPUtils.selectAllNodes(document, "td"));
-      // elementList.addAll(JAXPUtils.selectAllNodes(document, "th"));
-      // elementList.addAll(JAXPUtils.selectAllNodes(document, "a"));
-      // elementList.addAll(JAXPUtils.selectAllNodes(document, "body"));
-      // for (org.w3c.dom.Element element : elementList) {
-      // NodeList childNodes = element.getChildNodes();
-      // for (int i = 0; i < childNodes.getLength(); i++) {
-      // Node node = childNodes.item(i);
-      // if (node.getNodeType() == Node.TEXT_NODE) {
-      // String content = node.getTextContent();
-      // if (content != null) {
-      // if (StringUtils.containsAnyOf(content, "!", "[", "*", "~", "+")) {
-      // WikiLexer lexer = new WikiLexer(content);
-      // Element body = lexer.parse();
-      // String bodyText = HtmlRenderUtils.toString(body);
-      // Document bodyDoc = JAXPUtils.toXmlDocument(bodyText);
-      // JAXPUtils.replace(node, bodyDoc.getDocumentElement()
-      // .getChildNodes());
-      // }
-      // }
-      // }
-      // }
-      // }
-      return document;
-    } catch (Exception e) {
-      log.error("Cannot parse text body. " + "Trying to parse as wiki document. Error message: " + e.getMessage());
+    String html = HtmlRenderUtils.tidy(textBody, true, true);
+    html = StringUtils.replaceHtmlEntitiesWithValueOpt(html);
+    if (html == null || html.length() == 0) {
+      throw new UnsupportedEncodingException("unable to tidy document");
     }
-    return WikiContentHelper.wikiToJiveDocument(textBody);
+    Document document = JAXPUtils.toBodyXml(html);
+    // Following lines are commented because messages are not Wiki articles.
+
+    // List<org.w3c.dom.Element> elementList =
+    // JAXPUtils.selectAllNodes(document, "div");
+    // elementList.addAll(JAXPUtils.selectAllNodes(document, "span"));
+    // elementList.addAll(JAXPUtils.selectAllNodes(document, "p"));
+    // elementList.addAll(JAXPUtils.selectAllNodes(document, "li"));
+    // elementList.addAll(JAXPUtils.selectAllNodes(document, "td"));
+    // elementList.addAll(JAXPUtils.selectAllNodes(document, "th"));
+    // elementList.addAll(JAXPUtils.selectAllNodes(document, "a"));
+    // elementList.addAll(JAXPUtils.selectAllNodes(document, "body"));
+    // for (org.w3c.dom.Element element : elementList) {
+    // NodeList childNodes = element.getChildNodes();
+    // for (int i = 0; i < childNodes.getLength(); i++) {
+    // Node node = childNodes.item(i);
+    // if (node.getNodeType() == Node.TEXT_NODE) {
+    // String content = node.getTextContent();
+    // if (content != null) {
+    // if (StringUtils.containsAnyOf(content, "!", "[", "*", "~", "+")) {
+    // WikiLexer lexer = new WikiLexer(content);
+    // Element body = lexer.parse();
+    // String bodyText = HtmlRenderUtils.toString(body);
+    // Document bodyDoc = JAXPUtils.toXmlDocument(bodyText);
+    // JAXPUtils.replace(node, bodyDoc.getDocumentElement()
+    // .getChildNodes());
+    // }
+    // }
+    // }
+    // }
+    // }
+    return document;
   }
 
   protected String getMetaPathFromEntry(String entryPath) {