cvs commit: xml-cocoon2/src/java/org/apache/cocoon Main.java

[bloritsch]

bloritsch    02/01/11 11:32:10

  Modified:    src/java/org/apache/cocoon Main.java
  Log:
  finally fixed broken link detection without forcing cli to stop immediately
  
  Revision  Changes    Path
  1.9       +13 -11    xml-cocoon2/src/java/org/apache/cocoon/Main.java
  
  Index: Main.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/Main.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Main.java 11 Jan 2002 18:57:49 -0000      1.8
  +++ Main.java 11 Jan 2002 19:32:10 -0000      1.9
  @@ -97,7 +97,7 @@
    * Command line entry point.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.8 $ $Date: 2002/01/11 18:57:49 $
  + * @version CVS $Revision: 1.9 $ $Date: 2002/01/11 19:32:10 $
    */
   public class Main {
   
  @@ -573,14 +573,11 @@
                           this.processURI(url);
                       }
                   }
  -                links.remove(url);
  -                nCount++;
               } catch (ResourceNotFoundException rnfe) {
  -                if (log.isWarnEnabled())
  -                {
  -                    log.warn("  +-[ BROKEN LINK ] -> " + url);
  -                }
  +                log.warn("  [broken link]--> " + url);
               }
  +            links.remove(url);
  +            nCount++;
   
               if (log.isInfoEnabled()) {
                   log.info("  Memory used: " + (Runtime.getRuntime().totalMemory() - 
Runtime.getRuntime().freeMemory()));
  @@ -698,10 +695,15 @@
               }
               String translatedAbsoluteLink = 
(String)allTranslatedLinks.get(absoluteLink);
               if (translatedAbsoluteLink == null) {
  -                translatedAbsoluteLink = this.translateURI(absoluteLink);
  -                log.info("  Link translated: " + absoluteLink);
  -                allTranslatedLinks.put(absoluteLink, translatedAbsoluteLink);
  -                absoluteLinks.add(absoluteLink);
  +                try {
  +                    translatedAbsoluteLink = this.translateURI(absoluteLink);
  +                    log.info("  Link translated: " + absoluteLink);
  +                    allTranslatedLinks.put(absoluteLink, translatedAbsoluteLink);
  +                    absoluteLinks.add(absoluteLink);
  +                } catch (ResourceNotFoundException rnfe) {
  +                    log.warn("  [broken link]--> " + absoluteLink);
  +                    continue;
  +                }
               }
   
               final String translatedRelativeLink = NetUtils.relativize(path, 
translatedAbsoluteLink);
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     [EMAIL PROTECTED]
To unsubscribe, e-mail:          [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]