########## admin ##########
# language: english
-# $Id: admin_en.properties,v 1.48.2.1 2003/06/19 02:24:12 zapata Exp $
+# $Id: admin_en.properties,v 1.48.2.2 2003/06/21 04:02:08 zapata Exp $
languagename=English
producer.job.cancel = cancel
producer.job.abort = abort
producer.job.empty = Queue is empty
+producer.job.runningtime = Running time
producer.jobqueue.title = Current jobs
producer.jobqueue.refresh = refresh
import java.util.Vector;
import mir.log.LoggerWrapper;
-import mir.util.RewindableIterator;
+import mir.util.*;
import org.apache.commons.beanutils.*;
return makeIteratorAdapter((Iterator) anObject);
else if (anObject instanceof List)
return makeIteratorAdapter(((List) anObject).iterator());
+ else if (anObject instanceof Number)
+ return makeAdapter(new GeneratorFormatAdapters.NumberFormatAdapter((Number) anObject));
else
return makeBeanAdapter(anObject);
-// throw new TemplateModelException("Unadaptable class: " + anObject.getClass().getName());
}
private static class MapAdapter implements TemplateModelRoot {
--- /dev/null
+package mir.util;
+
+import java.util.*;
+import java.text.*;
+import mir.generator.*;
+
+public class GeneratorFormatAdapters {
+ public static class NumberFormatAdapter {
+ private Number value;
+
+ public NumberFormatAdapter(Number aValue) {
+ value = aValue;
+ }
+
+ public Generator.GeneratorFunction getFormat() {
+ return new NumberFormattingFunction(value);
+ }
+
+ private static class NumberFormattingFunction implements Generator.GeneratorFunction {
+ private Number value;
+
+ public NumberFormattingFunction(Number aValue) {
+ value = aValue;
+ }
+
+ public Object perform(List aParameters) throws GeneratorExc, GeneratorFailure {
+ try {
+ if (aParameters.size()!=1 || !(aParameters.get(0) instanceof String) )
+ throw new GeneratorExc("NumberFormattingFunction <format> : exactly 1 string parameter expected");
+
+ return new DecimalFormat((String) (aParameters.get(0))).format(value);
+ }
+ catch (GeneratorExc e) {
+ throw e;
+ }
+ catch (Throwable t) {
+ throw new GeneratorFailure("NumberFormattingFunction: " + t.getMessage(), t);
+ }
+ };
+ }
+ }
+
+}
\ No newline at end of file
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
- * and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than
- * the above mentioned libraries. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so.
+ * the code of this program with any library licensed under the Apache Software License,
+ * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
+ * (or with modified versions of the above that use the same license as the above),
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
package mircoders.global;
+
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.HashMap;
public class Job implements Cloneable {
private Object data;
private Date lastChange;
+ private long starttime;
+ private long endtime;
private String identifier;
private int status;
private int priority;
+ private boolean hasRun;
public Job(Object aData, String anIdentifier, int aStatus, int aPriority, Date aLastChange) {
data = aData;
identifier = anIdentifier;
priority = aPriority;
lastChange = aLastChange;
+
+ hasRun = false;
}
public Job(Object aData, String anIdentifier, int aStatus, int aPriority) {
this(aData, anIdentifier, aStatus, aPriority, (new GregorianCalendar()).getTime());
}
- public Date getLastChange() {
- return lastChange;
- }
-
- public String getIdentifier() {
- return identifier;
- }
-
public Job(Object aData, String anIdentifier) {
this(aData, anIdentifier, STATUS_PENDING, PRIORITY_NORMAL);
}
}
}
+ public Date getLastChange() {
+ return lastChange;
+ }
+
+ public String getIdentifier() {
+ return identifier;
+ }
+
+ public long getRunningTime() {
+ long result = 0;
+
+ if (hasRun) {
+ if (isFinished())
+ result = endtime;
+ else
+ result = System.currentTimeMillis();
+
+ result = result-starttime;
+ }
+
+ return result;
+ }
+
public int getPriority() {
return priority;
}
if (status == anOldStatus) {
status = aNewStatus;
lastChange = (new GregorianCalendar()).getTime();
+ if (isProcessing()) {
+ starttime = System.currentTimeMillis();
+ hasRun = true;
+ }
+
+ if (isFinished()) {
+ endtime = System.currentTimeMillis();
+ }
return true;
}
else {
result.put("factory", producerJob.getFactoryName());
result.put("verb", producerJob.getVerb());
result.put("priority", new Integer(aJob.getPriority()));
+ result.put("runningtime", new Double((double) aJob.getRunningTime()/1000));
result.put("status", convertStatus(aJob));
result.put("lastchange", new DateToMapAdapter(aJob.getLastChange()));
MirGlobal.accessControl().user().assertMayEditUser(ServletHelper.getUser(aRequest), user);
Map withValues = getIntersectingValues(aRequest, mainModule.getStorageObject());
+ if (!withValues.containsKey("is_admin"))
+ withValues.put("is_admin","0");
String newPassword=validatePassword(ServletHelper.getUser(aRequest), requestParser);
if (newPassword!=null)
-
-
<function PulldownTableRow (label, fieldname, entrieslist, keyfield, valuefield, value, langprefix)>
<tr>
<td align="right" class="table-left">
<td class="bg-neutral" colspan="2"><b>${lang("producer.job.name")}</b></td>
<td class="bg-neutral" ><b>${lang("producer.job.status")}</b></td>
<td class="bg-neutral small" ><b>${lang("producer.job.date")}</b></td>
+ <td class="bg-neutral small" ><b>${lang("producer.job.runningtime")}</b></td>
<comment>
<td class="box-head" > </td>
</comment>
</if>
<td class="small">${q.lastchange["HH:mm:ss"]}</td>
+ <td class="small">${q.runningtime.format("####.#")}s</td>
<comment> ML: needs to be implemented
<td><a href="${config.actionRoot}?module=Producer&do=abort">${lang("producer.job.cancel")}</a></td>
</comment>
projects / mir.git / commitdiff