ktlili 2005/07/11 11:15:00 CEST
Modified files:
war/src/java/com/jahia/clipping/struts BrowseAction.java
WebBrowserAction.java
war/src/java/com/jahia/clipping/util HashUtilities.java
war/src/java/com/jahia/clipping/web/html ExtractorFilter.java
war/src/java/com/jahia/clipping/web/html/Impl
ChewExtractorFilter.java
DefaultHTMLTransformer.java
war/src/java/com/jahia/clipping/web/html/Impl/HTMLParser
ChewBuilderVisitor.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/http/impl
HTMLUnitProcessor.java
Log:
- Fix browse bug (during test step)
- commit before package reactoring
- Refactor hash build for chew mode
Revision Changes Path
1.15 +1 -0
webclip_builder/war/src/java/com/jahia/clipping/struts/BrowseAction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/struts/BrowseAction.java.diff?r1=1.14&r2=1.15&f=h
1.15 +0 -1
webclip_builder/war/src/java/com/jahia/clipping/struts/WebBrowserAction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/struts/WebBrowserAction.java.diff?r1=1.14&r2=1.15&f=h
1.7 +8 -2
webclip_builder/war/src/java/com/jahia/clipping/util/HashUtilities.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/util/HashUtilities.java.diff?r1=1.6&r2=1.7&f=h
1.5 +1 -1
webclip_builder/war/src/java/com/jahia/clipping/web/html/ExtractorFilter.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/web/html/ExtractorFilter.java.diff?r1=1.4&r2=1.5&f=h
1.11 +12 -31
webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/ChewExtractorFilter.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/ChewExtractorFilter.java.diff?r1=1.10&r2=1.11&f=h
1.23 +5 -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.22&r2=1.23&f=h
1.5 +1 -1
webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/HTMLParser/ChewBuilderVisitor.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/HTMLParser/ChewBuilderVisitor.java.diff?r1=1.4&r2=1.5&f=h
1.14 +1 -1
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.13&r2=1.14&f=h
1.18 +17 -7
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.17&r2=1.18&f=h
1.15 +0 -5
webclip_builder/war/src/java/com/jahia/clipping/web/http/impl/HTMLUnitProcessor.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/web/http/impl/HTMLUnitProcessor.java.diff?r1=1.14&r2=1.15&f=h
Index: BrowseAction.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/struts/BrowseAction.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- BrowseAction.java 6 Jul 2005 10:48:56 -0000 1.14
+++ BrowseAction.java 11 Jul 2005 09:14:58 -0000 1.15
@@ -280,6 +280,7 @@
//Get the url from the ClipperBean object
ClipperBean bean = getClipperBean(httpServletRequest);
+ bean.clearRecordedUrl();
//Handing error
if (bean == null) {
Index: WebBrowserAction.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/struts/WebBrowserAction.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- WebBrowserAction.java 7 Jul 2005 08:37:21 -0000 1.14
+++ WebBrowserAction.java 11 Jul 2005 09:14:58 -0000 1.15
@@ -464,7 +464,6 @@
logger.debug("[Set Session Attributes]");
HttpSession session = httpServletRequest.getSession();
session.setAttribute(com.jahia.clipping.web.Constant.WebConstants.RECORDING,
rc);
-
session.setAttribute(com.jahia.clipping.struts.Util.Constants.URL_MAP, new
URLMap());
removeWebBrowserSimulator(httpServletRequest);
}
Index: HashUtilities.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/util/HashUtilities.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- HashUtilities.java 7 Jul 2005 13:23:39 -0000 1.6
+++ HashUtilities.java 11 Jul 2005 09:14:58 -0000 1.7
@@ -111,11 +111,17 @@
/**
* Description of the Method
*
+ [EMAIL PROTECTED] id Description of Parameter
[EMAIL PROTECTED] position Description of Parameter
[EMAIL PROTECTED] Description of the Returned Value
*/
- public static String buildTableHash(String position) {
- return position;
+ public static String buildTableHash(String id, int position) {
+ if (id == null || id.equalsIgnoreCase("")) {
+ return "" + position;
+ }
+ else {
+ return id;
+ }
}
Index: ExtractorFilter.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/web/html/ExtractorFilter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ExtractorFilter.java 7 Jul 2005 08:37:22 -0000 1.4
+++ ExtractorFilter.java 11 Jul 2005 09:14:58 -0000 1.5
@@ -21,7 +21,7 @@
*
[EMAIL PROTECTED] The KeyPart value
*/
- abstract String getKeyPart();
+ abstract String getKeyPart(String keyName);
/**
Index: ChewExtractorFilter.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/ChewExtractorFilter.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ChewExtractorFilter.java 7 Jul 2005 08:37:23 -0000 1.10
+++ ChewExtractorFilter.java 11 Jul 2005 09:14:59 -0000 1.11
@@ -17,10 +17,12 @@
* Description of the Field
*/
private final String NAME = "ChewExtractorFilter";
+ private final String CHEW_ID = "chewId";
+ private final String CHEW_TAG_TARGET = "chewTag";
/**
* Description of the Field
*/
- public static final String NAME_INPUT_PARAM = "tableId";
+ public static final String NAME_INPUT_PARAM = "chewId";
private static org.apache.log4j.Logger logger =
org.apache.log4j.Logger.getLogger(ChewExtractorFilter.class);
@@ -83,8 +85,8 @@
public String getSelectedPart(HTMLDocument doc) {
String selectedPart = "SelectePart Not found";
String html = doc.getTransformedDocumentAsString();
- String encoded = "";
- Parser parser = Parser.createParser(html, "");
+ String encoded = doc.getCharEncoding();
+ Parser parser = Parser.createParser(html,encoded);
ChewBuilderVisitor visitor = new ChewBuilderVisitor();
try {
logger.debug("build selected part");
@@ -130,17 +132,6 @@
/**
- * Gets the Hash attribute of the ChewExtractorFilter class
- *
- [EMAIL PROTECTED] countTable Description of Parameter
- [EMAIL PROTECTED] The Hash value
- */
- public static String getHashParamNameAndValue(int countTable) {
- return getHashParamName() + "=" + getHashParamValue(countTable);
- }
-
-
- /**
* Gets the HashParamName attribute of the ChewExtractorFilter class
*
[EMAIL PROTECTED] The HashParamName value
@@ -150,16 +141,6 @@
}
- /**
- * Gets the HashParamValue attribute of the ChewExtractorFilter class
- *
- [EMAIL PROTECTED] countTable Description of Parameter
- [EMAIL PROTECTED] The HashParamValue value
- */
- public static String getHashParamValue(int countTable) {
- return "" + countTable;
- }
-
/**
* Description of the Class
@@ -168,7 +149,7 @@
*/
class ChewBuilderVisitor extends VisibilityPositionVisitor {
private int count = 0;
- private int countTable = 0;
+ private int countChewTag = 0;
/**
@@ -213,27 +194,27 @@
[EMAIL PROTECTED] tag Description of Parameter
[EMAIL PROTECTED] Exception Description of Exception
*/
- private void processCssMode(Tag tag) throws Exception {
+ /*private void processCssMode(Tag tag) throws Exception {
if (count == 0) {
setFirstNode(tag);
}
String visibility = "visibility: visible;";
String position = "position:absolute;left:0px;top:0px;";
if (tag instanceof TableTag) {
- if (countTable ==
Integer.parseInt(getKeyPart())) {
+ if (countChewTag ==
Integer.parseInt(getKeyPart())) {
//firstNode = tag;
setStyleAndPosition(tag, visibility,
position);
}
else {
setChildrenVisibilityAndPosition(tag,
count);
}
- countTable++;
+ countChewTag++;
}
else {
setChildrenVisibilityAndPosition(tag, count);
}
count++;
- }
+ }*/
/**
@@ -244,11 +225,11 @@
*/
private void processViewMode(Tag tag) throws Exception {
if (tag instanceof TableTag) {
- if (countTable ==
Integer.parseInt(getKeyPart())) {
+ if (countChewTag ==
Integer.parseInt(getKeyPart())) {
//firstNode = tag;
setFirstNode(tag);
}
- countTable++;
+ countChewTag++;
}
}
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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- DefaultHTMLTransformer.java 7 Jul 2005 08:37:23 -0000 1.22
+++ DefaultHTMLTransformer.java 11 Jul 2005 09:14:59 -0000 1.23
@@ -32,7 +32,7 @@
/**
* Description of the Field
*/
- public static String PARAM_CHEW_ACTION =
"webClippingAction=chewPreview";
+ public static String PARAM_CHEW_WEBCLIPPING_ACTION =
"webClippingAction=chewPreview";
private static org.apache.log4j.Logger logger =
org.apache.log4j.Logger.getLogger(DefaultHTMLTransformer.class);
//private static String[] notEditableParameter =
{WebConstants.TYPE_BUTTON, WebConstants.TYPE_HIDDEN, WebConstants.TYPE_IMAGE,
WebConstants.TYPE_RESET, WebConstants.TYPE_SUBMIT, WebConstants.TYPE_FILE};
private static String[] notEditableParameter =
{WebConstants.TYPE_HIDDEN, WebConstants.TYPE_FILE, WebConstants.TYPE_SUBMIT};
@@ -81,10 +81,9 @@
[EMAIL PROTECTED] countTable Description of Parameter
[EMAIL PROTECTED] The HrefChewLink value
*/
- public String getHrefChewLink(int countTable) {
- String paramWebClipping = PARAM_CHEW_ACTION;
- String paramChewHash =
ChewExtractorFilter.getHashParamNameAndValue(countTable);
- return getHttpServletRequest().getContextPath() +
"/selectPart.do?" + paramWebClipping + "&" + paramChewHash;
+ public String getHrefChewLink(String hash) {
+ String paramWebClipping = PARAM_CHEW_WEBCLIPPING_ACTION;
+ return getHttpServletRequest().getContextPath() +
"/selectPart.do?" + paramWebClipping + "&" +
ChewExtractorFilter.getHashParamName() + "="+hash;
}
@@ -93,7 +92,7 @@
*
[EMAIL PROTECTED] The ImageChewLink value
*/
- public String getImageChewLink() {
+ public String getImageChewLinkSrcValue() {
return getHttpServletRequest().getContextPath() +
"/jsp/images/select.gif";
}
Index: ChewBuilderVisitor.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/HTMLParser/ChewBuilderVisitor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ChewBuilderVisitor.java 23 Jun 2005 16:15:50 -0000 1.4
+++ ChewBuilderVisitor.java 11 Jul 2005 09:14:59 -0000 1.5
@@ -76,7 +76,7 @@
NodeList linkChildren = new NodeList();
//img input
ImageTag img = new ImageTag();
- img.setImageURL(transformer.getImageChewLink());
+ img.setImageURL(transformer.getImageChewLinkSrcValue());
linkChildren.add(img);
link.setChildren(linkChildren);
// add link
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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- JDomHTMLTransformer.java 4 Jul 2005 12:52:19 -0000 1.13
+++ JDomHTMLTransformer.java 11 Jul 2005 09:14:59 -0000 1.14
@@ -386,7 +386,7 @@
linkEle.setAttribute(HTML.Attribute.HREF.toString(),
getHrefChewLink(position));
// image
Element imgEle = new Element("img");
- imgEle.setAttribute(HTML.Attribute.SRC.toString(),
getImageChewLink());
+ imgEle.setAttribute(HTML.Attribute.SRC.toString(),
getImageChewLinkSrcValue());
//add link and image
linkEle.addContent(imgEle);
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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- DomHTMLTransformer.java 7 Jul 2005 08:37:23 -0000 1.17
+++ DomHTMLTransformer.java 11 Jul 2005 09:14:59 -0000 1.18
@@ -36,7 +36,7 @@
private final String CHEW_ELE_XPATH = "//table";
private final String TARGET_ATT_XPATH = "//@target";
private final String BASE_ELE_XPATH = "//base";
- public static String JAVASCRIPT_EVENT_XPATH =
"//@onabort|//@onblur|//@onchange|//@onclick|//@ondblClick|//@ondragdrop|//@onerror|//@onfocus|//@onkeydown|//@onkeypress|//@onkeyup|//@onload|//@onmousedown|//@onmousemove|//@onmouseout|//@onmouseover|//@onmouseup|//@onmove|//@onreset|
//@onresize|//@onselect|//@onsubmit|//@onunload";
+ private final String JAVASCRIPT_EVENT_XPATH =
"//@onabort|//@onblur|//@onchange|//@onclick|//@ondblClick|//@ondragdrop|//@onerror|//@onfocus|//@onkeydown|//@onkeypress|//@onkeyup|//@onload|//@onmousedown|//@onmousemove|//@onmouseout|//@onmouseover|//@onmouseup|//@onmove|//@onreset|
//@onresize|//@onselect|//@onsubmit|//@onunload";
//public final String JAVASCRIPT_EVENT_XPATH = "//@onclick";
private static org.apache.log4j.Logger logger =
org.apache.log4j.Logger.getLogger(DomHTMLTransformer.class);
@@ -136,7 +136,7 @@
*/
public void buildUserDocument() {
Document originalDoc = getDocument().getW3cOriginalDocument();
- DocumentImpl userDocument = (DocumentImpl) originalDoc;
+ DocumentImpl userDocument = (DocumentImpl)
originalDoc.cloneNode(true);
try {
@@ -234,7 +234,7 @@
logger.debug("[ Build Transformed document ]");
Document originalDoc = getDocument().getW3cOriginalDocument();
//logger.debug(getDocument().getOriginalDocumentAsString());
- DocumentImpl transformedDocument = (DocumentImpl) originalDoc;
+ DocumentImpl transformedDocument = (DocumentImpl)
originalDoc.cloneNode(true);
try {
// Import css --> include Css
@@ -418,19 +418,30 @@
*
[EMAIL PROTECTED] ele Description of Parameter
[EMAIL PROTECTED] position Description of Parameter
+ [EMAIL PROTECTED] Description of the Returned Value
*/
- private void addChewLinkElementChild(Element ele, int position) {
+ private String addChewLinkElementChild(Element ele, int position) {
Document ownerDoc = ele.getOwnerDocument();
+ String idAtt = ele.getAttribute("id");
//create a link element
Element linkEle = ownerDoc.createElement("a");
linkEle.setAttribute(HTML.Attribute.TARGET.toString(),
"_parent");
- linkEle.setAttribute(HTML.Attribute.HREF.toString(),
getHrefChewLink(position));
+
+ // get hash and set the haah of the ele as it's id
+ String hash = HashUtilities.buildTableHash(idAtt,position);
+ ele.setAttribute("id",hash);
+ String linkHref = getHrefChewLink(hash);
+ linkEle.setAttribute(HTML.Attribute.HREF.toString(), linkHref);
+
// image
Element imgEle = ownerDoc.createElement("img");
- imgEle.setAttribute(HTML.Attribute.SRC.toString(),
getImageChewLink());
+ imgEle.setAttribute(HTML.Attribute.SRC.toString(),
getImageChewLinkSrcValue());
+
//add link and image
linkEle.appendChild(imgEle);
ele.appendChild(linkEle);
+
+ return linkHref;
}
@@ -989,7 +1000,6 @@
updateInputValue(fBean,
inputValue);
}
-
logger.debug("FormParamBean
found for hash " + formHash + " and input name " + name + " whith type " +
inputEle.getAttribute("type"));
logger.debug("Used value: " +
fBean.getUsedValue());
inputEle.setAttribute("value",
fBean.getUsedValue());
Index: HTMLUnitProcessor.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/web/http/impl/HTMLUnitProcessor.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- HTMLUnitProcessor.java 7 Jul 2005 13:23:39 -0000 1.14
+++ HTMLUnitProcessor.java 11 Jul 2005 09:15:00 -0000 1.15
@@ -86,11 +86,6 @@
}
}
else {
- // meta redirection
- String url = uBean.getRelativeUrlValue();
- String a = uBean.getAbsoluteUrlValue();
- String b = uBean.getHash();
- String c = uBean.getBaseUrlValue();
super.execute();
}
