ktlili 2005/06/07 19:42:49 CEST
Modified files:
war/MavenWebClipping MavenWebClipping.jpx
war/src/java/com/jahia/clipping/Bean ClipperBean.java
UrlBean.java
war/src/java/com/jahia/clipping/XML ClipperDocument.java
ElementBuilder.java
war/src/java/com/jahia/clipping/struts EditAction.java
ManageAction.java
PreviewAction.java
TestClipperAction.java
war/src/java/com/jahia/clipping/util StringUtilities.java
war/src/java/com/jahia/clipping/web/Constant WebConstants.java
war/src/java/com/jahia/clipping/web HTMLDocumentBuilder.java
war/src/java/com/jahia/clipping/web/html/Impl
DefaultHTMLTransformer.java
StringTreeExtractorFilter.java
war/src/java/com/jahia/clipping/web/html/Impl/HTMLParser
HTMLParserTransformer.java
war/src/java/com/jahia/clipping/web/html/Impl/JDom
JDomHTMLTransformer.java
war/src/java/com/jahia/clipping/web/html/Impl/Neko
DomHTMLTransformer.java
war/src/java/com/jahia/clipping/web/html/Impl/Neko/Filter
InputParamRecorderFilter.java
war/src/webapp/jsp/actions browseAction.jsp
descriptionAction.jsp
war/src/webapp/jsp/templates formTemplate.jsp
Log:
Fix bug template Browse
Optimize template Browse
Optimize StringFilter
Fix Bug String Filter
Fix Bug Select Manually Filter
Optimitze StringUtilities getDistance method
Revision Changes Path
1.7 +2 -1 webclip_builder/war/MavenWebClipping/MavenWebClipping.jpx
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/MavenWebClipping/MavenWebClipping.jpx.diff?r1=1.6&r2=1.7&f=h
1.4 +3 -3
webclip_builder/war/src/java/com/jahia/clipping/Bean/ClipperBean.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/Bean/ClipperBean.java.diff?r1=1.3&r2=1.4&f=h
1.3 +3 -3
webclip_builder/war/src/java/com/jahia/clipping/Bean/UrlBean.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/Bean/UrlBean.java.diff?r1=1.2&r2=1.3&f=h
1.3 +1 -1
webclip_builder/war/src/java/com/jahia/clipping/XML/ClipperDocument.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/XML/ClipperDocument.java.diff?r1=1.2&r2=1.3&f=h
1.3 +1 -1
webclip_builder/war/src/java/com/jahia/clipping/XML/ElementBuilder.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/XML/ElementBuilder.java.diff?r1=1.2&r2=1.3&f=h
1.2 +1 -1
webclip_builder/war/src/java/com/jahia/clipping/struts/EditAction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/struts/EditAction.java.diff?r1=1.1&r2=1.2&f=h
1.4 +2 -2
webclip_builder/war/src/java/com/jahia/clipping/struts/ManageAction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/struts/ManageAction.java.diff?r1=1.3&r2=1.4&f=h
1.4 +1 -1
webclip_builder/war/src/java/com/jahia/clipping/struts/PreviewAction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/struts/PreviewAction.java.diff?r1=1.3&r2=1.4&f=h
1.5 +1 -1
webclip_builder/war/src/java/com/jahia/clipping/struts/TestClipperAction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/struts/TestClipperAction.java.diff?r1=1.4&r2=1.5&f=h
1.3 +4 -2
webclip_builder/war/src/java/com/jahia/clipping/util/StringUtilities.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/util/StringUtilities.java.diff?r1=1.2&r2=1.3&f=h
1.2 +1 -1
webclip_builder/war/src/java/com/jahia/clipping/web/Constant/WebConstants.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/web/Constant/WebConstants.java.diff?r1=1.1&r2=1.2&f=h
1.5 +2 -2
webclip_builder/war/src/java/com/jahia/clipping/web/HTMLDocumentBuilder.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/web/HTMLDocumentBuilder.java.diff?r1=1.4&r2=1.5&f=h
1.7 +6 -6
webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/DefaultHTMLTransformer.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/DefaultHTMLTransformer.java.diff?r1=1.6&r2=1.7&f=h
1.4 +1 -1
webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/HTMLParser/HTMLParserTransformer.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/HTMLParser/HTMLParserTransformer.java.diff?r1=1.3&r2=1.4&f=h
1.6 +3 -3
webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/JDom/JDomHTMLTransformer.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/JDom/JDomHTMLTransformer.java.diff?r1=1.5&r2=1.6&f=h
1.4 +1 -1
webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/Neko/DomHTMLTransformer.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/Neko/DomHTMLTransformer.java.diff?r1=1.3&r2=1.4&f=h
1.2 +1 -1
webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/Neko/Filter/InputParamRecorderFilter.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/Neko/Filter/InputParamRecorderFilter.java.diff?r1=1.1&r2=1.2&f=h
1.4 +105 -47
webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/StringTreeExtractorFilter.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/StringTreeExtractorFilter.java.diff?r1=1.3&r2=1.4&f=h
1.3 +19 -12
webclip_builder/war/src/webapp/jsp/actions/browseAction.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/webapp/jsp/actions/browseAction.jsp.diff?r1=1.2&r2=1.3&f=h
1.3 +41 -30
webclip_builder/war/src/webapp/jsp/actions/descriptionAction.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/webapp/jsp/actions/descriptionAction.jsp.diff?r1=1.2&r2=1.3&f=h
1.2 +1 -1
webclip_builder/war/src/webapp/jsp/templates/formTemplate.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/webapp/jsp/templates/formTemplate.jsp.diff?r1=1.1&r2=1.2&f=h
Index: MavenWebClipping.jpx
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/MavenWebClipping/MavenWebClipping.jpx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MavenWebClipping.jpx 6 Jun 2005 17:04:21 -0000 1.6
+++ MavenWebClipping.jpx 7 Jun 2005 17:42:45 -0000 1.7
@@ -68,13 +68,14 @@
<property category="sys" name="IncludeTestPath" value="1"/>
<property category="sys" name="InstanceVisibility" value="2"/>
<property category="sys" name="JDK" value="java version 1.5.0_02-b09"/>
- <property category="sys" name="JvmVersion" value="1.2"/>
+ <property category="sys" name="JvmVersion" value="1.5"/>
<property category="sys" name="LastTag" value="0"/>
<property category="sys" name="Libraries"
value="MavenAutoUpdated;WebClipper;Tomcat 4.1 Servlet;Servlet;Struts;JUnit"/>
<property category="sys" name="MakeStable" value="0"/>
<property category="sys" name="OutPath" value="classes"/>
<property category="sys" name="ShowWarnings" value="0"/>
<property category="sys" name="SourcePath"
value="../src/java;../src/conf;test"/>
+ <property category="sys" name="SourceVersion" value="1.5"/>
<property category="sys" name="TestPath" value="test"/>
<property category="sys" name="Title" value=""/>
<property category="sys" name="TitleLabel" value="Title:"/>
Index: ClipperBean.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/Bean/ClipperBean.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ClipperBean.java 14 Mar 2005 16:29:33 -0000 1.3
+++ ClipperBean.java 7 Jun 2005 17:42:45 -0000 1.4
@@ -225,10 +225,10 @@
public UrlBean getUrlBean(int pos) {
UrlBean uBean = (UrlBean) this.getUrlListBean().get(pos);
if (uBean == null) {
- logger.error("[ UrlBean at position " + pos + " not
founded ]");
+ logger.error("[ UrlBean at position " + pos + " not
found ]");
}
else {
- logger.debug("[ UrlBean at position " + pos + "
founded ]");
+ logger.debug("[ UrlBean at position " + pos + " found
]");
}
return uBean;
}
@@ -645,7 +645,7 @@
String name = parser.getQueryName(i, j);
String value = parser.getQueryDefault(i, j);
String visibility =
parser.getQueryVisibility(i, j);
- logger.debug("[ Query param whith name " + name
+ " and value " + value + " founded ]");
+ logger.debug("[ Query param whith name " + name
+ " and value " + value + " found ]");
uBean.addQueryParameter(name, value);
}
Index: UrlBean.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/Bean/UrlBean.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UrlBean.java 6 Jun 2005 13:14:10 -0000 1.2
+++ UrlBean.java 7 Jun 2005 17:42:45 -0000 1.3
@@ -377,7 +377,7 @@
return paramAndValue;
}
}
- logger.debug("[Form param Bean " + mapping + " not founded]");
+ logger.debug("[Form param Bean " + mapping + " not found]");
return null;
}
@@ -488,7 +488,7 @@
return paramAndValue;
}
}
- logger.debug("[Form param Bean " + name + " not founded]");
+ logger.debug("[Form param Bean " + name + " not found]");
return null;
}
@@ -509,7 +509,7 @@
return paramAndValue;
}
}
- logger.debug("[Query param Bean " + param + " not founded]");
+ logger.debug("[Query param Bean " + param + " not found]");
return null;
}
Index: ClipperDocument.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/XML/ClipperDocument.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ClipperDocument.java 14 Mar 2005 16:29:33 -0000 1.2
+++ ClipperDocument.java 7 Jun 2005 17:42:45 -0000 1.3
@@ -111,7 +111,7 @@
}
else {
- logger.error("[Parser class not founded]");
+ logger.error("[Parser class not found]");
}
}
Index: ElementBuilder.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/XML/ElementBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ElementBuilder.java 14 Mar 2005 16:29:33 -0000 1.2
+++ ElementBuilder.java 7 Jun 2005 17:42:45 -0000 1.3
@@ -129,7 +129,7 @@
urlEle.addContent(valueEle);
//FormParam
- urlEle.addContent(new Comment("Paramters founded in forms
tag"));
+ urlEle.addContent(new Comment("Paramters found in forms tag"));
Element formParam = new Element(label.getString("FORMPARAM"));
urlEle.addContent(formParam);
Index: EditAction.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/struts/EditAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EditAction.java 3 Mar 2005 18:03:53 -0000 1.1
+++ EditAction.java 7 Jun 2005 17:42:46 -0000 1.2
@@ -219,7 +219,7 @@
for (int i = 0; i < fBeanList.size(); i++) {
FormParamBean fBean = (FormParamBean) fBeanList.get(i);
String mapping = ((String[]) params.get("mapping"))[i];
- //logger.debug("[ form param founded: name," + name + "
mapping " + mapping + "]");
+ //logger.debug("[ form param found: name," + name + "
mapping " + mapping + "]");
fBean.setMapping(mapping);
}
Index: ManageAction.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/struts/ManageAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ManageAction.java 14 Mar 2005 16:29:34 -0000 1.3
+++ ManageAction.java 7 Jun 2005 17:42:46 -0000 1.4
@@ -306,7 +306,7 @@
}
for (int i = 0; i < clipperList.size(); i++) {
ClipperBean cBean = (ClipperBean) clipperList.get(i);
- logger.debug("[ Founded clipper with name " +
cBean.getName() + " ]");
+ logger.debug("[ Found clipper with name " +
cBean.getName() + " ]");
//Build the clipper
getClippersManagerBean(request).addClipper(cBean.getName(), cBean);
@@ -337,7 +337,7 @@
for (int i = 0; i < clippersDescriptor.length; i++) {
File f = clippersDescriptor[i];
String name = f.getName();
- logger.debug("[ Founded clipper with name " + name + "
]");
+ logger.debug("[ Found clipper with name " + name + "
]");
//Build the clipper
ClipperBean cBean = new
ClipperBean(f.getAbsolutePath());
getClippersManagerBean(request).addClipper(cBean.getName(), cBean);
Index: PreviewAction.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/struts/PreviewAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PreviewAction.java 6 Jun 2005 11:34:53 -0000 1.3
+++ PreviewAction.java 7 Jun 2005 17:42:46 -0000 1.4
@@ -95,7 +95,7 @@
*/
public ActionForward init(ActionMapping actionMapping, ActionForm
actionForm, HttpServletRequest httpServletRequest, HttpServletResponse
httpServletResponse) {
try {
- logger.debug("[view method called]");
+ logger.debug("[view method called]");
super.init(actionMapping, actionForm,
httpServletRequest,httpServletResponse);
PreviewForm previewForm = (PreviewForm) actionForm;
previewForm.setFrom("wizard");
Index: TestClipperAction.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/struts/TestClipperAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestClipperAction.java 6 Jun 2005 11:34:53 -0000 1.4
+++ TestClipperAction.java 7 Jun 2005 17:42:46 -0000 1.5
@@ -195,7 +195,7 @@
logger.debug("[ Query param " +
qBean.getName() + " is set whith value " + value + " ]");
}
else {
- logger.error("[ No value founded for
Query param " + qBean.getName() + ".]");
+ logger.error("[ No value found for
Query param " + qBean.getName() + ".]");
}
}
}
Index: StringUtilities.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/util/StringUtilities.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StringUtilities.java 6 Jun 2005 17:04:22 -0000 1.2
+++ StringUtilities.java 7 Jun 2005 17:42:46 -0000 1.3
@@ -1,4 +1,5 @@
package com.jahia.clipping.util;
+import org.apache.commons.lang.StringUtils;
/**
* Utilities for String
@@ -47,7 +48,8 @@
[EMAIL PROTECTED] Description of the Returned Value
*/
public static int distance(String s, String t) {
- int d[][];
+ return StringUtils.getLevenshteinDistance(s,t);
+ /*int d[][];
// matrix
int n;
// length of s
@@ -110,7 +112,7 @@
}
// Step 7
- return d[n][m];
+ return d[n][m];*/
}
Index: WebConstants.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/web/Constant/WebConstants.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WebConstants.java 3 Mar 2005 18:03:55 -0000 1.1
+++ WebConstants.java 7 Jun 2005 17:42:46 -0000 1.2
@@ -13,7 +13,7 @@
public static Boolean FALSE = Boolean.FALSE;
//possible value of type atrtibute of input element
- public static String NO_VALUE_FOUNDED = "no_value_Founded";
+ public static String NO_VALUE_FOUNDED = "no_value_Found";
public static String TYPE_TEXT = "text";
public static String TYPE_PASSWORD = "password";
public static String TYPE_CHECKBOX = "checkbox";
Index: HTMLDocumentBuilder.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/web/HTMLDocumentBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HTMLDocumentBuilder.java 14 Mar 2005 16:29:34 -0000 1.4
+++ HTMLDocumentBuilder.java 7 Jun 2005 17:42:47 -0000 1.5
@@ -176,7 +176,7 @@
}
default:
{
- logger.debug("[ No Client founded: " +
typeClient_ + " ]");
+ logger.debug("[ No Client found: " +
typeClient_ + " ]");
}
}
}
@@ -231,7 +231,7 @@
default:
{
- logger.error("[ No parser founded:" +
typeParser_ + " ]");
+ logger.error("[ No parser found:" +
typeParser_ + " ]");
}
}
Index: DefaultHTMLTransformer.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/DefaultHTMLTransformer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultHTMLTransformer.java 6 Jun 2005 17:04:22 -0000 1.6
+++ DefaultHTMLTransformer.java 7 Jun 2005 17:42:47 -0000 1.7
@@ -138,16 +138,16 @@
[EMAIL PROTECTED] Exception Description of Exception
*/
public String getRewritedHrefValue(String href) throws Exception {
- //test if its a relatif url.
- if (URLUtilities.isRelatif(href)) {
+ //test an url.
+ // if (URLUtilities.isRelatif(href) || (href!=null &&
href.substring(4).equalsIgnoreCase("http"))) {
href =
URLUtilities.getHrefAbsoluteValue(getUrlBean().getUrlValue(), href);
String[] params = {href};
UrlEncoder encoder = new
UrlEncoder(getHttpServletRequest(),getHttpServletResponse(), "browse", params);
return encoder.getEncodedUrl();
- }
+ /*}
else {
return href;
- }
+ }*/
}
@@ -289,7 +289,7 @@
* Assert that value is not null
*
[EMAIL PROTECTED] value string null or not
- [EMAIL PROTECTED] value if value is not null else
"no_value_founded"
+ [EMAIL PROTECTED] value if value is not null else
"no_value_found"
*/
public String notNullValue(String value) {
if (value == null) {
@@ -307,7 +307,7 @@
* submit,reset,file,image,...
*/
public boolean allowedInput(String type) {
- //logger.debug("[Input element founded whith type: " + type + "
]");
+ //logger.debug("[Input element found whith type: " + type + "
]");
if (type != null) {
for (int j = 0; j < notPermittedType.length; j++) {
if (type.equalsIgnoreCase(notPermittedType[j]))
{
Index: StringTreeExtractorFilter.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/StringTreeExtractorFilter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StringTreeExtractorFilter.java 6 Jun 2005 17:04:22 -0000 1.3
+++ StringTreeExtractorFilter.java 7 Jun 2005 17:42:47 -0000 1.4
@@ -1,21 +1,17 @@
package com.jahia.clipping.web.html.Impl;
import com.jahia.clipping.web.html.*;
-import java.io.*;
import java.util.*;
-import java.io.*;
import com.jahia.clipping.util.*;
-import javax.swing.text.html.HTML;
-import com.jahia.clipping.web.html.Impl.*;
import com.jahia.clipping.util.*;
-import org.apache.commons.lang.*;
import org.htmlparser.*;
import org.htmlparser.*;
import org.htmlparser.*;
import org.htmlparser.util.*;
import org.htmlparser.*;
+import org.htmlparser.tags.*;
import org.htmlparser.visitors.*;
-import org.jdom.Element;
+import javax.swing.text.html.HTML;
/**
* JDom implementation of HTMLFilter
@@ -192,7 +188,10 @@
ex.printStackTrace();
logger.error("buldKeySelectedPart error " +
ex.getMessage());
}
- setKeyPart(visitor.getBuildedKey());
+
+ String key = visitor.getBuildedKey();
+ key=refactorKey(key);
+ setKeyPart(key);
}
@@ -244,8 +243,8 @@
[EMAIL PROTECTED] bestMatch Description of Parameter
[EMAIL PROTECTED] The AllElementsFromBestMatch value
*/
- private ArrayList getAllElementsFromBestMatch(String docString, String
bestMatch) {
- ArrayList tagList = new ArrayList();
+ private Hashtable getAllTagsFromBestMatch(String docString, String
bestMatch) {
+ Hashtable tagList = new Hashtable();
//Retrieve the first elemeent
int indexBestMatch = docString.indexOf(bestMatch);
@@ -255,12 +254,11 @@
// add the first ele to the list
if (firtsTag == null) {
- logger.error("[No element whith key " + key + "
founded]");
+ logger.error("[No element whith key " + key + "
found]");
}
else {
- logger.debug("[Element --" + firtsTag.getTagName() +
"-- whith key " + key +
- " added]");
- tagList.add(firtsTag);
+ logger.debug("[Element --" + firtsTag.getTagName() +
"-- whith key " + key + " added]");
+ tagList.put(key, firtsTag);
}
//Retreive and add of the rest of element
@@ -277,11 +275,11 @@
//add element
Tag currentEle = getTagFromStringKey(newKey);
if (currentEle == null) {
- logger.error("[No element whith key " + newKey
+ " founded]");
+ logger.error("[No element whith key " + newKey
+ " found]");
}
else {
logger.debug("[Element <" +
currentEle.getTagName() + "> whith key " + newKey + " added]");
- tagList.add(currentEle);
+ tagList.put(newKey, currentEle);
}
@@ -302,6 +300,7 @@
*/
private String refactorKey(String originalSelectedPart) {
String realSelectedPart = originalSelectedPart;
+ realSelectedPart =
originalSelectedPart.replaceAll(":TBODY","");
return realSelectedPart;
}
@@ -328,7 +327,7 @@
private void processFiltering(HTMLDocument htmlDoc) {
//build key of the html document
String charSet = "";
- Parser parser =
Parser.createParser(htmlDoc.getOriginalDocumentAsString(), charSet);
+ Parser parser =
Parser.createParser(htmlDoc.getTransformedDocumentAsString(), charSet);
BuildKeyVisitor visitor = new BuildKeyVisitor();
String docString = "";
try {
@@ -351,6 +350,7 @@
//build hashtable
//Build the supposed selected part
+
BuildSelectedPartVisitor bspv = new
BuildSelectedPartVisitor(docString, bestMatch);
try {
parser.reset();
@@ -363,8 +363,9 @@
logger.error("Selectet part error " + ex.getMessage());
}
+ String selectedPart = bspv.getSelectedPart();
//Rebuild the document
- setSelectedPart(bspv.getSelectedPart());
+ setSelectedPart("<div class=\""+CssUtilities.HTML_CLASS+"
"+CssUtilities.BODY_CLASS+" \">"+selectedPart+"\n </div>");
}
@@ -430,9 +431,9 @@
*/
public class BuildSelectedPartVisitor extends NodeVisitor {
private String key = "";
- private String selectedPart = "<p> empty </p>";
- private boolean findOne = false;
- private List tagList;
+ private String selectedPart = "";
+ private Hashtable tagHash;
+ private Set addedTagSet = new HashSet();
/**
@@ -443,7 +444,8 @@
*/
public BuildSelectedPartVisitor(String docString, String
bestMatch) {
key = "";
- tagList = getAllElementsFromBestMatch(docString,
bestMatch);
+ tagHash = getAllTagsFromBestMatch(docString, bestMatch);
+
}
@@ -473,32 +475,14 @@
[EMAIL PROTECTED] tag Description of Parameter
*/
public void visitTag(Tag tag) {
- if (!findOne) {
- try {
- key = key + ":" + tag.getTagName();
- //logger.debug("key of the current tag
is: " + key);
- // test if the tag is in the
- Tag result = getTagFromStringKey(key);
- Tag cloneTag = (Tag) tag.clone();
- logger.debug(cloneTag.getTagName());
- if (result == null) {
- // remoce text
- logger.debug("No selected tag");
- //cloneTag.setText("");
-
- }
- else {
- findOne = true;
- selectedPart = selectedPart +
cloneTag.toHtml();
- logger.debug("Selected tag");
- }
- }
- catch (CloneNotSupportedException ex) {
- ex.printStackTrace();
- logger.error("Enable to clone tag: " +
- tag.getTagName());
- }
+ logger.debug(tag.getTagName());
+ //add style and script
+ if (tag instanceof StyleTag || tag instanceof
ScriptTag) {
+ logger.debug("Style or Script tag added");
+ selectedPart = selectedPart + tag.toHtml();
}
+ renderSelectedTag(tag);
+
}
@@ -508,7 +492,81 @@
[EMAIL PROTECTED] string Description of Parameter
*/
public void visitStringNode(Text string) {
- //logger.debug(string);
+ // do nothing
+ }
+
+
+ /**
+ * Description of the Method
+ *
+ [EMAIL PROTECTED] tag Description of Parameter
+ */
+ private void renderSelectedTag(Tag tag) {
+ // add the selected tags
+ key = key + ":" + tag.getTagName();
+ Tag currentTag = (Tag) tagHash.get(key);
+ if (currentTag != null) {
+ logger.debug("This tag is selected");
+ addedTagSet.add(currentTag);
+ Node pNode = currentTag.getParent();
+ if (addedTagSet.contains((Tag) pNode)) {
+ logger.debug("This tag is already
rendered");
+ return;
+ }
+ //Tag is selected
+ logger.debug("Tag added");
+ updateCssHeritance(currentTag, pNode);
+ selectedPart = selectedPart +
currentTag.toHtml();
+
+ }
+ }
+
+
+ /**
+ * Description of the Method
+ *
+ [EMAIL PROTECTED] tag Description of Parameter
+ [EMAIL PROTECTED] parentNode Description of Parameter
+ */
+ private void updateCssHeritance(Tag tag, Node parentNode) {
+ if (parentNode instanceof Tag) {
+ Tag pTag = (Tag) parentNode;
+ Node ppNode = parentNode.getParent();
+ if (ppNode != null) {
+ updateCssHeritance(pTag, ppNode);
+ }
+ //Style att
+ String pStyleAtt =
pTag.getAttribute(HTML.Attribute.STYLE.toString());
+ if (pStyleAtt != null &&
!pStyleAtt.equalsIgnoreCase("")) {
+ logger.debug("update style att");
+ String styleAtt =
tag.getAttribute(HTML.Attribute.STYLE.toString());
+ if (styleAtt == null) {
+
tag.setAttribute(HTML.Attribute.STYLE.toString(), pStyleAtt);
+ }
+ else {
+
tag.setAttribute(HTML.Attribute.STYLE.toString(), styleAtt + " " + pStyleAtt);
+ }
+
+ }
+
+ //class att
+ String pClassAtt =
pTag.getAttribute(HTML.Attribute.CLASS.toString());
+ if (pClassAtt != null &&
!pClassAtt.equalsIgnoreCase("")) {
+ logger.debug("update class att");
+ String classAtt =
tag.getAttribute(HTML.Attribute.CLASS.toString());
+ if (classAtt == null) {
+
tag.setAttribute(HTML.Attribute.CLASS.toString(), pClassAtt);
+
+ }
+ else {
+
tag.setAttribute(HTML.Attribute.CLASS.toString(), classAtt + " " + pClassAtt);
+ }
+ }
+
+ }
+ else {
+ logger.debug("parent node is not a tag");
+ }
}
}
Index: HTMLParserTransformer.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/HTMLParser/HTMLParserTransformer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- HTMLParserTransformer.java 14 Mar 2005 16:29:35 -0000 1.3
+++ HTMLParserTransformer.java 7 Jun 2005 17:42:47 -0000 1.4
@@ -150,7 +150,7 @@
private Node processInputTag(InputTag tag) throws WebClippingException {
try {
String type =
tag.getAttribute(HTML.Attribute.TYPE.toString());
- //logger.debug("[Input element founded whith type: " +
type + " ]");
+ //logger.debug("[Input element found whith type: " +
type + " ]");
// Test that the type is a "valid" one
if (type != null) {
Index: JDomHTMLTransformer.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/JDom/JDomHTMLTransformer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JDomHTMLTransformer.java 6 Jun 2005 13:14:11 -0000 1.5
+++ JDomHTMLTransformer.java 7 Jun 2005 17:42:47 -0000 1.6
@@ -231,12 +231,12 @@
while (i.hasNext()) {
Element ele = (Element) i.next();
if (ele.getName().equalsIgnoreCase(tag)) {
- logger.debug("[" + tag + " Element founded]");
+ logger.debug("[" + tag + " Element found]");
return ele;
}
logger.debug("[Parent Element is " + ele.getName() + "
]");
}
- logger.error("[" + tag + " Element not founded]");
+ logger.error("[" + tag + " Element not found]");
return null;
}
@@ -820,7 +820,7 @@
try {
String type = ele.getAttributeValue(
HTML.Attribute.TYPE.toString());
- //logger.debug("[Input element founded whith type: " +
type + " ]");
+ //logger.debug("[Input element found whith type: " +
type + " ]");
// Test that the type is a "valid" one
if (type != null) {
Index: DomHTMLTransformer.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/Neko/DomHTMLTransformer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DomHTMLTransformer.java 8 Mar 2005 17:29:46 -0000 1.3
+++ DomHTMLTransformer.java 7 Jun 2005 17:42:48 -0000 1.4
@@ -397,7 +397,7 @@
Element ele = (Element) inputList.item(i);
String type = ele.getAttribute(
HTML.Attribute.TYPE.toString());
- //logger.debug("[Input element founded whith
type: " + type + " ]");
+ //logger.debug("[Input element found whith
type: " + type + " ]");
// Test that the type is a "valid" one
if (type != null) {
Index: InputParamRecorderFilter.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/Neko/Filter/InputParamRecorderFilter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InputParamRecorderFilter.java 3 Mar 2005 18:03:58 -0000 1.1
+++ InputParamRecorderFilter.java 7 Jun 2005 17:42:48 -0000 1.2
@@ -71,7 +71,7 @@
//input Element
if (eleName.equalsIgnoreCase(HTML.Tag.INPUT.toString())) {
String type = attrs.getValue(HTML.Attribute.TYPE.toString());
- //logger.debug("[Input element founded whith type: " + type + " ]");
+ //logger.debug("[Input element found whith type: " + type + " ]");
// Test that the type is a "valid" one
if (type != null) {
Index: browseAction.jsp
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/webapp/jsp/actions/browseAction.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- browseAction.jsp 6 Jun 2005 11:34:55 -0000 1.2
+++ browseAction.jsp 7 Jun 2005 17:42:48 -0000 1.3
@@ -21,38 +21,45 @@
<html:submit property="webClippingAction">
<bean:message key="browse.resetRecord"/>
</html:submit>
- <!-- Start recording/Remove-->
+
<logic:equal name="recording" property="statut" value="0">
+ <!-- Not recording-->
+ <!-- Start -->
<html:submit property="webClippingAction">
<bean:message key="browse.startRecord"/>
</html:submit>
+ <!-- Remove last -->
<html:submit property="webClippingAction" disabled="true">
<bean:message key="browse.removeLast"/>
</html:submit>
+ <!-- Replay -->
+ <html:submit property="webClippingAction" disabled="true">
+ <bean:message key="browse.replay"/>
+ </html:submit>
+ <!-- Next -->
+ <html:submit property="webClippingAction" disabled="true">
+ <bean:message key="button.next"/>
+ </html:submit>
</logic:equal>
<logic:equal name="recording" property="statut" value="1">
+ <!-- Recording-->
+ <!-- Stop -->
<html:submit property="webClippingAction">
<bean:message key="browse.stopRecord"/>
</html:submit>
+ <!-- Remove Last -->
<html:submit property="webClippingAction" disabled="false">
<bean:message key="browse.removeLast"/>
</html:submit>
- </logic:equal>
- <!-- Replay sequence -->
- <logic:equal name="recording" property="statut" value="0">
+ <!-- Replay -->
<html:submit property="webClippingAction" disabled="false">
<bean:message key="browse.replay"/>
</html:submit>
- </logic:equal>
- <logic:equal name="recording" property="statut" value="1">
+ <!-- Next -->
<html:submit property="webClippingAction" disabled="false">
- <bean:message key="browse.replay"/>
+ <bean:message key="button.next"/>
</html:submit>
</logic:equal>
- <!-- Next -->
- <html:submit property="webClippingAction">
- <bean:message key="button.next"/>
- </html:submit>
</td>
</tr>
</table>
@@ -116,7 +123,7 @@
</logic:messagesPresent>
</html:form>
<!-- HTML page -->
- <table class="webClipping" style="position: relative; ">
+ <table style="position: relative; ">
<tr>
<td>
<bean:write name="browseForm" property="bodyContent" filter="false"/>
Index: descriptionAction.jsp
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/webapp/jsp/actions/descriptionAction.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- descriptionAction.jsp 8 Mar 2005 17:29:47 -0000 1.2
+++ descriptionAction.jsp 7 Jun 2005 17:42:48 -0000 1.3
@@ -1,9 +1,9 @@
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
-<%@ taglib uri="/WEB-INF/struts-nested.tld" prefix="nested" %>
-<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
-<%@ taglib uri="/WEB-INF/struts-template.tld" prefix="template" %>
-<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
+<[EMAIL PROTECTED] uri="/WEB-INF/struts-tiles.tld" prefix="tiles"%>
+<[EMAIL PROTECTED] uri="/WEB-INF/struts-nested.tld" prefix="nested"%>
+<[EMAIL PROTECTED] uri="/WEB-INF/struts-logic.tld" prefix="logic"%>
+<[EMAIL PROTECTED] uri="/WEB-INF/struts-template.tld" prefix="template"%>
+<[EMAIL PROTECTED] uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
+<[EMAIL PROTECTED] uri="/WEB-INF/struts-html.tld" prefix="html"%>
<html:form action="beginExtractWizard" method="post">
<table align="center" class="principal" width="100%" border="1">
<!-- Header -->
@@ -24,9 +24,6 @@
<bean:message key="button.reset"/>
</html:submit>
<html:submit property="webClippingAction">
- <bean:message key="description.button.configure"/>
- </html:submit>
- <html:submit property="webClippingAction">
<bean:message key="button.next"/>
</html:submit>
</td>
@@ -51,9 +48,7 @@
<td>
<UL>
<html:messages id="error">
- <LI>
- <bean:write name="error"/>
- </LI>
+ <LI> <bean:write name="error"/> </LI>
</html:messages>
</UL>
</td>
@@ -68,27 +63,43 @@
<!-- Main purpose of the page-->
<table>
<tr>
- <td>
- <p>
- Name and default local title
- </p>
+ <!-- Name -->
+
+ <tr>
+ <td class="topmenugreen bold waBG">Name and default local title</td>
+ <td class="leftlevel2 waInput">
<html:text property="webClippingName"/>
- <p>
- Description
- </p>
- <html:textarea property="webClippingDescription" rows="12"
cols="20"/>
- <p>
- URL to Clip
- </p>
- <html:text property="webClippingTargetUrl"/>
- <p>
- Connection Time Out (in sec)
- </p>
- <p>
- <html:text property="webClippingConnectionTimeOut" size="7"/>
- </p>
+ </td>
+ </tr>
+ <!-- Description -->
+ <tr>
+ <td class="topmenugreen bold waBG">Description</td>
+ <td class="leftlevel2 waInput">
+ <html:textarea property="webClippingDescription" rows="7"
cols="20"/>
+ </td>
+ </tr>
+ <!-- Url -->
+ <tr>
+ <td class="topmenugreen bold waBG">Enter absolute url</td>
+ <td class="leftlevel2 waInput">
+ <logic:present name="browseForm">
+ <html:text property="webClippingTargetUrl" disabled="true"
size="7"/>
+ </logic:present>
+ <logic:notPresent name="browseForm">
+ <bean:write name="descriptionClipperForm"
property="webClippingTargetUrl"/>
+ </logic:notPresent>
+ </td>
+ </tr>
+ <!-- Connection -->
+ <tr>
+ <td class="topmenugreen bold waBG">Connection Time Out (in sec)</td>
+ <td class="leftlevel2 waInput">
+ <html:text property="webClippingConnectionTimeOut" size="7"/>
</td>
</tr>
</table>
+ <html:link action="/configure.do?webClippingAction=initManager">
+ <bean:message key="description.button.configure"/>
+ </html:link>
</table>
</html:form>
Index: formTemplate.jsp
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/webapp/jsp/templates/formTemplate.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- formTemplate.jsp 3 Mar 2005 18:04:12 -0000 1.1
+++ formTemplate.jsp 7 Jun 2005 17:42:48 -0000 1.2
@@ -16,7 +16,7 @@
<html:base/>
</head>
<body class="backcolor2">
- <table bgcolor="white" align="center" width="75%">
+ <table bgcolor="white" align="center" width="100%">
<!-- Main table-->
<!-- Wizard header-->
<tr>
