Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java,v
diff -u -r1.7 -r1.8
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java	4 Jul 2008 04:28:24 -0000	1.7
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java	8 Jul 2008 04:09:11 -0000	1.8
@@ -26,6 +26,7 @@
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.StringReader;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Hashtable;
@@ -36,6 +37,8 @@
 import java.util.TreeMap;
 
 import javax.servlet.http.HttpSession;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
@@ -86,6 +89,11 @@
 import org.lamsfoundation.lams.util.audit.IAuditService;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
 
 /**
  * An implementation of the IGmapService interface.
@@ -614,7 +622,6 @@
     public void import102ToolContent(Long toolContentId, UserDTO user, Hashtable importValues)
     {
     	Date now = new Date();
-    	
     	Gmap gmap = new Gmap();
     	gmap.setContentInUse(Boolean.FALSE);
     	gmap.setCreateBy(new Long(user.getUserID().longValue()));
@@ -628,10 +635,6 @@
     	gmap.setTitle((String)importValues.get(ToolContentImport102Manager.CONTENT_TITLE));
     	gmap.setToolContentId(toolContentId);
     	gmap.setUpdateDate(now);
-    	//gmap.setAllowRichEditor(Boolean.FALSE);
-    	// leave as empty, no need to set them to anything.
-    	//setGmapAttachments(Set gmapAttachments);
-    	//setGmapSessions(Set gmapSessions);
     	gmapDAO.saveOrUpdate(gmap);
     }
 
@@ -734,4 +737,64 @@
 	public void setGmapMarkerDAO(IGmapMarkerDAO gmapMarkerDAO) {
 		this.gmapMarkerDAO = gmapMarkerDAO;
 	}
+	
+	public void updateMarkerListFromXML(String markerXML, Gmap gmap, GmapUser guser, boolean isAuthored, GmapSession session)
+	{
+		try 
+		{
+			DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+			DocumentBuilder db = dbf.newDocumentBuilder();
+			Document document = db.parse(new InputSource(new StringReader(markerXML)));
+			NodeList list = document.getElementsByTagName("marker");
+			
+			for (int i =0; i<list.getLength(); i++)
+			{
+				NamedNodeMap markerNode = ((Node)list.item(i)).getAttributes();
+				
+				Long uid  = Long.parseLong(markerNode.getNamedItem("markerUID").getNodeValue());
+				String markerTitle = markerNode.getNamedItem("title").getNodeValue();
+				String infoMessage = markerNode.getNamedItem("infoMessage").getNodeValue();
+				Double latitude = Double.parseDouble(markerNode.getNamedItem("latitude").getNodeValue());
+				Double longitude = Double.parseDouble(markerNode.getNamedItem("longitude").getNodeValue());
+
+				String markerState = markerNode.getNamedItem("state").getNodeValue();
+				
+				if (markerState.equals("remove"))
+				{
+					gmap.removeMarker(uid);
+					continue;
+				}
+
+				GmapMarker marker = null;
+				if (markerState.equals("save"))
+				{
+					marker = new GmapMarker();
+					marker.setCreatedBy(guser);
+					marker.setCreated(new Date());
+				}
+				else if (markerState.equals("update"))
+				{
+					marker = gmap.getMarkerByUid(uid);
+				}
+				
+				marker.setGmapSession(session);
+				marker.setTitle(markerTitle);
+				marker.setInfoWindowMessage(infoMessage);
+				marker.setLatitude(latitude);
+				marker.setLongitude(longitude);
+				marker.setGmap(gmap);
+				marker.setUpdated(new Date());
+				marker.setUpdatedBy(guser);
+				marker.setAuthored(isAuthored);
+				saveOrUpdateGmapMarker(marker);
+
+			}
+		}
+		catch (Exception e)
+		{
+			// TODO: improve error handling
+			logger.error("Could not get marker xml object to update", e);
+			throw new GmapException("Could not get marker xml object to update", e);
+		}
+	}
 }
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/IGmapService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/IGmapService.java,v
diff -u -r1.4 -r1.5
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/IGmapService.java	4 Jul 2008 02:36:02 -0000	1.4
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/IGmapService.java	8 Jul 2008 04:09:11 -0000	1.5
@@ -180,4 +180,14 @@
 	 * @param entry
 	 */
 	void updateEntry(Long uid, String entry);
+	
+	/**
+	 * Updates the marker list for the gmap based upon a serialised xml version of the marker array
+	 * 
+	 * @param markerXML
+	 * @param gmap
+	 * @param guser
+	 * @param session
+	 */
+	void updateMarkerListFromXML(String markerXML, Gmap gmap, GmapUser guser, boolean isAuthored, GmapSession session);
 }
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java,v
diff -u -r1.8 -r1.9
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java	4 Jul 2008 02:36:02 -0000	1.8
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java	8 Jul 2008 04:09:11 -0000	1.9
@@ -428,7 +428,8 @@
 		gmap.setTitle(authForm.getTitle());
 		gmap.setInstructions(authForm.getInstructions());
 		
-		updateMarkerListFromXML(authForm.getMarkersXML(), gmap, guser);
+		//updateMarkerListFromXML(authForm.getMarkersXML(), gmap, guser);
+		gmapService.updateMarkerListFromXML(authForm.getMarkersXML(), gmap, guser, true, null);
 		
 		if (mode.isAuthor()) { // Teacher cannot modify following
 			gmap.setCreateBy(guser.getUid());
@@ -449,66 +450,7 @@
 			gmap.setMapCenterLongitude(authForm.getMapCenterLongitude());
 		}
 	}
-	
-	private void updateMarkerListFromXML(String markerXML, Gmap gmap, GmapUser guser)
-	{
-		//Set<GmapMarker> newMarkers = new HashSet<GmapMarker>();
-		Set<GmapMarker> existingMarkers = gmap.getGmapMarkers();
-		try 
-		{
-			DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-			DocumentBuilder db = dbf.newDocumentBuilder();
-			Document document = db.parse(new InputSource(new StringReader(markerXML)));
-			NodeList list = document.getElementsByTagName("marker");
-			
-			for (int i =0; i<list.getLength(); i++)
-			{
-				NamedNodeMap markerNode = ((Node)list.item(i)).getAttributes();
-				
-				Long uid  = Long.parseLong(markerNode.getNamedItem("markerUID").getNodeValue());
-				String markerTitle = markerNode.getNamedItem("title").getNodeValue();
-				String infoMessage = markerNode.getNamedItem("infoMessage").getNodeValue();
-				Double latitude = Double.parseDouble(markerNode.getNamedItem("latitude").getNodeValue());
-				Double longitude = Double.parseDouble(markerNode.getNamedItem("longitude").getNodeValue());
 
-				String markerState = markerNode.getNamedItem("state").getNodeValue();
-				
-				if (markerState.equals("remove"))
-				{
-					gmap.removeMarker(uid);
-					continue;
-				}
-
-				GmapMarker marker = null;
-				if (markerState.equals("save"))
-				{
-					marker = new GmapMarker();
-					marker.setCreatedBy(guser);
-					marker.setCreated(new Date());
-				}
-				else if (markerState.equals("update"))
-				{
-					marker = gmap.getMarkerByUid(uid);
-				}
-				
-				marker.setTitle(markerTitle);
-				marker.setInfoWindowMessage(infoMessage);
-				marker.setLatitude(latitude);
-				marker.setLongitude(longitude);
-				marker.setGmap(gmap);
-				marker.setUpdated(new Date());
-				marker.setUpdatedBy(guser);
-				marker.setAuthored(true);
-				gmapService.saveOrUpdateGmapMarker(marker);
-			}
-		}
-		catch (Exception e)
-		{
-			// TODO: improve error handling
-			log.error("Could not get marker xml object to update", e);
-		}
-	}
-
 	/**
 	 * Updates AuthoringForm using Gmap content.
 	 * 
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java,v
diff -u -r1.9 -r1.10
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java	8 Jul 2008 02:23:41 -0000	1.9
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java	8 Jul 2008 04:09:11 -0000	1.10
@@ -253,81 +253,15 @@
 			
 			// update the marker list
 			Gmap gmap = gmapSession.getGmap();
-			updateMarkerListFromXML(learningForm.getMarkersXML(), gmap, gmapUser, gmapSession);
+			gmapService.updateMarkerListFromXML(learningForm.getMarkersXML(), gmap, gmapUser, false, gmapSession);
+			//updateMarkerListFromXML(learningForm.getMarkersXML(), gmap, gmapUser, gmapSession);
 
 		} else {
 			log.error("saveMarkers(): couldn't find GmapUser with id: "
 					+ gmapUser.getUserId() + "and toolSessionID: "
 					+ toolSessionID);
 		}
 
-		//return mapping.findForward("gmap");
 		return unspecified(mapping, form, request, response);
 	}
-
-	
-	private void updateMarkerListFromXML(String markerXML, Gmap gmap, GmapUser guser, GmapSession session)
-	{
-		//Set<GmapMarker> newMarkers = new HashSet<GmapMarker>();
-		Set<GmapMarker> existingMarkers = gmap.getGmapMarkers();
-		try 
-		{
-			DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-			DocumentBuilder db = dbf.newDocumentBuilder();
-			Document document = db.parse(new InputSource(new StringReader(markerXML)));
-			NodeList list = document.getElementsByTagName("marker");
-			
-			for (int i =0; i<list.getLength(); i++)
-			{
-				NamedNodeMap markerNode = ((Node)list.item(i)).getAttributes();
-				
-				Long uid  = Long.parseLong(markerNode.getNamedItem("markerUID").getNodeValue());
-				String markerTitle = markerNode.getNamedItem("title").getNodeValue();
-				String infoMessage = markerNode.getNamedItem("infoMessage").getNodeValue();
-				Double latitude = Double.parseDouble(markerNode.getNamedItem("latitude").getNodeValue());
-				Double longitude = Double.parseDouble(markerNode.getNamedItem("longitude").getNodeValue());
-
-				String markerState = markerNode.getNamedItem("state").getNodeValue();
-				
-				if (markerState.equals("remove"))
-				{
-					gmap.removeMarker(uid);
-					continue;
-				}
-
-				GmapMarker marker = null;
-				if (markerState.equals("save"))
-				{
-					marker = new GmapMarker();
-					marker.setCreatedBy(guser);
-					marker.setCreated(new Date());
-				}
-				else if (markerState.equals("update"))
-				{
-					marker = gmap.getMarkerByUid(uid);
-				}
-				
-				marker.setGmapSession(session);
-				marker.setTitle(markerTitle);
-				marker.setInfoWindowMessage(infoMessage);
-				marker.setLatitude(latitude);
-				marker.setLongitude(longitude);
-				marker.setGmap(gmap);
-				marker.setUpdated(new Date());
-				marker.setUpdatedBy(guser);
-				marker.setAuthored(false);
-				gmapService.saveOrUpdateGmapMarker(marker);
-
-			}
-		}
-		catch (Exception e)
-		{
-			// TODO: improve error handling
-			log.error("Could not get marker xml object to update", e);
-		}
-	}
-	
-	
-	
-	
 }