[Qtitools-commits] SF.net SVN: qtitools:[2394] Mathqurate/trunk/mathqurate/src/main/java/org/ qtitools/mathqurate/model

[<lo...@us...>]

Revision: 2394
          http://qtitools.svn.sourceforge.net/qtitools/?rev=2394&view=rev
Author:   loccy
Date:     2010-03-22 12:06:34 +0000 (Mon, 22 Mar 2010)

Log Message:
-----------
MQ: Fixed support for licence metadata entry. Also slight tweak to prevent problems on Linux in the CP handling code.

Modified Paths:
--------------
    Mathqurate/trunk/mathqurate/src/main/java/org/qtitools/mathqurate/model/MQContentPackage.java
    Mathqurate/trunk/mathqurate/src/main/java/org/qtitools/mathqurate/model/MQObjectFactory.java

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-22 09:14:33 UTC (rev 2393)
+++ Mathqurate/trunk/mathqurate/src/main/java/org/qtitools/mathqurate/model/MQContentPackage.java	2010-03-22 12:06:34 UTC (rev 2394)
@@ -729,6 +729,12 @@
 				taxon = taxon.trim();
 			}
 			
+			// licence URL
+			expr = xpath.compile("//lom:rights/lom:description/lom:langstring");
+			String licence = (String)expr.evaluate(element, XPathConstants.STRING);
+			licence = software.trim();
+			
+			
 			// switch namespaces - need QTI for these three
 			xpath.setNamespaceContext(ncImsQti);
 			expr = xpath.compile("//imsqti:timeDependent");
@@ -773,6 +779,7 @@
 			mdresults.put(MQMetadata.SOLUTIONAVAILABLE[0],solutionAvailable);
 			mdresults.put(MQMetadata.TOOLVERSION[0],toolVersion);
 			mdresults.put(MQMetadata.FILENAME[0],fileHref);
+			mdresults.put(MQMetadata.LICENCEURL[0], licence);
 			
 			return mdresults;
 		}

Modified: Mathqurate/trunk/mathqurate/src/main/java/org/qtitools/mathqurate/model/MQObjectFactory.java
===================================================================
--- Mathqurate/trunk/mathqurate/src/main/java/org/qtitools/mathqurate/model/MQObjectFactory.java	2010-03-22 09:14:33 UTC (rev 2393)
+++ Mathqurate/trunk/mathqurate/src/main/java/org/qtitools/mathqurate/model/MQObjectFactory.java	2010-03-22 12:06:34 UTC (rev 2394)
@@ -2473,7 +2473,7 @@
 	{
 		// first, make a temporary directory to work in
 		String systemTemp = System.getProperty("java.io.tmpdir");
-		String zipLocation = systemTemp+"tempzip";
+		String zipLocation = systemTemp+"/tempzip";
 		new File(zipLocation).mkdir();
 		
 		// MQ's CPs will flatten out the directory structure - seems little point


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.