Menu
▾
▴
[Qtitools-commits] SF.net SVN: qtitools:[2392] Mathqurate/trunk/mathqurate
|
From: <lo...@us...> - 2010-03-22 09:02:30
|
Revision: 2392
http://qtitools.svn.sourceforge.net/qtitools/?rev=2392&view=rev
Author: loccy
Date: 2010-03-22 09:02:22 +0000 (Mon, 22 Mar 2010)
Log Message:
-----------
MQ: Tweaks to metadata template, changed keyword delimiter to comma, tweaked layout of Snuggletex editor based on user feedback.
Modified Paths:
--------------
Mathqurate/trunk/mathqurate/src/main/java/org/qtitools/mathqurate/model/MQContentPackage.java
Mathqurate/trunk/mathqurate/src/main/java/org/qtitools/mathqurate/view/SnuggleTeXView.java
Mathqurate/trunk/mathqurate/src/main/resources/org/qtitools/mathqurate/resources/md-template.xml
Property Changed:
----------------
Mathqurate/trunk/mathqurate/
Property changes on: Mathqurate/trunk/mathqurate
___________________________________________________________________
Added: svn:ignore
+ .classpath
.project
target
.settings
Modified: Mathqurate/trunk/mathqurate/src/main/java/org/qtitools/mathqurate/model/MQContentPackage.java
===================================================================
--- Mathqurate/trunk/mathqurate/src/main/java/org/qtitools/mathqurate/model/MQContentPackage.java 2010-03-19 16:09:08 UTC (rev 2391)
+++ Mathqurate/trunk/mathqurate/src/main/java/org/qtitools/mathqurate/model/MQContentPackage.java 2010-03-22 09:02:22 UTC (rev 2392)
@@ -66,7 +66,7 @@
public MQContentPackage(AssessmentItemType assessmentItemType) {
assessmentItemType.setToolName("Mathqurate");
- assessmentItemType.setToolVersion("0.9.7");
+ assessmentItemType.setToolVersion("0.9.7b");
this.contentXML = MQModel.mathqurateObjectFactory.getTypeAsXML(assessmentItemType);
@@ -451,10 +451,11 @@
String keywordsString = mdmap.get(MQMetadata.KEYWORDS[0]);
if (keywordsString != null) // shouldn't happen, but just in case
{
- String[] keywords = keywordsString.split("\\s+");
+ String[] keywords = keywordsString.split(",");
String xmlString = "";
for (String keyword : keywords)
{
+ keyword = keyword.trim();
xmlString += "<imsmd:keyword><imsmd:langstring xml:lang=\"en\">"+keyword+"</imsmd:langstring></imsmd:keyword>\n";
}
template = template.replace("<!-- KEYWORDSHERE -->",xmlString);
@@ -518,20 +519,11 @@
"</resource>";*/
// resource stuff
- template = template.replace("{{RES-ID}}",String.valueOf(UUID.randomUUID()));
+ template = template.replace("{{RES-ID}}","id-"+String.valueOf(UUID.randomUUID()));
// TODO: may need to sort out filename
template = template.replace("{{FILENAME}}", mdmap.get(MQMetadata.FILENAME[0]));
- // time dependent
- template = template.replace("{{TIMEDEPENDENT}}", mdmap.get(MQMetadata.TIMEDEPENDENT[0]));
-
- // solution available
- template = template.replace("{{SOLUTIONAVAILABLE}}", mdmap.get(MQMetadata.SOLUTIONAVAILABLE[0]));
-
- // tool version
- template = template.replace("{{MQVERSION}}", mdmap.get(MQMetadata.TOOLVERSION[0]));
-
// that should be everything in {{xxx}} notation, but wipe out anything we missed
template = template.replaceAll("\\{\\{.+\\}", "");
@@ -542,9 +534,27 @@
metaelement = metaelement.replace("<!-- MDSTART -->", "");
//System.out.println(metaelement);
+ String qtiMD = "<imsqti:qtiMetadata>"+
+ "<imsqti:timeDependent>{{TIMEDEPENDENT}}</imsqti:timeDependent>"+
+ "<imsqti:solutionAvailable>{{SOLUTIONAVAILABLE}}</imsqti:solutionAvailable>"+
+ "<imsqti:toolName>Mathqurate</imsqti:toolName>"+
+ "<imsqti:toolVersion>{{MQVERSION}}</imsqti:toolVersion>"+
+ "</imsqti:qtiMetadata>";
+
+ metaelement = metaelement.replace("</metadata>", qtiMD+"</metadata>");
+
// duplicate metadata within question resource
template = template.replace("<!-- METADATA -->", metaelement);
+ // time dependent
+ template = template.replace("{{TIMEDEPENDENT}}", mdmap.get(MQMetadata.TIMEDEPENDENT[0]));
+
+ // solution available
+ template = template.replace("{{SOLUTIONAVAILABLE}}", mdmap.get(MQMetadata.SOLUTIONAVAILABLE[0]));
+
+ // tool version
+ template = template.replace("{{MQVERSION}}", mdmap.get(MQMetadata.TOOLVERSION[0]));
+
// clear up any remaining comments
template = template.replaceAll("\\<!--.+--\\>", "");
@@ -603,11 +613,17 @@
{
public String getNamespaceURI(String prefix) {
- return("http://www.imsglobal.org/xsd/imsmd_v1p2");
+ if (prefix.equals("cp"))
+ {
+ return ("http://www.imsglobal.org/xsd/imscp_v1p1");
+ } else return("http://www.imsglobal.org/xsd/imsmd_v1p2");
}
public String getPrefix(String namespaceURI) {
- return "lom";
+ if (namespaceURI.equals("http://www.imsglobal.org/xsd/imscp_v1p1"))
+ {
+ return "cp";
+ } else return "lom";
}
public Iterator getPrefixes(String namespaceURI) {
@@ -667,12 +683,16 @@
description = description.trim();
// keywords
- expr = xpath.compile("//lom:general/lom:keyword");
+ expr = xpath.compile("//cp:manifest/cp:metadata/lom:lom/lom:general/lom:keyword");
NodeList keywordsList = (NodeList)expr.evaluate(element, XPathConstants.NODESET);
String keywords = "";
for (int i = 0; i < keywordsList.getLength(); i++)
{
- keywords += keywordsList.item(i).getTextContent().trim()+" ";
+ keywords += keywordsList.item(i).getTextContent().replaceAll(",","").trim();
+ if (i != keywordsList.getLength()-1)
+ {
+ keywords += ", ";
+ }
}
// author, author!
Modified: Mathqurate/trunk/mathqurate/src/main/java/org/qtitools/mathqurate/view/SnuggleTeXView.java
===================================================================
--- Mathqurate/trunk/mathqurate/src/main/java/org/qtitools/mathqurate/view/SnuggleTeXView.java 2010-03-19 16:09:08 UTC (rev 2391)
+++ Mathqurate/trunk/mathqurate/src/main/java/org/qtitools/mathqurate/view/SnuggleTeXView.java 2010-03-22 09:02:22 UTC (rev 2392)
@@ -52,7 +52,11 @@
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.MouseEvent;
import org.eclipse.swt.events.MouseListener;
+import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.layout.RowData;
+import org.eclipse.swt.layout.RowLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
@@ -205,7 +209,7 @@
protected Control createContents(Composite parent) {
Label label = new Label(parent, SWT.WRAP);
- label.setText("Insert latex math in left pane. View results in right pane. "
+ label.setText("Insert latex math in top pane. View results in bottom pane. "
+ "Remember to use math mode and delimit with a '\\', e.g. \\[x+y\\] ");
Composite mathview = new Composite(parent, SWT.NONE);
@@ -215,14 +219,25 @@
text.addModifyListener(new MyModifyListener());
text.setText("\\[\\]");
+ GridData textSizing = new GridData(450,70);
+ textSizing.horizontalAlignment = GridData.FILL;
+ textSizing.grabExcessHorizontalSpace = true;
+ text.setLayoutData(textSizing);
renderer = new Browser(mathview, SWT.MOZILLA );
-
- renderer.setLayoutData(new GridData(GridData.FILL_BOTH));
+ GridData rendererSizing = new GridData(450,350);
+ rendererSizing.horizontalAlignment = GridData.FILL;
+ rendererSizing.grabExcessHorizontalSpace = true;
+ rendererSizing.verticalAlignment = GridData.FILL;
+ rendererSizing.grabExcessVerticalSpace = true;
- GridLayoutFactory.fillDefaults().numColumns(1).generateLayout(
- mathview);
+ renderer.setLayoutData(rendererSizing);
+
+ mathview.setLayout(new GridLayout());
+
+
}
+
Composite buttonBar = new Composite(parent, SWT.NONE);
{
Button buttonApply = new Button(buttonBar,SWT.NONE);
Modified: Mathqurate/trunk/mathqurate/src/main/resources/org/qtitools/mathqurate/resources/md-template.xml
===================================================================
--- Mathqurate/trunk/mathqurate/src/main/resources/org/qtitools/mathqurate/resources/md-template.xml 2010-03-19 16:09:08 UTC (rev 2391)
+++ Mathqurate/trunk/mathqurate/src/main/resources/org/qtitools/mathqurate/resources/md-template.xml 2010-03-22 09:02:22 UTC (rev 2392)
@@ -183,14 +183,8 @@
<organizations/>
<resources>
<resource identifier="{{RES-ID}}" type="imsqti_item_xmlv2p1" href="{{FILENAME}}">
- <file href="{{FILENAME}}"/>
<!-- METADATA -->
- <imsqti:qtiMetadata>
- <imsqti:timeDependent>{{TIMEDEPENDENT}}</imsqti:timeDependent>
- <imsqti:solutionAvailable>{{SOLUTIONAVAILABLE}}</imsqti:solutionAvailable>
- <imsqti:toolName>Mathqurate</imsqti:toolName>
- <imsqti:toolVersion>{{MQVERSION}}</imsqti:toolVersion>
- </imsqti:qtiMetadata>
+ <file href="{{FILENAME}}"/>
</resource>
</resources>
</manifest>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
