|
From: <de...@us...> - 2012-11-16 16:03:50
|
Revision: 7896
http://fudaa.svn.sourceforge.net/fudaa/?rev=7896&view=rev
Author: deniger
Date: 2012-11-16 16:03:43 +0000 (Fri, 16 Nov 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/scan/LinkRefChecker.java
trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/scan/LinkRefCheckerTest.java
Modified: trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/scan/LinkRefChecker.java
===================================================================
--- trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/scan/LinkRefChecker.java 2012-11-16 15:59:08 UTC (rev 7895)
+++ trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/scan/LinkRefChecker.java 2012-11-16 16:03:43 UTC (rev 7896)
@@ -3,7 +3,6 @@
*/
package org.fudaa.dodico.crue.sysdoc.scan;
-import com.memoire.fu.FuLib;
import java.io.File;
import java.net.URLDecoder;
import java.util.ArrayList;
@@ -145,8 +144,10 @@
String decode = URLDecoder.decode(link, allHrefAndSourceLinks.getEncoding());
File target = new File(dir, decode).getCanonicalFile();
if (!target.exists()) {
+ System.err.println("target not exist: " + target);
res.addError("linkNotFound", link);
} else if (!FilenameUtils.directoryContains(baseDirCanonicalPath, target.getCanonicalPath())) {
+ System.err.println("target not in base dir: " + target);
res.addWarn("linkNotInBaseDir", link);
}
}
Modified: trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/scan/LinkRefCheckerTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/scan/LinkRefCheckerTest.java 2012-11-16 15:59:08 UTC (rev 7895)
+++ trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/scan/LinkRefCheckerTest.java 2012-11-16 16:03:43 UTC (rev 7896)
@@ -59,9 +59,9 @@
assertEquals(2, logs.size());
CtuluLog log = logs.get(0);
testFirstLogRecord(log);
- assertEquals(new File(new File(dir, "Dossier 1"), "fichier.html").getCanonicalPath(), log.getDesc());
+ assertEquals(new File(new File(dir, "Dossier 1"), "fichier.html (Titre)").getCanonicalPath(), log.getDesc());
log = logs.get(1);
- assertEquals(new File(new File(dir, "Dossier 1"), "index.html").getCanonicalPath(), log.getDesc());
+ assertEquals(new File(new File(dir, "Dossier 1"), "index.html (Titre du dossier avec éè)").getCanonicalPath(), log.getDesc());
testFirstLogRecord(log);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2016-02-25 21:48:28
|
Revision: 9302
http://sourceforge.net/p/fudaa/svn/9302
Author: deniger
Date: 2016-02-25 21:48:25 +0000 (Thu, 25 Feb 2016)
Log Message:
-----------
organisation des imports
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/Sysdoc.java
trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/SysdocLoader.java
trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/index/FileIndexer.java
trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/SysdocBuilderTest.java
trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/SysdocLoaderTest.java
trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/common/DocEntryBuilderTest.java
trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/index/FileIndexerTest.java
trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/persist/PersistProcessorTest.java
trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/scan/LinkAndSourceProcessorTest.java
trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/scan/LinkRefCheckerTest.java
trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/scan/TitleProcessorTest.java
Modified: trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/Sysdoc.java
===================================================================
--- trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/Sysdoc.java 2016-02-25 21:39:12 UTC (rev 9301)
+++ trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/Sysdoc.java 2016-02-25 21:48:25 UTC (rev 9302)
@@ -3,8 +3,8 @@
*/
package org.fudaa.dodico.crue.sysdoc;
+import org.fudaa.dodico.crue.sysdoc.common.DocEntry;
import org.fudaa.dodico.crue.sysdoc.common.SysdocFolder;
-import org.fudaa.dodico.crue.sysdoc.common.DocEntry;
/**
*
Modified: trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/SysdocLoader.java
===================================================================
--- trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/SysdocLoader.java 2016-02-25 21:39:12 UTC (rev 9301)
+++ trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/SysdocLoader.java 2016-02-25 21:48:25 UTC (rev 9302)
@@ -3,10 +3,10 @@
*/
package org.fudaa.dodico.crue.sysdoc;
-import org.fudaa.dodico.crue.sysdoc.common.SysdocFolder;
import java.io.File;
import org.fudaa.ctulu.CtuluIOResult;
import org.fudaa.ctulu.CtuluLog;
+import org.fudaa.dodico.crue.sysdoc.common.SysdocFolder;
import org.fudaa.dodico.crue.sysdoc.common.SysdocMessages;
import org.fudaa.dodico.crue.sysdoc.persist.PersistContent;
import org.fudaa.dodico.crue.sysdoc.persist.PersistProcessor;
Modified: trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/index/FileIndexer.java
===================================================================
--- trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/index/FileIndexer.java 2016-02-25 21:39:12 UTC (rev 9301)
+++ trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/index/FileIndexer.java 2016-02-25 21:48:25 UTC (rev 9302)
@@ -12,9 +12,6 @@
import java.util.logging.Logger;
import org.apache.commons.lang.StringUtils;
import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.index.IndexWriterConfig;
-import org.fudaa.ctulu.CtuluLog;
-import org.fudaa.dodico.crue.sysdoc.common.SysdocFolder;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
@@ -22,11 +19,14 @@
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory;
import org.apache.lucene.util.Version;
import org.ccil.cowan.tagsoup.Parser;
import org.fudaa.ctulu.CtuluLibFile;
+import org.fudaa.ctulu.CtuluLog;
+import org.fudaa.dodico.crue.sysdoc.common.SysdocFolder;
import org.fudaa.dodico.crue.sysdoc.common.SysdocMessages;
import org.fudaa.dodico.crue.sysdoc.scan.EncodingProcessor;
import org.xml.sax.InputSource;
Modified: trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/SysdocBuilderTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/SysdocBuilderTest.java 2016-02-25 21:39:12 UTC (rev 9301)
+++ trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/SysdocBuilderTest.java 2016-02-25 21:48:25 UTC (rev 9302)
@@ -11,8 +11,8 @@
import org.fudaa.ctulu.CtuluLogGroup;
import org.fudaa.dodico.crue.sysdoc.common.DocEntry;
import org.fudaa.dodico.crue.sysdoc.common.SysdocFolder;
+import static org.junit.Assert.*;
import org.junit.Test;
-import static org.junit.Assert.*;
/**
*
Modified: trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/SysdocLoaderTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/SysdocLoaderTest.java 2016-02-25 21:39:12 UTC (rev 9301)
+++ trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/SysdocLoaderTest.java 2016-02-25 21:48:25 UTC (rev 9302)
@@ -8,8 +8,8 @@
import org.fudaa.ctulu.CtuluIOResult;
import org.fudaa.ctulu.CtuluLibFile;
import org.fudaa.ctulu.CtuluLog;
+import static org.junit.Assert.*;
import org.junit.Test;
-import static org.junit.Assert.*;
/**
*
Modified: trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/common/DocEntryBuilderTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/common/DocEntryBuilderTest.java 2016-02-25 21:39:12 UTC (rev 9301)
+++ trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/common/DocEntryBuilderTest.java 2016-02-25 21:48:25 UTC (rev 9302)
@@ -6,8 +6,8 @@
import java.util.ArrayList;
import java.util.List;
import org.fudaa.dodico.crue.sysdoc.scan.DocScanEntry;
+import static org.junit.Assert.*;
import org.junit.Test;
-import static org.junit.Assert.*;
/**
*
Modified: trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/index/FileIndexerTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/index/FileIndexerTest.java 2016-02-25 21:39:12 UTC (rev 9301)
+++ trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/index/FileIndexerTest.java 2016-02-25 21:48:25 UTC (rev 9302)
@@ -7,8 +7,8 @@
import java.io.IOException;
import org.fudaa.ctulu.CtuluLibFile;
import org.fudaa.ctulu.CtuluLog;
+import static org.junit.Assert.*;
import org.junit.Test;
-import static org.junit.Assert.*;
/**
*
Modified: trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/persist/PersistProcessorTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/persist/PersistProcessorTest.java 2016-02-25 21:39:12 UTC (rev 9301)
+++ trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/persist/PersistProcessorTest.java 2016-02-25 21:48:25 UTC (rev 9302)
@@ -9,8 +9,8 @@
import org.fudaa.ctulu.CtuluIOResult;
import org.fudaa.ctulu.CtuluLibFile;
import org.fudaa.dodico.crue.sysdoc.common.DocEntry;
+import static org.junit.Assert.*;
import org.junit.Test;
-import static org.junit.Assert.*;
/**
*
Modified: trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/scan/LinkAndSourceProcessorTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/scan/LinkAndSourceProcessorTest.java 2016-02-25 21:39:12 UTC (rev 9301)
+++ trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/scan/LinkAndSourceProcessorTest.java 2016-02-25 21:48:25 UTC (rev 9302)
@@ -15,8 +15,8 @@
import org.fudaa.ctulu.CtuluLog;
import org.fudaa.dodico.crue.sysdoc.chunck.WriterContentHandler;
import org.fudaa.dodico.crue.sysdoc.scan.LinkAndSourceProcessor.Result;
+import static org.junit.Assert.*;
import org.junit.Test;
-import static org.junit.Assert.*;
import org.xml.sax.InputSource;
/**
Modified: trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/scan/LinkRefCheckerTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/scan/LinkRefCheckerTest.java 2016-02-25 21:39:12 UTC (rev 9301)
+++ trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/scan/LinkRefCheckerTest.java 2016-02-25 21:48:25 UTC (rev 9302)
@@ -12,9 +12,9 @@
import org.fudaa.ctulu.CtuluLogGroup;
import org.fudaa.ctulu.CtuluLogResult;
import org.junit.AfterClass;
+import static org.junit.Assert.*;
+import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.BeforeClass;
-import static org.junit.Assert.*;
/**
*
Modified: trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/scan/TitleProcessorTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/scan/TitleProcessorTest.java 2016-02-25 21:39:12 UTC (rev 9301)
+++ trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/scan/TitleProcessorTest.java 2016-02-25 21:48:25 UTC (rev 9302)
@@ -7,8 +7,8 @@
import java.io.IOException;
import java.util.List;
import org.fudaa.ctulu.CtuluLibFile;
+import static org.junit.Assert.*;
import org.junit.Test;
-import static org.junit.Assert.*;
/**
*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|