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

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

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

Log Message:
-----------
MQ: Missed a spot on licence metadata fix. Also, added delete any existing zip on save - previous behaviour would ADD new files to the zip, meaning you'd end up with a bizarre hybrid CP if you replaced a CP file with a different one.

Modified Paths:
--------------
    Mathqurate/trunk/mathqurate/src/main/java/org/qtitools/mathqurate/model/MQContentPackage.java
    Mathqurate/trunk/mathqurate/src/main/java/org/qtitools/mathqurate/utilities/ZipHelper.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 12:06:34 UTC (rev 2394)
+++ Mathqurate/trunk/mathqurate/src/main/java/org/qtitools/mathqurate/model/MQContentPackage.java	2010-03-22 12:21:55 UTC (rev 2395)
@@ -732,7 +732,7 @@
 			// licence URL
 			expr = xpath.compile("//lom:rights/lom:description/lom:langstring");
 			String licence = (String)expr.evaluate(element, XPathConstants.STRING);
-			licence = software.trim();
+			licence = licence.trim();
 			
 			
 			// switch namespaces - need QTI for these three

Modified: Mathqurate/trunk/mathqurate/src/main/java/org/qtitools/mathqurate/utilities/ZipHelper.java
===================================================================
--- Mathqurate/trunk/mathqurate/src/main/java/org/qtitools/mathqurate/utilities/ZipHelper.java	2010-03-22 12:06:34 UTC (rev 2394)
+++ Mathqurate/trunk/mathqurate/src/main/java/org/qtitools/mathqurate/utilities/ZipHelper.java	2010-03-22 12:21:55 UTC (rev 2395)
@@ -59,6 +59,13 @@
 	// nabbed from http://www.crazysquirrel.com/computing/java/basics/java-directory-zipping.jspx
 	 
 	public static void zipDirectory( File directory, File zip ) throws IOException {
+		
+		// delete zip first if we're overwriting.
+		if (zip.exists())
+		{
+			zip.delete();
+		}
+		
 		ZipOutputStream zos = new ZipOutputStream( new FileOutputStream( zip ) );
 		zip( directory, directory, zos );
 		zos.close();


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