You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2011/12/29 13:17:56 UTC
svn commit: r1225505 - in
/incubator/lcf/branches/release-0.4-incubating-branch: CHANGES.txt
connectors/filesystem/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filesystem/FileConnector.java
Author: kwright
Date: Thu Dec 29 12:17:56 2011
New Revision: 1225505
URL: http://svn.apache.org/viewvc?rev=1225505&view=rev
Log:
Fix for CONNECTORS-342. Fix bad html generated by the File System connector.
Modified:
incubator/lcf/branches/release-0.4-incubating-branch/CHANGES.txt
incubator/lcf/branches/release-0.4-incubating-branch/connectors/filesystem/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filesystem/FileConnector.java
Modified: incubator/lcf/branches/release-0.4-incubating-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.4-incubating-branch/CHANGES.txt?rev=1225505&r1=1225504&r2=1225505&view=diff
==============================================================================
--- incubator/lcf/branches/release-0.4-incubating-branch/CHANGES.txt (original)
+++ incubator/lcf/branches/release-0.4-incubating-branch/CHANGES.txt Thu Dec 29 12:17:56 2011
@@ -3,6 +3,9 @@ $Id$
======================= 0.4-dev =====================
+CONNECTORS-342: Fix bad HTML in the File System connector.
+(Karl Wright)
+
CONNECTORS-330: Add infrastructure that permits the database class
to initialize a connection every time it is pulled from the pool. This is
necessary to support HSQLDB, because a number of HSQLDB's states
Modified: incubator/lcf/branches/release-0.4-incubating-branch/connectors/filesystem/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filesystem/FileConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.4-incubating-branch/connectors/filesystem/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filesystem/FileConnector.java?rev=1225505&r1=1225504&r2=1225505&view=diff
==============================================================================
--- incubator/lcf/branches/release-0.4-incubating-branch/connectors/filesystem/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filesystem/FileConnector.java (original)
+++ incubator/lcf/branches/release-0.4-incubating-branch/connectors/filesystem/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filesystem/FileConnector.java Thu Dec 29 12:17:56 2011
@@ -435,7 +435,16 @@ public class FileConnector extends org.a
{
out.print(
"<table class=\"displaytable\">\n"+
-" <tr><td class=\"separator\" colspan=\"3\"><hr/></td></tr>\n"
+" <tr><td class=\"separator\" colspan=\"3\"><hr/></td></tr>\n"+
+" <tr>\n"+
+" <td class=\"description\"><nobr>Paths:</nobr></td>\n"+
+" <td class=\"boxcell\">\n"+
+" <table class=\"formtable\">\n"+
+" <tr class=\"formheaderrow\">\n"+
+" <td class=\"formcolumnheader\"></td>\n"+
+" <td class=\"formcolumnheader\"><nobr>Root path</nobr></td>\n"+
+" <td class=\"formcolumnheader\"><nobr>Rules</nobr></td>\n"+
+" </tr>\n"
);
i = 0;
k = 0;
@@ -446,20 +455,6 @@ public class FileConnector extends org.a
{
String pathDescription = "_"+Integer.toString(k);
String pathOpName = "specop"+pathDescription;
- if (k == 0)
- {
- out.print(
-" <tr>\n"+
-" <td class=\"description\"><nobr>Paths:</nobr></td>\n"+
-" <td class=\"boxcell\">\n"+
-" <table class=\"formtable\">\n"+
-" <tr class=\"formheaderrow\">\n"+
-" <td class=\"formcolumnheader\"></td>\n"+
-" <td class=\"formcolumnheader\"><nobr>Root path</nobr></td>\n"+
-" <td class=\"formcolumnheader\"><nobr>Rules</nobr></td>\n"+
-" </tr>\n"
- );
- }
out.print(
" <tr class=\""+(((k % 2)==0)?"evenformrow":"oddformrow")+"\">\n"+
" <td class=\"formcolumncell\">\n"+