jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jalka...@apache.org
Subject svn commit: r711348 - in /incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH: ChangeLog src/com/ecyrd/jspwiki/Release.java src/com/ecyrd/jspwiki/search/LuceneSearchProvider.java
Date Tue, 04 Nov 2008 18:41:20 GMT
Author: jalkanen
Date: Tue Nov  4 10:41:19 2008
New Revision: 711348

URL: http://svn.apache.org/viewvc?rev=711348&view=rev
Log:
[JSPWIKI-411] LuceneSearchProvider no longer stops processing at startup
if the indexing dies due to non-indexable content.

Modified:
    incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog
    incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
    incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/search/LuceneSearchProvider.java

Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog?rev=711348&r1=711347&r2=711348&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog Tue Nov  4 10:41:19 2008
@@ -1,3 +1,10 @@
+2008-11-04  Janne Jalkanen <jalkanen@apache.org>
+
+        * 2.8.1-svn-7
+        
+        * [JSPWIKI-411] LuceneSearchProvider no longer stops processing at startup
+        if the indexing dies due to non-indexable content.
+
 2008-11-04  Dirk Frederickx <dirk.frederickx@gmail.com>
 
         * 2.8.1-svn-6
@@ -11,8 +18,7 @@
         
         * JSPWIKI-408: Hide wide-content on left-menu and leftmenu-footer.
         
-        * JSPWIKI-403: Pagination links now show a pointer cursor at hover.
-        
+        * JSPWIKI-403: Pagination links now show a pointer cursor at hover.        
 
 2008-11-03  Janne Jalkanen <jalkanen@apache.org>
 

Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java?rev=711348&r1=711347&r2=711348&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java Tue Nov
 4 10:41:19 2008
@@ -77,7 +77,7 @@
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "6";
+    public static final String     BUILD         = "7";
     
     /**
      *  This is the generic version string you should use

Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/search/LuceneSearchProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/search/LuceneSearchProvider.java?rev=711348&r1=711347&r2=711348&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/search/LuceneSearchProvider.java
(original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/search/LuceneSearchProvider.java
Tue Nov  4 10:41:19 2008
@@ -212,18 +212,34 @@
                     for( Iterator iterator = allPages.iterator(); iterator.hasNext(); )
                     {
                         WikiPage page = (WikiPage) iterator.next();
-                        String text = m_engine.getPageManager().getPageText( page.getName(),
-                                                                             WikiProvider.LATEST_VERSION
);
-                        luceneIndexPage( page, text, writer );
+                        
+                        try
+                        {
+                            String text = m_engine.getPageManager().getPageText( page.getName(),
+                                                                                 WikiProvider.LATEST_VERSION
);
+                            luceneIndexPage( page, text, writer );
+                        }
+                        catch( Exception e )
+                        {
+                            log.info("Unable to index page, continuing to next: "+page.getName(),e
);
+                        }
                     }
 
                     Collection allAttachments = m_engine.getAttachmentManager().getAllAttachments();
                     for( Iterator iterator = allAttachments.iterator(); iterator.hasNext();
)
                     {
                         Attachment att = (Attachment) iterator.next();
-                        String text = getAttachmentContent( att.getName(),
-                                                            WikiProvider.LATEST_VERSION );
-                        luceneIndexPage( att, text, writer );
+                        
+                        try
+                        {
+                            String text = getAttachmentContent( att.getName(),
+                                                                WikiProvider.LATEST_VERSION
);
+                            luceneIndexPage( att, text, writer );
+                        }
+                        catch( Exception e )
+                        {
+                            log.info("Unable to index attachment, continuing to next: "+att.getName(),e
);                            
+                        }
                     }
 
                     writer.optimize();



Mime
View raw message