Index: lams_tool_pixlr/db/sql/create_lams_tool_pixlr.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/db/sql/create_lams_tool_pixlr.sql,v
diff -u -r1.1 -r1.2
--- lams_tool_pixlr/db/sql/create_lams_tool_pixlr.sql	7 Jan 2009 22:37:49 -0000	1.1
+++ lams_tool_pixlr/db/sql/create_lams_tool_pixlr.sql	8 Jan 2009 02:39:51 -0000	1.2
@@ -26,7 +26,10 @@
 	reflect_on_activity,
 	allow_view_others_images,
 	image_width, 
-	image_height) 
+	image_height,
+	image_file_name
+	
+) 
 VALUES(
 	"Pixlr",
 	"Instructions",
@@ -40,6 +43,7 @@
 	0,
 	1,
 	200,
-	200
+	200,
+	"blank.jpg"
 );
 
Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java,v
diff -u -r1.2 -r1.3
--- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java	8 Jan 2009 00:23:58 -0000	1.2
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java	8 Jan 2009 02:39:51 -0000	1.3
@@ -225,15 +225,27 @@
 
 	File existingFile = new File(realBaseDir + File.separator + toContent.getImageFileName());
 
-	if (existingFile.exists()) {
+	if (existingFile.exists() && existingFile.canRead()) {
 	    String ext = getFileExtension(toContent.getImageFileName());
 	    String newFileName = FileUtil.generateUniqueContentFolderID() + ext;
 
 	    String newFilePath = realBaseDir + File.separator + newFileName;
 	    copyFile(existingFile, newFilePath);
 	    return newFileName;
 	} else {
-	    return null;
+	    // if cant find or read the file, just copy the default image file
+	    if (existingFile.exists() && existingFile.canRead()) {
+        	File existingFile2 = new File(getDefaultContent().getImageFileName());
+		String ext = getFileExtension(toContent.getImageFileName());
+		String newFileName = FileUtil.generateUniqueContentFolderID() + ext;
+		String newFilePath = realBaseDir + File.separator + newFileName;
+		copyFile(existingFile2, newFilePath);
+		return newFileName;
+	    }
+	    else
+	    {
+		throw new PixlrException("Could not find file to copy");
+	    }
 	}
     }
 
@@ -375,7 +387,7 @@
 		copyFile(imageFile, newFilePath);
 		pixlr.setImageFileName(newFileName);
 	    } else {
-		pixlr.setImageFileName(PixlrConstants.DEFAULT_IMAGE_FILE_NAME);
+		pixlr.setImageFileName(getDefaultContent().getImageFileName());
 	    }
 
 	    pixlrDAO.saveOrUpdate(pixlr);
Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java,v
diff -u -r1.2 -r1.3
--- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java	8 Jan 2009 00:23:58 -0000	1.2
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java	8 Jan 2009 02:39:51 -0000	1.3
@@ -142,11 +142,11 @@
 	Boolean imageExists = false;
 	if ((pixlr.getImageFileName() != null && !pixlr.getImageFileName().equals(""))) {
 	    imageUrl += pixlr.getImageFileName();
-	    if (!pixlr.getImageFileName().equals(PixlrConstants.DEFAULT_IMAGE_FILE_NAME)) {
+	    if (!pixlr.getImageFileName().equals(pixlrService.getDefaultContent().getImageFileName())) {
 		imageExists = true;
 	    }
 	} else {
-	    imageUrl += PixlrConstants.DEFAULT_IMAGE_FILE_NAME;
+	    imageUrl += pixlrService.getDefaultContent().getImageFileName();
 	}
 	request.setAttribute("imageURL", imageUrl);
 	request.setAttribute("imageExists", imageExists);
Index: lams_tool_pixlr/web/pages/learning/pixlr.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/web/pages/learning/pixlr.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_pixlr/web/pages/learning/pixlr.jsp	7 Jan 2009 22:37:49 -0000	1.1
+++ lams_tool_pixlr/web/pages/learning/pixlr.jsp	8 Jan 2009 02:39:51 -0000	1.2
@@ -80,7 +80,7 @@
 
 	<br />
 	<div style="text-align:center;">
-		<img id="image" title='<fmt:message key="tooltip.openfullsize" />' onclick="openImage('${currentImageURL}')" src="${currentImageURL}" />
+		<img id="image" border="1" title='<fmt:message key="tooltip.openfullsize" />' onclick="openImage('${currentImageURL}')" src="${currentImageURL}" />
 		
 		<br />
 		<br />
@@ -107,11 +107,17 @@
 	
 	if (image.height >= image.width)
 	{
-		image.height = 300;
+		if (image.height > 300)
+		{
+			image.height = 300;
+		}
 	}
 	else
 	{
-		image.width = 300;
+		if (image.width > 300)
+		{
+			image.width = 300;
+		}
 	}
 //-->
 </script>