Index: tool_adapters/moodle/lams_tool_mdlwiki/src/java/org/lamsfoundation/lams/tool/mdwiki/service/MdlWikiOutputFactory.java
===================================================================
diff -u -r086d0769471647a32761d96d5fb630b4787880d1 -r328844a4a81dbe57391d45509bef82c300e9c13b
--- tool_adapters/moodle/lams_tool_mdlwiki/src/java/org/lamsfoundation/lams/tool/mdwiki/service/MdlWikiOutputFactory.java	(.../MdlWikiOutputFactory.java)	(revision 086d0769471647a32761d96d5fb630b4787880d1)
+++ tool_adapters/moodle/lams_tool_mdlwiki/src/java/org/lamsfoundation/lams/tool/mdwiki/service/MdlWikiOutputFactory.java	(.../MdlWikiOutputFactory.java)	(revision 328844a4a81dbe57391d45509bef82c300e9c13b)
@@ -29,14 +29,17 @@
 import org.lamsfoundation.lams.tool.ToolOutput;
 import org.lamsfoundation.lams.tool.ToolOutputDefinition;
 import org.lamsfoundation.lams.tool.exception.ToolException;
+import org.lamsfoundation.lams.tool.mdwiki.service.IMdlWikiService;
 import org.lamsfoundation.lams.tool.mdwiki.model.MdlWiki;
 
 /**
  * Creates the output definitions for mdlwiki tool Adapter tool.
  */
 public class MdlWikiOutputFactory extends OutputFactory {
 
-    protected final static String OUTPUT_NAME_LEARNER_GRADE = "learner.percentage.grade";
+	protected final static String OUTPUT_NAME_LEARNER_NUM_ENTRIES = "learner.number.of.entries";
+    protected final static String OUTPUT_NAME_LEARNER_NUM_PAGES = "learner.number.of.pages";
+    protected final static String OUTPUT_NAME_LEARNER_NUM_ENTRIES_PAGES = "learner.number.of.entries.or.pages";
 
     public MdlWikiOutputFactory() {
     }
@@ -45,26 +48,40 @@
      * @see org.lamsfoundation.lams.tool.OutputDefinitionFactory#getToolOutputDefinitions(java.lang.Object)
      */
     public SortedMap<String, ToolOutputDefinition> getToolOutputDefinitions(Object toolContentObject)
-	    throws ToolException {
-		TreeMap<String, ToolOutputDefinition> definitionMap = new TreeMap<String, ToolOutputDefinition>();
+    throws ToolException {
+	TreeMap<String, ToolOutputDefinition> definitionMap = new TreeMap<String, ToolOutputDefinition>();
 	
-		ToolOutputDefinition definition = buildRangeDefinition(OUTPUT_NAME_LEARNER_GRADE, new Long(0), null);
-		definitionMap.put(OUTPUT_NAME_LEARNER_GRADE, definition);
+	ToolOutputDefinition definition = buildRangeDefinition(OUTPUT_NAME_LEARNER_NUM_ENTRIES, new Long(0), null);
+	definitionMap.put(OUTPUT_NAME_LEARNER_NUM_ENTRIES, definition);
 	
-		return definitionMap;
-    }
-
-    public SortedMap<String, ToolOutput> getToolOutput(List<String> names, IMdlWikiService dlWikiService,
+	ToolOutputDefinition definition2 = buildRangeDefinition(OUTPUT_NAME_LEARNER_NUM_PAGES, new Long(0), null);
+	definitionMap.put(OUTPUT_NAME_LEARNER_NUM_PAGES, definition2);
+	
+	ToolOutputDefinition definition3 = buildRangeDefinition(OUTPUT_NAME_LEARNER_NUM_ENTRIES_PAGES, new Long(0), null);
+	definitionMap.put(OUTPUT_NAME_LEARNER_NUM_ENTRIES_PAGES, definition3);
+	
+	return definitionMap;
+	}
+	
+	public SortedMap<String, ToolOutput> getToolOutput(List<String> names, IMdlWikiService dlWikiService,
 	    Long toolSessionId, Long learnerId, MdlWiki mdlWiki, Long extSessionId) {
+	
+	TreeMap<String, ToolOutput> map = new TreeMap<String, ToolOutput>();
+	if (names == null || names.contains(OUTPUT_NAME_LEARNER_NUM_ENTRIES)) {
+	    map.put(OUTPUT_NAME_LEARNER_NUM_ENTRIES, getExtToolOutput(OUTPUT_NAME_LEARNER_NUM_ENTRIES, dlWikiService,
+		    mdlWiki, learnerId, extSessionId.toString(), toolSessionId));
+	}
+	if (names.contains(OUTPUT_NAME_LEARNER_NUM_PAGES)) {
+	    map.put(OUTPUT_NAME_LEARNER_NUM_PAGES, getExtToolOutput(OUTPUT_NAME_LEARNER_NUM_PAGES, dlWikiService,
+		    mdlWiki, learnerId, extSessionId.toString(), toolSessionId));
+	}
+	if (names.contains(OUTPUT_NAME_LEARNER_NUM_ENTRIES_PAGES)) {
+	    map.put(OUTPUT_NAME_LEARNER_NUM_ENTRIES_PAGES, getExtToolOutput(OUTPUT_NAME_LEARNER_NUM_ENTRIES_PAGES, dlWikiService,
+		    mdlWiki, learnerId, extSessionId.toString(), toolSessionId));
+	}
+	return map;
+}
 
-		TreeMap<String, ToolOutput> map = new TreeMap<String, ToolOutput>();
-		if (names == null || names.contains(OUTPUT_NAME_LEARNER_GRADE)) {
-		    map.put(OUTPUT_NAME_LEARNER_GRADE, getExtToolOutput(OUTPUT_NAME_LEARNER_GRADE, dlWikiService,
-			    mdlWiki, learnerId, extSessionId.toString(), toolSessionId));
-		}
-		return map;
-    }
-
     public ToolOutput getToolOutput(String name, IMdlWikiService dlWikiService, Long toolSessionId, Long learnerId,
 	    MdlWiki getToolOutput, Long extSessionId) {
 		if (name != null) {