+ | 
|
- The
- The
- The specified search keywords (or phrase) are returned by default.
- To display the full query (including preset site and
- file type options), set the
- The
- The diff --git a/htdocs/howto.html b/google-taglib/htdocs/howto.html similarity index 92% rename from htdocs/howto.html rename to google-taglib/htdocs/howto.html index 3b37d62..589e238 100644 --- a/htdocs/howto.html +++ b/google-taglib/htdocs/howto.html @@ -10,7 +10,7 @@ body,td,font,.p,a{font-family:arial,sans-serif}
- The <google:cachedPage> tag is used to display
+ The <google:cachedPage> tag is used to display
the content of the cached page.
The Google Web APIs authentication key can be
@@ -423,7 +420,7 @@ body,td,font,.p,a{font-family:arial,sans-serif}
|
- The <google:spelling> tag is used to display the
+ The <google:spelling> tag is used to display the
suggested spelling for the given query.
The Google Web APIs authentication key can be
diff --git a/htdocs/images/arrow.gif b/google-taglib/htdocs/images/arrow.gif
similarity index 100%
rename from htdocs/images/arrow.gif
rename to google-taglib/htdocs/images/arrow.gif
diff --git a/htdocs/images/arrow.jpg b/google-taglib/htdocs/images/arrow.jpg
similarity index 100%
rename from htdocs/images/arrow.jpg
rename to google-taglib/htdocs/images/arrow.jpg
diff --git a/htdocs/images/cached.jpg b/google-taglib/htdocs/images/cached.jpg
similarity index 100%
rename from htdocs/images/cached.jpg
rename to google-taglib/htdocs/images/cached.jpg
diff --git a/htdocs/images/cachedresults.jpg b/google-taglib/htdocs/images/cachedresults.jpg
similarity index 100%
rename from htdocs/images/cachedresults.jpg
rename to google-taglib/htdocs/images/cachedresults.jpg
diff --git a/google-taglib/htdocs/images/duktumbl.gif b/google-taglib/htdocs/images/duktumbl.gif
new file mode 100644
index 0000000..95dd2bb
Binary files /dev/null and b/google-taglib/htdocs/images/duktumbl.gif differ
diff --git a/htdocs/images/google_sm.gif b/google-taglib/htdocs/images/google_sm.gif
similarity index 100%
rename from htdocs/images/google_sm.gif
rename to google-taglib/htdocs/images/google_sm.gif
diff --git a/htdocs/images/google_sm.png b/google-taglib/htdocs/images/google_sm.png
similarity index 100%
rename from htdocs/images/google_sm.png
rename to google-taglib/htdocs/images/google_sm.png
diff --git a/htdocs/images/search.jpg b/google-taglib/htdocs/images/search.jpg
similarity index 100%
rename from htdocs/images/search.jpg
rename to google-taglib/htdocs/images/search.jpg
diff --git a/htdocs/images/searchresults.jpg b/google-taglib/htdocs/images/searchresults.jpg
similarity index 100%
rename from htdocs/images/searchresults.jpg
rename to google-taglib/htdocs/images/searchresults.jpg
diff --git a/htdocs/images/spelling.jpg b/google-taglib/htdocs/images/spelling.jpg
similarity index 100%
rename from htdocs/images/spelling.jpg
rename to google-taglib/htdocs/images/spelling.jpg
diff --git a/htdocs/images/yellowarrow.gif b/google-taglib/htdocs/images/yellowarrow.gif
similarity index 100%
rename from htdocs/images/yellowarrow.gif
rename to google-taglib/htdocs/images/yellowarrow.gif
diff --git a/htdocs/includes/google.css b/google-taglib/htdocs/includes/google.css
similarity index 100%
rename from htdocs/includes/google.css
rename to google-taglib/htdocs/includes/google.css
diff --git a/htdocs/index.html b/google-taglib/htdocs/index.html
similarity index 87%
rename from htdocs/index.html
rename to google-taglib/htdocs/index.html
index 80ce6d9..b653c3b 100644
--- a/htdocs/index.html
+++ b/google-taglib/htdocs/index.html
@@ -9,7 +9,7 @@ body,td,font,p,a{font-family:arial,sans-serif}
-
-
-
- * For example:
-
-This is a collection of examples demonstrating the usage of the Google RSS JSP Tag Library.
-
-The Google RSS Tag Library is an extension to the Google Tag Library.
-
-The Google Web APIs Java library is required in order to use the Google RSS Tag
-Library. The library's JAR file (
-You must also register with Google (free) in order to obtain a license key. The
-license key is required to access Google's Web Services.
-
-The license key can be specified as a context parameter in the web application
-deployment descriptor (
-The license key can also be temporarily specified using the following:
-
-The included examples will allow you to:
-
-The Google RSS Tag Library uses the Google Web APIs, but is not associated with or sponsored by Google, Inc.
-
@@ -22,40 +22,37 @@ body,td,font,p,a{font-family:arial,sans-serif}
+
Overview
Download
Documentation
HowTo
- Javadoc
- TLD
- UML
+ Javadoc
About
+
-
-
-
+
-
-
+
+
+
+
+
+
2
- Download the Google Web APIs
+ Download the Google Web API
To use the Google Web APIs service, you also must obtain
a license key.
-
-
+
+
+
+
+
+
3
@@ -109,7 +114,7 @@ body,td,font,p,a{font-family:arial,sans-serif}
@@ -141,7 +146,8 @@ body,td,font,p,a{font-family:arial,sans-serif}
+
The Google Web APIs Java library.
+ The Google
+ API Java library.
diff --git a/htdocs/license.html b/google-taglib/htdocs/license.html
similarity index 84%
rename from htdocs/license.html
rename to google-taglib/htdocs/license.html
index 33a5005..963ed33 100644
--- a/htdocs/license.html
+++ b/google-taglib/htdocs/license.html
@@ -9,7 +9,7 @@ body,td,font,p,a{font-family:arial,sans-serif}
-
@@ -22,39 +22,35 @@ body,td,font,p,a{font-family:arial,sans-serif}
*
* @param index The element index.
@@ -605,10 +520,6 @@ public class GoogleSearchBean
{
return String.valueOf(result.getDocumentFiltering());
}
- else if (property.equalsIgnoreCase("searchKeywords"))
- {
- return getKeywords();
- }
else if (property.equalsIgnoreCase("searchQuery"))
{
return result.getSearchQuery();
@@ -725,22 +636,6 @@ public class GoogleSearchBean
elements = null;
}
- /**
- * Validates a string value by insuring it is not null or empty.
- *
- * @param stringValue The String value.
- * @return true if valid, false if not.
- */
- private boolean isValidString(String stringValue)
- {
- if ((stringValue != null) && (stringValue.trim().length() > 0))
- {
- return true;
- }
-
- return false;
- }
-
/**
* Prints the usage and exits.
*/
diff --git a/src/net/thauvin/google/TagUtility.java b/google-taglib/src/net/thauvin/google/TagUtility.java
similarity index 94%
rename from src/net/thauvin/google/TagUtility.java
rename to google-taglib/src/net/thauvin/google/TagUtility.java
index 8feadd2..2203e35 100644
--- a/src/net/thauvin/google/TagUtility.java
+++ b/google-taglib/src/net/thauvin/google/TagUtility.java
@@ -67,26 +67,6 @@ public class TagUtility
*/
public static final String FILTER_PARAM = "filter";
- /**
- * The HTTP proxy host.
- */
- public static final String GOOGLE_PROXY_HOST = "google_proxy_host";
-
- /**
- * The HTTP proxy password.
- */
- public static final String GOOGLE_PROXY_PASSWORD = "google_proxy_password";
-
- /**
- * The HTTP proxy port.
- */
- public static final String GOOGLE_PROXY_PORT = "google_proxy_port";
-
- /**
- * The HTTP proxy username.
- */
- public static final String GOOGLE_PROXY_USERNAME = "google_proxy_username";
-
/**
* The name of the Google Search bean attribute.
*/
@@ -147,11 +127,6 @@ public class TagUtility
*/
public static final String START_PARAM = "start";
- /**
- * The name of the (file) type request parameter.
- */
- public static final String TYPE_PARAM = "type";
-
/**
* Protected constructor to disable instantiation.
*/
@@ -292,13 +267,13 @@ public class TagUtility
/**
* Builds a HTML reference link:
*
*
+
Overview
Download
Documentation
HowTo
Javadoc
- TLD
- UML
About
+
-
-
-
-
"relatedQuery"Returns the related query
* string, suitable for use as a {@link #getGoogleSearch(String) search}
- * query string.
For example:
- * related:www.example.com/search?q=vacation%20hawaii"cachedQuery"Returns the cached query
* string, suitable for use as a {@link #getCachedPage(String) cached} query
- * string.
For example: www.example.com/search?q=vacation%20hawaii
- * "staticQuery"The static query, suitable for
- * display.
For example: www.example.com/search?q=vacation hawaii
- * <a href="url" class="css" style="style" target="target">body</a>.
+ * For example: body.
*
* @param url The reference URL.
* @param body The link body text.
* @param target The link target.
* @param style The link CSS style.
- * @param css The link CSS class.
+ * @param css The link CSS class
* @return A HTML reference link.
*/
public static final String buildRefLink(String url, String body,
diff --git a/src/net/thauvin/google/package.html b/google-taglib/src/net/thauvin/google/package.html
similarity index 100%
rename from src/net/thauvin/google/package.html
rename to google-taglib/src/net/thauvin/google/package.html
diff --git a/src/net/thauvin/google/taglibs/CachedPage.java b/google-taglib/src/net/thauvin/google/taglibs/CachedPage.java
similarity index 85%
rename from src/net/thauvin/google/taglibs/CachedPage.java
rename to google-taglib/src/net/thauvin/google/taglibs/CachedPage.java
index 5f95617..831c71b 100644
--- a/src/net/thauvin/google/taglibs/CachedPage.java
+++ b/google-taglib/src/net/thauvin/google/taglibs/CachedPage.java
@@ -4,14 +4,14 @@
* Copyright (c) 2002-2003, Erik C. Thauvin (erik@thauvin.net)
* All rights reserved.
*
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
- * Redistributions in binary form must reproduce the above copyright notice,
+ * Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
@@ -20,7 +20,7 @@
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
@@ -69,15 +69,6 @@ public class CachedPage extends QuerySupport
{
final GoogleSearchBean bean = new GoogleSearchBean(getKey());
- bean.setProxyServer(pageContext.getServletContext()
- .getInitParameter(TagUtility.GOOGLE_PROXY_HOST),
- pageContext.getServletContext()
- .getInitParameter(TagUtility.GOOGLE_PROXY_PORT),
- pageContext.getServletContext()
- .getInitParameter(TagUtility.GOOGLE_PROXY_USERNAME),
- pageContext.getServletContext()
- .getInitParameter(TagUtility.GOOGLE_PROXY_PASSWORD));
-
// Output the body
pageContext.getOut().write(bean.getCachedPage(query));
}
diff --git a/src/net/thauvin/google/taglibs/Element.java b/google-taglib/src/net/thauvin/google/taglibs/Element.java
similarity index 100%
rename from src/net/thauvin/google/taglibs/Element.java
rename to google-taglib/src/net/thauvin/google/taglibs/Element.java
diff --git a/src/net/thauvin/google/taglibs/EndIndex.java b/google-taglib/src/net/thauvin/google/taglibs/EndIndex.java
similarity index 100%
rename from src/net/thauvin/google/taglibs/EndIndex.java
rename to google-taglib/src/net/thauvin/google/taglibs/EndIndex.java
diff --git a/src/net/thauvin/google/taglibs/EstimatedTotal.java b/google-taglib/src/net/thauvin/google/taglibs/EstimatedTotal.java
similarity index 100%
rename from src/net/thauvin/google/taglibs/EstimatedTotal.java
rename to google-taglib/src/net/thauvin/google/taglibs/EstimatedTotal.java
diff --git a/src/net/thauvin/google/taglibs/KeySupport.java b/google-taglib/src/net/thauvin/google/taglibs/KeySupport.java
similarity index 99%
rename from src/net/thauvin/google/taglibs/KeySupport.java
rename to google-taglib/src/net/thauvin/google/taglibs/KeySupport.java
index af62a6a..9fee9fe 100644
--- a/src/net/thauvin/google/taglibs/KeySupport.java
+++ b/google-taglib/src/net/thauvin/google/taglibs/KeySupport.java
@@ -79,27 +79,13 @@ public abstract class KeySupport extends BodyTagSupport
this.key = key;
}
- /**
- * Release method.
- */
- public void release()
- {
- super.release();
-
- // Reset the key value
- key = null;
-
- // Reset the values
- reset();
- }
-
/**
* Returns the key attribute.
*
* @return The attribute value.
* @see #setKey(String)
*/
- protected String getKey()
+ public String getKey()
{
if (TagUtility.isValidString(key, true))
{
@@ -144,6 +130,20 @@ public abstract class KeySupport extends BodyTagSupport
return "";
}
+ /**
+ * Release method.
+ */
+ public void release()
+ {
+ super.release();
+
+ // Reset the key value
+ key = null;
+
+ // Reset the values
+ reset();
+ }
+
/**
* Reset the values.
*/
diff --git a/src/net/thauvin/google/taglibs/Next.java b/google-taglib/src/net/thauvin/google/taglibs/Next.java
similarity index 100%
rename from src/net/thauvin/google/taglibs/Next.java
rename to google-taglib/src/net/thauvin/google/taglibs/Next.java
diff --git a/src/net/thauvin/google/taglibs/Previous.java b/google-taglib/src/net/thauvin/google/taglibs/Previous.java
similarity index 100%
rename from src/net/thauvin/google/taglibs/Previous.java
rename to google-taglib/src/net/thauvin/google/taglibs/Previous.java
diff --git a/src/net/thauvin/google/taglibs/QuerySupport.java b/google-taglib/src/net/thauvin/google/taglibs/QuerySupport.java
similarity index 100%
rename from src/net/thauvin/google/taglibs/QuerySupport.java
rename to google-taglib/src/net/thauvin/google/taglibs/QuerySupport.java
diff --git a/src/net/thauvin/google/taglibs/Search.java b/google-taglib/src/net/thauvin/google/taglibs/Search.java
similarity index 81%
rename from src/net/thauvin/google/taglibs/Search.java
rename to google-taglib/src/net/thauvin/google/taglibs/Search.java
index 9a3f9ba..ddf1e7f 100644
--- a/src/net/thauvin/google/taglibs/Search.java
+++ b/google-taglib/src/net/thauvin/google/taglibs/Search.java
@@ -42,61 +42,98 @@ import net.thauvin.google.TagUtility;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.PageContext;
+
/**
* A custom tag used to perform Google searches.
*
* @author Erik C. Thauvin
* @created April 25, 2002
- * @version $Revision$, $Date$
+ * @version $Revision$
* @since 1.0
*/
public class Search extends QuerySupport
{
private GoogleSearchBean bean = null;
- private boolean cache = GoogleSearchBean.DEFAULT_CACHE;
- private boolean filter = GoogleSearchBean.DEFAULT_FILTER;
private String lr = GoogleSearchBean.DEFAULT_LR;
- private int maxResults = GoogleSearchBean.DEFAULT_MAX_RESULTS;
private String restrict = GoogleSearchBean.DEFAULT_RESTRICT;
- private boolean safeSearch = GoogleSearchBean.DEFAULT_SAFE_SEARCH;
private String site = GoogleSearchBean.DEFAULT_SITE;
+ private boolean cache = true;
+ private boolean filter = GoogleSearchBean.DEFAULT_FILTER;
+ private boolean safeSearch = GoogleSearchBean.DEFAULT_SAFE_SEARCH;
+ private int maxResults = GoogleSearchBean.DEFAULT_MAX_RESULTS;
private int start = GoogleSearchBean.DEFAULT_START;
- private String type = GoogleSearchBean.DEFAULT_TYPE;
/**
* Sets the cache attribute.
*
* @param cache The new attribute value.
+ * @see #getCache()
*/
public final void setCache(String cache)
{
this.cache = Boolean.valueOf(cache).booleanValue();
}
+ /**
+ * Returns the cache attribute.
+ *
+ * @return The attribute value.
+ * @see #setCache(String)
+ */
+ public final boolean getCache()
+ {
+ return getBoolParam(TagUtility.CACHE_PARAM, cache);
+ }
+
/**
* Sets the (related-query) filter attribute.
*
* @param filter The new attribute value.
+ * @see #getFilter()
*/
public final void setFilter(String filter)
{
this.filter = Boolean.valueOf(filter).booleanValue();
}
+ /**
+ * Returns the (related-query) filter attribute.
+ *
+ * @return The attribute value.
+ * @see #setFilter(String)
+ */
+ public final boolean getFilter()
+ {
+ return getBoolParam(TagUtility.FILTER_PARAM, filter);
+ }
+
/**
* Sets the lr (language restrict) attribute.
*
* @param lr The new attribute value.
+ * @see #getLr()
*/
public final void setLr(String lr)
{
this.lr = lr;
}
+ /**
+ * Returns the lr (language restrict) attribute.
+ *
+ * @return The attribute value.
+ * @see #setLr(String)
+ */
+ public final String getLr()
+ {
+ return getStringParam(TagUtility.LR_PARAM, lr);
+ }
+
/**
* Sets the maximum number of results to be returned.
*
* @param maxResults The new attribute value.
+ * @see #getMaxResults()
*/
public final void setMaxResults(String maxResults)
{
@@ -106,34 +143,70 @@ public class Search extends QuerySupport
}
catch (NumberFormatException e)
{
- ;// Do nothing
+ ; // Do nothing
}
}
+ /**
+ * Returns the maximum number of results to be returned.
+ *
+ * @return The attribute value.
+ * @see #setMaxResults(String)
+ */
+ public final int getMaxResults()
+ {
+ return getIntParam(TagUtility.MAX_RESULTS_PARAM, maxResults);
+ }
+
/**
* Sets the restrict attribute.
*
* @param restrict The new restrict attribute.
+ * @see #getRestrict()
*/
public final void setRestrict(String restrict)
{
this.restrict = restrict;
}
+ /**
+ * Returns the restrict attribute.
+ *
+ * @return The attribute value.
+ * @see #setRestrict(String)
+ */
+ public final String getRestrict()
+ {
+ return getStringParam(TagUtility.RESTRICT_PARAM, restrict);
+ }
+
/**
* Sets the safeSearch attribute.
*
* @param safeSearch The new attribute value.
+ * @see #getSafeSearch()
*/
public final void setSafeSearch(String safeSearch)
{
this.safeSearch = Boolean.valueOf(safeSearch).booleanValue();
}
+ /**
+ * Returns the safeSearch attribute.
+ *
+ * @return The attribute value.
+ * @see #setSafeSearch(String)
+ */
+ public final boolean getSafeSearch()
+ {
+ return getBoolParam(TagUtility.SAFE_SEARCH_PARAM, safeSearch);
+ }
+
/**
* Sets the site attribute.
*
* @param site The new attribute value.
+ * @see #getSite()
*/
public final void setSite(String site)
{
@@ -141,99 +214,12 @@ public class Search extends QuerySupport
}
/**
- * Sets the start attribute.
- *
- * @param start The new attribute value.
- */
- public final void setStart(String start)
- {
- try
- {
- this.start = Integer.valueOf(start).intValue();
- }
- catch (NumberFormatException e)
- {
- ;// Do nothing
- }
- }
-
- /**
- * Sets the (file) type attribute.
- *
- * @param type The new attribute value.
- * @since 1.0.1
- */
- public final void setType(String type)
- {
- this.type = type;
- }
-
- /**
- * Returns the cache attribute.
+ * Returns the stie attribute.
*
* @return The attribute value.
+ * @see #setSite(String)
*/
- private final boolean getCache()
- {
- return getBoolParam(TagUtility.CACHE_PARAM, cache);
- }
-
- /**
- * Returns the (related-query) filter attribute.
- *
- * @return The attribute value.
- */
- private final boolean getFilter()
- {
- return getBoolParam(TagUtility.FILTER_PARAM, filter);
- }
-
- /**
- * Returns the lr (language restrict) attribute.
- *
- * @return The attribute value.
- */
- private final String getLr()
- {
- return getStringParam(TagUtility.LR_PARAM, lr);
- }
-
- /**
- * Returns the maximum number of results to be returned.
- *
- * @return The attribute value.
- */
- private final int getMaxResults()
- {
- return getIntParam(TagUtility.MAX_RESULTS_PARAM, maxResults);
- }
-
- /**
- * Returns the restrict attribute.
- *
- * @return The attribute value.
- */
- private final String getRestrict()
- {
- return getStringParam(TagUtility.RESTRICT_PARAM, restrict);
- }
-
- /**
- * Returns the safeSearch attribute.
- *
- * @return The attribute value.
- */
- private final boolean getSafeSearch()
- {
- return getBoolParam(TagUtility.SAFE_SEARCH_PARAM, safeSearch);
- }
-
- /**
- * Returns the site attribute.
- *
- * @return The attribute value.
- */
- private final String getSite()
+ public final String getSite()
{
String site = getStringParam(TagUtility.SITE_PARAM, this.site);
@@ -245,100 +231,35 @@ public class Search extends QuerySupport
return "";
}
+ /**
+ * Sets the start attribute.
+ *
+ * @param start The new attribute value.
+ * @see #getStart()
+ */
+ public final void setStart(String start)
+ {
+ try
+ {
+ this.start = Integer.valueOf(start).intValue();
+ }
+ catch (NumberFormatException e)
+ {
+ ; // Do nothing
+ }
+ }
+
/**
* Returns the start attribute.
*
* @return The attribute value.
+ * @see #setStart(String)
*/
- private final int getStart()
+ public final int getStart()
{
return getIntParam(TagUtility.START_PARAM, start);
}
- /**
- * Returns the (file) type attribute.
- *
- * @return The attribute value
- */
- private final String getType()
- {
- String type = getStringParam(TagUtility.TYPE_PARAM, this.type);
-
- if (type.length() > 0)
- {
- return (" filetype:" + type);
- }
-
- return "";
- }
-
- /**
- * Converts a request parameter to a boolean.
- *
- * @param paramName The parameter name.
- * @param defaultValue The default value to use if the parameter is empty.
- * @return The boolean value.
- */
- private boolean getBoolParam(String paramName, boolean defaultValue)
- {
- String param =
- TagUtility.getParameter(pageContext.getRequest(), paramName);
-
- if (TagUtility.isValidString(param, true))
- {
- return Boolean.valueOf(param).booleanValue();
- }
-
- return defaultValue;
- }
-
- /**
- * Converts a request parameter to an int.
- *
- * @param paramName The parameter name.
- * @param defaultValue The default value to use if the parameter is empty.
- * @return The int value.
- */
- private int getIntParam(String paramName, int defaultValue)
- {
- String param =
- TagUtility.getParameter(pageContext.getRequest(), paramName);
-
- if (TagUtility.isValidString(param, true))
- {
- try
- {
- return Integer.valueOf(param).intValue();
- }
- catch (NumberFormatException e)
- {
- ;// Do nothing
- }
- }
-
- return defaultValue;
- }
-
- /**
- * Converts a request parameter to a string.
- *
- * @param paramName The parameter name.
- * @param defaultValue The default value to use if the parameter is empty.
- * @return The string value.
- */
- private String getStringParam(String paramName, String defaultValue)
- {
- String param =
- TagUtility.getParameter(pageContext.getRequest(), paramName);
-
- if (TagUtility.isValidString(param, true))
- {
- return param;
- }
-
- return defaultValue;
- }
-
/**
* doEndTag method.
*
@@ -346,7 +267,7 @@ public class Search extends QuerySupport
* @exception JspException
*/
public int doEndTag()
- throws JspException
+ throws JspException
{
final String query = getQuery();
@@ -354,20 +275,9 @@ public class Search extends QuerySupport
{
try
{
- bean.setProxyServer(pageContext.getServletContext()
- .getInitParameter(TagUtility.GOOGLE_PROXY_HOST),
- pageContext.getServletContext()
- .getInitParameter(TagUtility.GOOGLE_PROXY_PORT),
- pageContext.getServletContext()
- .getInitParameter(TagUtility.GOOGLE_PROXY_USERNAME),
- pageContext.getServletContext()
- .getInitParameter(TagUtility.GOOGLE_PROXY_PASSWORD));
-
- bean.setKeywords(getQuery());
-
- bean.getGoogleSearch(getKey(), getSite() + getQuery() + getType(),
- getStart(), getMaxResults(), getFilter(),
- getRestrict(), getSafeSearch(), getLr());
+ bean.getGoogleSearch(getKey(), getSite() + getQuery(),
+ getStart(), getMaxResults(), getFilter(),
+ getRestrict(), getSafeSearch(), getLr());
}
catch (Exception e)
{
@@ -392,7 +302,7 @@ public class Search extends QuerySupport
* @exception JspException
*/
public int doStartTag()
- throws JspException
+ throws JspException
{
// Get the Google bean
bean = TagUtility.getGoogleSearchBean(pageContext);
@@ -406,7 +316,7 @@ public class Search extends QuerySupport
// Set the bean as named session attribute
pageContext.setAttribute(TagUtility.GOOGLE_SEARCH_BEAN, bean,
- PageContext.SESSION_SCOPE);
+ PageContext.SESSION_SCOPE);
}
catch (Exception e)
{
@@ -432,8 +342,7 @@ public class Search extends QuerySupport
restrict = GoogleSearchBean.DEFAULT_RESTRICT;
lr = GoogleSearchBean.DEFAULT_LR;
site = GoogleSearchBean.DEFAULT_SITE;
- cache = GoogleSearchBean.DEFAULT_CACHE;
- type = GoogleSearchBean.DEFAULT_TYPE;
+ cache = true;
// Reset the bean
bean = null;
@@ -449,4 +358,71 @@ public class Search extends QuerySupport
{
super.reset();
}
+
+ /**
+ * Converts a request parameter to a boolean.
+ *
+ * @param paramName The parameter name.
+ * @param defaultValue The default value to use if the parameter is empty.
+ * @return The boolean value.
+ */
+ private boolean getBoolParam(String paramName, boolean defaultValue)
+ {
+ String param =
+ TagUtility.getParameter(pageContext.getRequest(), paramName);
+
+ if (TagUtility.isValidString(param, true))
+ {
+ return Boolean.valueOf(param).booleanValue();
+ }
+
+ return defaultValue;
+ }
+
+ /**
+ * Converts a request parameter to an int.
+ *
+ * @param paramName The parameter name.
+ * @param defaultValue The default value to use if the parameter is empty.
+ * @return The int value.
+ */
+ private int getIntParam(String paramName, int defaultValue)
+ {
+ String param =
+ TagUtility.getParameter(pageContext.getRequest(), paramName);
+
+ if (TagUtility.isValidString(param, true))
+ {
+ try
+ {
+ return Integer.valueOf(param).intValue();
+ }
+ catch (NumberFormatException e)
+ {
+ ; // Do nothing
+ }
+ }
+
+ return defaultValue;
+ }
+
+ /**
+ * Converts a request parameter to a string.
+ *
+ * @param paramName The parameter name.
+ * @param defaultValue The default value to use if the parameter is empty.
+ * @return The string value.
+ */
+ private String getStringParam(String paramName, String defaultValue)
+ {
+ String param =
+ TagUtility.getParameter(pageContext.getRequest(), paramName);
+
+ if (TagUtility.isValidString(param, true))
+ {
+ return param;
+ }
+
+ return defaultValue;
+ }
}
diff --git a/src/net/thauvin/google/taglibs/SearchComments.java b/google-taglib/src/net/thauvin/google/taglibs/SearchComments.java
similarity index 100%
rename from src/net/thauvin/google/taglibs/SearchComments.java
rename to google-taglib/src/net/thauvin/google/taglibs/SearchComments.java
diff --git a/src/net/thauvin/google/taglibs/SearchQuery.java b/google-taglib/src/net/thauvin/google/taglibs/SearchQuery.java
similarity index 80%
rename from src/net/thauvin/google/taglibs/SearchQuery.java
rename to google-taglib/src/net/thauvin/google/taglibs/SearchQuery.java
index 01c7137..de530a7 100644
--- a/src/net/thauvin/google/taglibs/SearchQuery.java
+++ b/google-taglib/src/net/thauvin/google/taglibs/SearchQuery.java
@@ -4,14 +4,14 @@
* Copyright (c) 2002-2003, Erik C. Thauvin (erik@thauvin.net)
* All rights reserved.
*
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
- * Redistributions in binary form must reproduce the above copyright notice,
+ * Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
@@ -20,7 +20,7 @@
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
@@ -36,42 +36,17 @@
*/
package net.thauvin.google.taglibs;
-import net.thauvin.google.TagUtility;
-
/**
* A custom tag used to retrieve the query string of a Google search.
*
* @author Erik C. Thauvin
* @created April 29, 2002
- * @version $Revision$, $Date$
+ * @version $Revision$
* @since 1.0
*/
public class SearchQuery extends SearchResultSupport
{
- private String type = null;
-
- /**
- * Sets the type attribute.
- *
- * @param type The new attribute value.
- * @since 1.0.1
- */
- public final void setType(String type)
- {
- this.type = type;
- }
-
- /**
- * Release method.
- */
- public void release()
- {
- super.release();
-
- type = null;
- }
-
/**
* Returns the property provided by this tag.
*
@@ -79,12 +54,7 @@ public class SearchQuery extends SearchResultSupport
*/
protected String getPropertyName()
{
- if (TagUtility.isValidString(type) && type.equalsIgnoreCase("full"))
- {
- return "searchQuery";
- }
-
- return "searchKeywords";
+ return "searchQuery";
}
/**
diff --git a/src/net/thauvin/google/taglibs/SearchResult.java b/google-taglib/src/net/thauvin/google/taglibs/SearchResult.java
similarity index 100%
rename from src/net/thauvin/google/taglibs/SearchResult.java
rename to google-taglib/src/net/thauvin/google/taglibs/SearchResult.java
diff --git a/src/net/thauvin/google/taglibs/SearchResultSupport.java b/google-taglib/src/net/thauvin/google/taglibs/SearchResultSupport.java
similarity index 100%
rename from src/net/thauvin/google/taglibs/SearchResultSupport.java
rename to google-taglib/src/net/thauvin/google/taglibs/SearchResultSupport.java
diff --git a/src/net/thauvin/google/taglibs/SearchTime.java b/google-taglib/src/net/thauvin/google/taglibs/SearchTime.java
similarity index 100%
rename from src/net/thauvin/google/taglibs/SearchTime.java
rename to google-taglib/src/net/thauvin/google/taglibs/SearchTime.java
diff --git a/src/net/thauvin/google/taglibs/SearchTips.java b/google-taglib/src/net/thauvin/google/taglibs/SearchTips.java
similarity index 100%
rename from src/net/thauvin/google/taglibs/SearchTips.java
rename to google-taglib/src/net/thauvin/google/taglibs/SearchTips.java
diff --git a/src/net/thauvin/google/taglibs/Spelling.java b/google-taglib/src/net/thauvin/google/taglibs/Spelling.java
similarity index 85%
rename from src/net/thauvin/google/taglibs/Spelling.java
rename to google-taglib/src/net/thauvin/google/taglibs/Spelling.java
index 7814207..63f06d8 100644
--- a/src/net/thauvin/google/taglibs/Spelling.java
+++ b/google-taglib/src/net/thauvin/google/taglibs/Spelling.java
@@ -4,14 +4,14 @@
* Copyright (c) 2002-2003, Erik C. Thauvin (erik@thauvin.net)
* All rights reserved.
*
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
- * Redistributions in binary form must reproduce the above copyright notice,
+ * Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
@@ -20,7 +20,7 @@
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
@@ -69,15 +69,6 @@ public class Spelling extends QuerySupport
{
final GoogleSearchBean bean = new GoogleSearchBean(getKey());
- bean.setProxyServer(pageContext.getServletContext()
- .getInitParameter(TagUtility.GOOGLE_PROXY_HOST),
- pageContext.getServletContext()
- .getInitParameter(TagUtility.GOOGLE_PROXY_PORT),
- pageContext.getServletContext()
- .getInitParameter(TagUtility.GOOGLE_PROXY_USERNAME),
- pageContext.getServletContext()
- .getInitParameter(TagUtility.GOOGLE_PROXY_PASSWORD));
-
String result = bean.getSpellingSuggestion(query);
if (!TagUtility.isValidString(result, true))
diff --git a/src/net/thauvin/google/taglibs/StartIndex.java b/google-taglib/src/net/thauvin/google/taglibs/StartIndex.java
similarity index 100%
rename from src/net/thauvin/google/taglibs/StartIndex.java
rename to google-taglib/src/net/thauvin/google/taglibs/StartIndex.java
diff --git a/src/net/thauvin/google/taglibs/StyleSupport.java b/google-taglib/src/net/thauvin/google/taglibs/StyleSupport.java
similarity index 100%
rename from src/net/thauvin/google/taglibs/StyleSupport.java
rename to google-taglib/src/net/thauvin/google/taglibs/StyleSupport.java
diff --git a/src/net/thauvin/google/taglibs/package.html b/google-taglib/src/net/thauvin/google/taglibs/package.html
similarity index 100%
rename from src/net/thauvin/google/taglibs/package.html
rename to google-taglib/src/net/thauvin/google/taglibs/package.html
diff --git a/tlds/google.tld b/google-taglib/tlds/google.tld
similarity index 94%
rename from tlds/google.tld
rename to google-taglib/tlds/google.tld
index b2a7496..af98b4f 100644
--- a/tlds/google.tld
+++ b/google-taglib/tlds/google.tld
@@ -11,7 +11,9 @@
Oops, there has been a problem...
- <%= org.tagunit.util.ExceptionUtils.getStackTraceAsString(exception) %>
-
-
-
-
\ No newline at end of file
diff --git a/google-tagunit/test/google/cachedPage/testSpecification.jsp b/google-tagunit/test/google/cachedPage/testSpecification.jsp
deleted file mode 100644
index 876b262..0000000
--- a/google-tagunit/test/google/cachedPage/testSpecification.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@ taglib uri="http://www.tagunit.org/tagunit/core" prefix="tagunit" %>
-
-TagUnit license information
- Copyright (c) 2002, Simon Brown
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
- - Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- - Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
- - Neither the name of TagUnit nor the names of its contributors may
- be used to endorse or promote products derived from this software
- without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-
-
\ No newline at end of file
diff --git a/google-tagunit/test/page.css b/google-tagunit/test/page.css
deleted file mode 100644
index e5d02f8..0000000
--- a/google-tagunit/test/page.css
+++ /dev/null
@@ -1,50 +0,0 @@
-body, p, table, thead, tbody {
- font-family: verdana, arial, helvetica;
- font-size: 8pt;
- font-style: normal;
- font-weight: normal;
- text-align: left
-}
-
-h1 {
- font-size: 18pt;
- font-weight: bold;
-}
-
-h2 {
- font-size: 14pt;
- font-weight: bold;
-}
-
-a:link, a:visited, a:active {
- color: #000000;
-}
-
-.pass {
- color: 00CC00;
-}
-
-.warning {
- color: FF9900;
-}
-
-.fail {
- color: #CC0000;
-}
-
-.error {
- color: #CC0000;
-}
-
-.message {
- font-size: 8pt;
-}
-
-.banner {
- font-size: 8pt;
- border-top: solid black 2px;
- border-right: solid black 2px;
- border-bottom: solid black 2px;
- border-left: solid black 2px;
- color: white;
-}
\ No newline at end of file
diff --git a/google-tagunit/test/results.jsp b/google-tagunit/test/results.jsp
deleted file mode 100644
index b78b4cd..0000000
--- a/google-tagunit/test/results.jsp
+++ /dev/null
@@ -1,206 +0,0 @@
-
-
-<%@ page import="org.tagunit.*" %>
-<%@ page errorPage="error.jsp" %>
-
-<%
-String color = "#6699CC";
-TestContextContainer testContext = (TestContextContainer)session.getAttribute(Constants.TEST_CONTEXT);
-if (testContext != null && testContext.getStatus().equals(TestContext.PASS)) {
- color = "#00CC00";
-} else if (testContext != null && testContext.getStatus().equals(TestContext.WARNING)) {
- color = "#CC6600";
-} else if (testContext != null && (testContext.getStatus().equals(TestContext.FAIL) || testContext.getStatus().equals(TestContext.ERROR))) {
- color = "#CC0000";
-}
-%>
-
-<%@ taglib uri="http://www.tagunit.org/tagunit/display" prefix="tagunit" %>
-
-
-
-
-
-
-
-
-
-
-
- 
- Version
-
-
-
-
-
-
-
-
- Test results
-
- Hide passes
- |
- Hide warnings
- |
- Show all
-
-
- Ignore Warnings -
- Yes
- |
- No
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <%
- if (!org.tagunit.TagUnitProperties.getInstance().getIgnoreWarnings()) {
- %>
-
-
-
- Passes
-
-
-
-
-
-
- <%
- }
- %>
-
-
-
- Warnings
-
-
-
-
-
-
-
-
-
- Failures
-
-
-
-
-
-
-
-
-
-
- Errors
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
-
- 
-
-
-
diff --git a/lib/tagunit.jar b/lib/tagunit.jar
deleted file mode 100644
index fe22da6..0000000
Binary files a/lib/tagunit.jar and /dev/null differ
diff --git a/lib/tlddoc.jar b/lib/tlddoc.jar
deleted file mode 100644
index b82f56d..0000000
Binary files a/lib/tlddoc.jar and /dev/null differ
diff --git a/licenses/LICENSE-tagunit.txt b/licenses/LICENSE-tagunit.txt
deleted file mode 100644
index 9324147..0000000
--- a/licenses/LICENSE-tagunit.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-Copyright (c) 2002/2003, Simon Brown
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
- - Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- - Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
- - Neither the name of TagUnit nor the names of its contributors may
- be used to endorse or promote products derived from this software
- without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/rss/.cvsignore b/rss/.cvsignore
deleted file mode 100644
index 3586368..0000000
--- a/rss/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-build
-dist
-*.bat
\ No newline at end of file
diff --git a/rss/GoogleRSS.iml b/rss/GoogleRSS.iml
deleted file mode 100644
index 36999e8..0000000
--- a/rss/GoogleRSS.iml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-googleapi.jar) should be placed
-into the application's WEB-INF/lib directory.
-web.xml) as follows:
-
-
-<context-param>
-
<param-name>google_key</param-name>
<param-value>000000000000000000000000</param-value>
</context-param>
-Click here for licensing information.
-