You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2005/12/08 01:26:29 UTC
svn commit: r354918 - in /portals/jetspeed-2/trunk/applications/j2-admin/src:
java/org/apache/jetspeed/portlets/statistics/ webapp/WEB-INF/
webapp/WEB-INF/view/selectors/ webapp/WEB-INF/view/statistics/
Author: taylor
Date: Wed Dec 7 16:26:25 2005
New Revision: 354918
URL: http://svn.apache.org/viewcvs?rev=354918&view=rev
Log:
patch from Chris Schaefer:
* statistics cleanup per request from Ate Douma
* cleanup of Portlet Selector
Modified:
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/statistics/StatisticsPortlet.java
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/portlet.xml
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/selectors/portlet-selector.vm
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/statistics/statistics.vm
Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/statistics/StatisticsPortlet.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/statistics/StatisticsPortlet.java?rev=354918&r1=354917&r2=354918&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/statistics/StatisticsPortlet.java (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/statistics/StatisticsPortlet.java Wed Dec 7 16:26:25 2005
@@ -124,7 +124,23 @@
{
timeperiod = "all";
}
- criteria.setListsize("5");
+
+ String listsizeStr = request.getParameter("listsize");
+ if(listsizeStr == null)
+ {
+ listsizeStr = "5";
+ } else
+ {
+ try
+ {
+ Integer.parseInt(listsizeStr);
+ } catch (NumberFormatException e)
+ {
+ // if we can't parse it.. just make it 5
+ listsizeStr = "5";
+ }
+ }
+ criteria.setListsize(listsizeStr);
criteria.setSorttype("count");
criteria.setSortorder("desc");
Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/portlet.xml?rev=354918&r1=354917&r2=354918&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/portlet.xml (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/portlet.xml Wed Dec 7 16:26:25 2005
@@ -794,7 +794,7 @@
<portlet-preferences>
<preference>
<name>WindowSize</name>
- <value>15</value>
+ <value>100</value>
</preference>
</portlet-preferences>
<portlet-info>
Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/selectors/portlet-selector.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/selectors/portlet-selector.vm?rev=354918&r1=354917&r2=354918&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/selectors/portlet-selector.vm (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/selectors/portlet-selector.vm Wed Dec 7 16:26:25 2005
@@ -59,10 +59,27 @@
}
// adding the ones NOT on this particular form
result = userform.allTheCheckedString.value + result;
-
outform.checkedSet.value = result;
outform.unCheckedSet.value = noncheckedresult;
}
+
+
+
+ function eliminateDuplicates(instr)
+ {
+ var dicta = new Object;
+ var anarray = instr.split(",");
+ for(var i=0; i<anarray.length; i++)
+ {
+ dicta[anarray[i]]= anarray[i];
+ }
+ var uniques = new Array;
+ for (var k in dicta) {
+ uniques.push(dicta[k]);
+ }
+ return uniques.join(",");
+ }
+
function sendChecks(form)
{
var result = "";
@@ -77,12 +94,12 @@
}
}
}
- result = form.allTheCheckedString.value + result;
+ result = form.allTheCheckedString.value + result;
+ result = eliminateDuplicates(result);
var openerForm = opener.document.forms['portletform'];
var openerEl = openerForm.elements['portlets'];
openerEl.value = result;
- alert("we about to add "+result);
window.close();
openerForm.submit();
}
@@ -246,11 +263,11 @@
<tr>
<td colspan="3" align="center" >
- there are now $selectedPortlets.size() portlet selected
- <input type="submit" name="select.portlets" value="Select Portlets" />
+ <input type="submit" name="select.portlets" value="Select Portlets" />
<!-- class="jetdbButton" too narrow to use-->
<input type='hidden' name='searchColumn' value='1'/>
</td>
+
</tr>
</table>
Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/statistics/statistics.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/statistics/statistics.vm?rev=354918&r1=354917&r2=354918&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/statistics/statistics.vm (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/statistics/statistics.vm Wed Dec 7 16:26:25 2005
@@ -1,5 +1,17 @@
<h3 class="portlet-section-header">Portal Statistics</h3>
+<script language="JavaScript" type="text/javascript">
+ <!--
+
+ function checkAndSubmit() {
+ // should check that listsize is valid
+ //document.criteriaForm.listsize.value;
+ document.criteriaForm.submit();
+ }
+
+ //-->
+</script>
+
<div id="StatisticsPortlet" class="portlet-section-text">
<form name="criteriaForm" action="$renderResponse.createActionURL()" method="post">
<table>
@@ -7,10 +19,10 @@
total sessions in progress: $!totalsessions
</td></tr>
<tr><td>
- <table class=""portlet-section-body">
- <tr class="portlet-section-subheader"><th>
+ <table class="portlet-section-body">
+ <tr class="portlet-section-subheader"><td>
statistics are for
- </hr></tr>
+ </td></tr>
<tr class="portlet-section-alternate"><td>
<SELECT name="queryType" onChange="criteriaForm.submit();">
<OPTION
@@ -36,7 +48,7 @@
</table>
</td><td>
- <table class=""portlet-section-body">
+ <table class="portlet-section-body">
<tr class="portlet-section-subheader"><th colspan="2" align="center" >for time periods </th></tr>
<tr class="portlet-section-alternate"><td>
<input type="radio" name="timeperiod" value="1" onclick="criteriaForm.submit();"
@@ -108,7 +120,7 @@
</table>
<table><tr><td>
<center>stats for all ${criteria.queryType}s</center>
- <table class="class="portlet-section-body" >
+ <table class="portlet-section-body" >
<tr class="portlet-section-subheader"><TH><b>stat name</b></TH><TH><b align="right" >value</b></TH></TR>
<tr class="portlet-section-alternate"><TD>total hits</TD><TD align="right" >$!results.hitCount</TD></TR>
<tr class="portlet-section-body"><TD>max time</TD><TD align="right" >$!results.maxProcessingTime</TD></TR>
@@ -116,8 +128,8 @@
<tr class="portlet-section-body"><TD>min time</TD><TD align="right" >$!results.minProcessingTime</TD></TR>
</table>
</td><td>
- <center>Top $criteria.listsize ${criteria.queryType}s sorted by $criteria.sorttype $criteria.sortorder</center>
- <table class="class="portlet-section-body" >
+ <center>Top <input type="text" size="3" name="listsize" onchange="checkAndSubmit(); " value="$criteria.listsize" /> ${criteria.queryType}s sorted by $criteria.sorttype $criteria.sortorder</center>
+ <table class="portlet-section-body" >
<tr class="portlet-section-subheader">
<TH><b>$criteria.queryType</b>
</TH><TH><b>count</b></TH>
@@ -132,7 +144,7 @@
<td align="right" > $row.get("max") </td>
<td align="right" > $row.get("avg") </td>
<td align="right" > $row.get("min") </td>
- <tr>
+ </tr>
#end
</table>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org