[Yanel-commits] rev 23716 - in
public/yanel/trunk/src/resources/add-realm:
src/java/org/wyona/yanel/impl/resources xslt
michi at wyona.com
michi at wyona.com
Fri Apr 13 11:11:13 CEST 2007
Author: michi
Date: 2007-04-13 11:11:12 +0200 (Fri, 13 Apr 2007)
New Revision: 23716
Modified:
public/yanel/trunk/src/resources/add-realm/src/java/org/wyona/yanel/impl/resources/AddRealmResource.java
public/yanel/trunk/src/resources/add-realm/xslt/add-realm.xsl
Log:
patch applied
Modified: public/yanel/trunk/src/resources/add-realm/src/java/org/wyona/yanel/impl/resources/AddRealmResource.java
===================================================================
--- public/yanel/trunk/src/resources/add-realm/src/java/org/wyona/yanel/impl/resources/AddRealmResource.java 2007-04-13 09:07:18 UTC (rev 23715)
+++ public/yanel/trunk/src/resources/add-realm/src/java/org/wyona/yanel/impl/resources/AddRealmResource.java 2007-04-13 09:11:12 UTC (rev 23716)
@@ -73,15 +73,13 @@
private final static String SESSION_ATTR_REALM_ID = "org.wyona.yanel.addrealm.realm.id";
private final static String SESSION_ATTR_REALM_NAME = "org.wyona.yanel.addrealm.realm.name";
- private String defaultLanguage = null;
- private String language = null;
private String parameterName = null;
private String parameter = null;
private String parameterErrorName = null;
private String parameterError = null;
-
- private HashMap parameters = new HashMap();
+ private HashMap parameters = new HashMap();
+
/**
*
*/
@@ -96,28 +94,15 @@
}
/**
- *
+ * Generate view
*/
public View getView(String viewId) throws Exception {
-
String path = getPath();
HttpServletRequest request = getRequest();
- defaultLanguage = getRealm().getDefaultLanguage();
-
- // Get language
- try {
- language = request.getParameter("yanel.meta.language");
- } catch(Exception e) {
- log.debug("language param is not found will use default : " + language);
- language = defaultLanguage;
- }
- if(language == null || ("").equals(language)) {
- log.debug("language param is empty or null : " + language);
- language = defaultLanguage;
- }
+ String language = getLanguage();
Transformer transformer = null;
- I18nTransformer i18nTransformer = new I18nTransformer("add-realm", language, defaultLanguage);
+ I18nTransformer i18nTransformer = new I18nTransformer("add-realm", language, getRealm().getDefaultLanguage());
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
View defaultView = new View();
@@ -133,37 +118,17 @@
if (param.equals("stop")) stop = true;
}
- File XSLTFile = org.wyona.commons.io.FileUtil.file(rtd.getConfigFile().getParentFile().getAbsolutePath(), "xslt" + File.separator + "add-realm.xsl");
- //File inputXMLFile = org.wyona.commons.io.FileUtil.file(rtd.getConfigFile().getParentFile().getAbsolutePath(), "xml" + File.separator + "input-screen.xml");
- //File statusXMLFile = org.wyona.commons.io.FileUtil.file(rtd.getConfigFile().getParentFile().getAbsolutePath(), "xml" + File.separator + "status-screen.xml");
+ File XSLTFile = org.wyona.commons.io.FileUtil.file(getRTD().getConfigFile().getParentFile().getAbsolutePath(), "xslt" + File.separator + "add-realm.xsl");
transformer = TransformerFactory.newInstance().newTransformer(new StreamSource(XSLTFile));
- // Add HashMap keys with dummy values for form fields
- String[] parameterNames = { "realmid", "realmname", "url", "fslocation", "crawldepth", "crawlmaxpages", "crawlmaxfilesize", "scope" };
- for (int i=0; i<parameterNames.length; i++) {
- String property = getConfiguration().getProperty(parameterNames[i]);
- boolean propertyExists = getConfiguration().containsKey(parameterNames[i]);
-
- if (propertyExists == true) {
- parameters.put(parameterNames[i], property);
- transformer.setParameter(parameterNames[i] + "-prop-exists", "true");
- } else {
- parameters.put(parameterNames[i], "");
- transformer.setParameter(parameterNames[i] + "-prop-exists", "false");
- }
- }
-
- Set keys = parameters.keySet();
- Iterator keysIterator = keys.iterator();
-
HttpSession session = getRequest().getSession(true);
if(submit) {
- while (keysIterator.hasNext()) {
- parameterName = (String) keysIterator.next();
+ Enumeration enumeration2 = request.getParameterNames();
+ while(enumeration2.hasMoreElements()){
+ parameterName = enumeration2.nextElement().toString();
parameter = HttpServletRequestHelper.getParameter(request, parameterName);
-
if (parameterName.equals("fslocation") || parameterName.equals("scope")) {
parameters.put(parameterName, parameter);
transformer.setParameter(parameterName, parameters.get(parameterName).toString());
@@ -181,7 +146,7 @@
// Explicitly check whether fslocation is null and set to null (rather than the empty string).
// File() (and copyRealm()) needs null to be passed.
File fslocationValue = null;
- if (parameters.get("fslocation").toString() == null || ("").equals(parameters.get("fslocation").toString())) {
+ if (parameters.get("fslocation") == null || ("").equals(parameters.get("fslocation").toString())) {
fslocationValue = null;
} else {
fslocationValue = new File(parameters.get("fslocation").toString());
@@ -196,7 +161,18 @@
String crawlStartURL = (String)parameters.get("url");
if (crawlStartURL != null && crawlStartURL.length() > 0) {
- int maxPages = Integer.parseInt((String)parameters.get("crawlmaxpages"));
+
+ int maxPages = 0;
+/*
+ if (parameters.get("crawlmaxpages") != null) {
+ maxPages = Integer.parseInt((String)parameters.get("crawlmaxpages"));
+ } else if () {
+ maxPages = Integer.parseInt((String)parameters.get("crawlmaxpages"));
+ } else {
+ log.error("Max number of pages has not been set!");
+ }
+*/
+
int maxDepth = Integer.parseInt((String)parameters.get("crawldepth"));
int maxFileSize = 0;
String tmpMaxFileSize = (String)parameters.get("crawlmaxfilesize");
@@ -224,7 +200,6 @@
Document document = getInputDocument();
transformer.transform(new javax.xml.transform.dom.DOMSource(document), new StreamResult(byteArrayOutputStream));
- //transformer.transform(new javax.xml.transform.stream.StreamSource(statusXMLFile), new StreamResult(byteArrayOutputStream));
} else if (session.getAttribute(SESSION_ATTR_EVENT_LOG) != null) {
@@ -259,19 +234,12 @@
Document document = getInputDocument();
transformer.transform(new javax.xml.transform.dom.DOMSource(document), new StreamResult(byteArrayOutputStream));
- //transformer.transform(new javax.xml.transform.stream.StreamSource(statusXMLFile), new StreamResult(byteArrayOutputStream));
} else {
-
- while (keysIterator.hasNext()) {
- parameterName = (String) keysIterator.next();
- transformer.setParameter(parameterName, parameters.get(parameterName).toString());
- }
Document document = getInputDocument();
transformer.transform(new javax.xml.transform.dom.DOMSource(document), new StreamResult(byteArrayOutputStream));
- //transformer.transform(new javax.xml.transform.stream.StreamSource(inputXMLFile), new StreamResult(byteArrayOutputStream));
}
@@ -402,8 +370,28 @@
attribute = null;
}
fieldElement.appendChild(document.createTextNode(nameAttribute));
+ nameAttribute = null;
}
return document;
}
-
+
+ /**
+ * Get language
+ */
+ private String getLanguage() {
+ String defaultLanguage = getRealm().getDefaultLanguage();
+
+ String language = null;
+ try {
+ language = request.getParameter("yanel.meta.language");
+ } catch(Exception e) {
+ log.debug("language param is not found will use default : " + language);
+ language = defaultLanguage;
+ }
+ if(language == null || ("").equals(language)) {
+ log.debug("language param is empty or null : " + language);
+ language = defaultLanguage;
+ }
+ return language;
+ }
}
Modified: public/yanel/trunk/src/resources/add-realm/xslt/add-realm.xsl
===================================================================
--- public/yanel/trunk/src/resources/add-realm/xslt/add-realm.xsl 2007-04-13 09:07:18 UTC (rev 23715)
+++ public/yanel/trunk/src/resources/add-realm/xslt/add-realm.xsl 2007-04-13 09:11:12 UTC (rev 23716)
@@ -30,7 +30,9 @@
<xsl:template match="yanel:form">
- <xsl:apply-templates select="@*|node()"/>
+ <table border="0">
+ <xsl:apply-templates/>
+ </table>
</xsl:template>
@@ -40,8 +42,38 @@
<xsl:template match="yanel:input">
- <tr><td><i18n:message key="{@yanel:name}"/>: </td><td><input type="text" name="{@yanel:name}" size="30"/><xsl:if test="@yanel:required='true'">*</xsl:if></td></tr>
- <tr><td> </td><td>(i.e. <xsl:value-of select="@yanel:samplevalue"/>)</td></tr>
+ <div>
+ <xsl:if test="@yanel:hidden = 'true'">
+ <xsl:attribute name="style">display:none;</xsl:attribute>
+ </xsl:if>
+ <tr>
+ <td width="150" rowspan="2"><i18n:message key="{@yanel:name}"/>: </td>
+
+ <xsl:choose>
+ <xsl:when test="@yanel:value">
+ <td colspan="2"><strong><xsl:value-of select="@yanel:value"/></strong></td>
+ </xsl:when>
+ <xsl:otherwise>
+ <td align="left" width="175">
+ <input name="{@yanel:name}" size="25">
+ <xsl:choose>
+ <xsl:when test="@yanel:value">
+ <xsl:attribute name="type">hidden</xsl:attribute>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:attribute name="type">text</xsl:attribute>
+ </xsl:otherwise>
+ </xsl:choose>
+ </input>
+ </td>
+ <td> <xsl:if test="@yanel:required='true'">*</xsl:if></td>
+ </xsl:otherwise>
+ </xsl:choose>
+ </tr>
+ <xsl:if test="not(@yanel:value)">
+ <tr><td class="samplevalue" colspan="2">(i.e. <xsl:value-of select="@yanel:samplevalue"/>)</td></tr>
+ </xsl:if>
+ </div>
</xsl:template>
@@ -49,16 +81,11 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title><i18n:message key="add-realm"/></title>
- <style>
- .samplevalue {
- padding-bottom:10px;
- }
- </style>
+ <style>.samplevalue {padding-bottom:10px;}</style>
<xsl:if test="$isdone = 'false'">
<meta http-equiv="refresh" content="2"/>
</xsl:if>
</head>
-
<body>
<h3><i18n:message key="add-realm"/></h3>
@@ -90,32 +117,20 @@
<p style="font-size: small"><pre><xsl:value-of select="$errorevents"/></pre></p>
</xsl:when>
<xsl:otherwise>
-
-<!--
<form method="post">
- <table cellpadding="0" cellspacing="0" border="0">
- <xsl:apply-templates select="/yanel:form/yanel:inputfields/yanel:input"/>
- </table>
+ <table cellpadding="0" cellspacing="0" border="0">
+ <xsl:apply-templates select="yanel:form"/>
+ <tr><td> </td></tr>
+ <tr>
+ <td align="right">
+ <input type="submit" name="submit" value="i18n:attr key=add-realm"/>
+ </td>
+ </tr>
+ <tr>
+ <td align="right" valign="top" class="contentfield" colspan="2"><br/><i18n:message key="requiredFields"/></td>
+ </tr>
+ </table>
</form>
- <br/><br/>
--->
-
- <form method="post">
- <table cellpadding="0" cellspacing="0" border="0">
- <div>
- <xsl:apply-templates select="yanel:form"/>
- </div>
- <tr>
- <td align="right">
- <input type="submit" name="submit" value="i18n:attr key=add-realm"/>
- </td>
- </tr>
- <tr>
- <td align="right" valign="top" class="contentfield" colspan="2"><br/><i18n:message key="requiredFields"/></td>
- </tr>
- </table>
- </form>
-
</xsl:otherwise>
</xsl:choose>
</div>
More information about the Yanel-commits
mailing list