Changeset 23906 for gs3-extensions/atlas-src/trunk/src/org/greenstone/atlas/client/GS3MapLibrary.java

Timestamp:

2011-04-15T13:38:25+12:00 (13 years ago)

Author:

sjm84

Message:

Committing most recent version of ATLAS

Location:

gs3-extensions/atlas-src/trunk/src/org/greenstone/atlas

Files:

• . (added)
• client (moved) (moved from gs3-extensions/atlas-src/trunk/src/org/greenstone/client )
• client/GS3MapLibrary.java (modified) (40 diffs)

gs3-extensions/atlas-src/trunk/src/org/greenstone/atlas/client/GS3MapLibrary.java

@@ -52 +52 @@
 import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.FormPanel;
-import com.google.gwt.user.client.ui.Frame;
 import com.google.gwt.user.client.ui.HTML;
 import com.google.gwt.user.client.ui.Hidden;
@@ -61 +60 @@
 import com.google.gwt.user.client.ui.VerticalPanel;
 import com.google.gwt.user.client.ui.Widget;
+import com.google.gwt.xml.client.NamedNodeMap;
+import com.google.gwt.dom.client.Document;
 import com.google.gwt.dom.client.FormElement;
 import com.google.gwt.dom.client.InputElement;
 import com.google.gwt.dom.client.NativeEvent;
+import com.google.gwt.dom.client.Node;
 import com.google.gwt.dom.client.NodeCollection;
 import com.google.gwt.dom.client.NodeList;
@@ -82 +84 @@
     protected HorizontalPanel _viewPanel = new HorizontalPanel();
 
-    protected Frame _gsTempFrame = new Frame();
-
-    protected StatusBar _statusBar = new StatusBar();
+    protected StatusBar _statusBar = null;
 
     protected HTML _gsPanel = new HTML();
@@ -120 +120 @@
     protected ArrayList<String> _highlightedPlaces = new ArrayList<String>();
     protected ArrayList<String> _highlightedTextPlaces = new ArrayList<String>();
-    protected ArrayList<com.google.gwt.dom.client.Element> _mainLinks = new ArrayList<com.google.gwt.dom.client.Element>();
-    protected ArrayList<com.google.gwt.dom.client.Element> _mainScripts = new ArrayList<com.google.gwt.dom.client.Element>();
     protected ArrayList<Boolean> _visiblePlaceSets = new ArrayList<Boolean>();
     protected ArrayList<LatLng> _areaPoints = new ArrayList<LatLng>();
-
+    protected ArrayList<String> _removedPlaces = new ArrayList<String>();
+    
     protected ArrayList<ArrayList<Place>> _currentMultiPlaces = null;
-    protected ArrayList<String> _removedPlaces = new ArrayList<String>();
     
     protected HashMap<String, Place> _chosenPlaces = new HashMap<String, Place>();  
@@ -160 +158 @@
     protected String _currentCollection = "";
     protected String _currentURL = "";
-    protected final String _GREENSTONEURL = "http://localhost:8080/greenstone3";
+    protected final String _GREENSTONEURL = "http://taniwha.resnet.scms.waikato.ac.nz:8080/greenstone3";
+    //protected final String _GREENSTONEURL = "http://www.nzdl.org/atlasgreenstone3";
     protected final String _GREENSTONEDEVURL = _GREENSTONEURL + "/dev";
 
+    protected com.google.gwt.xml.client.Document _currentNewPageDoc;
+
     /**
      * GWT module entry point
@@ -168 +169 @@
     public void onModuleLoad()
     {
+        _statusBar = new StatusBar(this);
+        //Make the Firebug console so that browsers that don't have it don't break
+        setUpConsole();
+        
         //Get a Google geocoder to help find places that the Gazetteer does not know the coordinates for
         _geocoder = new Geocoder();
 
-        ((ServiceDefTarget) _findPlaceService).setServiceEntryPoint("http://localhost:8080/GS3MapLibrary/gs3maplibrary/findPlace");
-
+        ((ServiceDefTarget) _findPlaceService).setServiceEntryPoint("http://taniwha.resnet.scms.waikato.ac.nz:8080/ATLAS/findPlace");
+        //((ServiceDefTarget) _findPlaceService).setServiceEntryPoint("http://www.nzdl.org/ATLAS/findPlace");
+        
         //Setup native Javascript functions
         setUpLoadPageFromUrl(this);
         setUpLoadPageFromForm(this);
         setUpLoadSpatialSearchPage(this);
-
+        
         //Setup the map
         setUpMap();
         
-        //Make the Firebug console so that browsers that don't have it don't break
-        setUpConsole();
-
-        //Set up the invisible frame that temporarily stores pages as they load
-        setUpTempFrame();
-        
         //Set up the list box that stores the text view options
         setUpTextViewSelector();
 
         //Load the Greenstone home page
-        loadPageFromUrl(_GREENSTONEDEVURL);
-    }
-    
-    /**
-     * Sets up the  invisible frame that temporarily stores pages as they load
-     */
-    public void setUpTempFrame()
-    {
-        //Get the frame for the web page
-        _gsTempFrame.getElement().setId("tempFrame");
-        
-        //Make the frame have no size
-        _gsTempFrame.setSize("0px", "0px");
-        
-        //Make the frame have no border
-        _gsTempFrame.getElement().getStyle().setProperty("border", "0px");
-        
-        //Add the frame to the main frame
-        RootPanel.get("mainFrame").add(_gsTempFrame);
+        loadPageFromUrl("http://taniwha.resnet.scms.waikato.ac.nz:8080/greenstone3/dev?a=p&sa=home");
     }
 
@@ -226 +208 @@
      * @param url is the url to load
      */
-    public void loadPageFromUrl(final String url)
+    public void loadPageFromUrl(String url)
     {
         //Make sure a url was given 
@@ -261 +243 @@
         if (url.contains("&c="))
         {
-            //logToConsole("url contains collection");
             //Store the collection name
             _currentCollection = getCollectionFromURL(url);
@@ -268 +249 @@
         //Add the "Page loading" update to the status bar"      
         _statusBar.addUpdate("Loading new page", "LoadPage");
-
-        //Start loading the given url
-        _gsTempFrame.setUrl(url);
-
-        //Create and start the timer that checks if the page is loaded
-        Timer _checkLoadedTimer = getLoadedTimer();
-        _checkLoadedTimer.scheduleRepeating(500);
+        
+        getNewPage(url);
     }
     
@@ -293 +269 @@
         //Add the "Page loading" update to the status bar"      
         _statusBar.addUpdate("Loading new page", "LoadPage");
-
-        //Create and start the timer that checks if the page is loaded
-        Timer _checkLoadedTimer = getLoadedTimer();
-        _checkLoadedTimer.scheduleRepeating(500);
+    }
+    
+    public void getNewPage(String url)
+    {
+        RequestBuilder newPageRequest = new RequestBuilder(RequestBuilder.GET, url.contains("?") ? (url + "&excerpttag=body") : (url + "?excerpttag=body"));
+        try{
+            newPageRequest.sendRequest(null, new RequestCallback()
+            {
+                public void onResponseReceived(Request request, Response response)
+                {
+                    if(response.getStatusCode() == Response.SC_OK)
+                    {
+                        HTML newPage = new HTML(response.getText());
+                        newPage.getElement().setId("newpage");
+                        Element oldNewPage = (Element) Document.get().getElementById("newpage");
+                        if(oldNewPage != null)
+                        {
+                            oldNewPage.removeFromParent();
+                        }
+                        getElementsByTagName("body").get(0).appendChild(newPage.getElement());
+                        newPage.setVisible(false);
+
+                        showLoadedPage();
+                    }
+                }
+                
+                public void onError(Request request, Throwable exception)
+                {
+                    alert("Problem loading new page -> " + exception.getMessage());
+                }
+            });
+        }
+        catch(Exception ex)
+        {
+            alert("Exception while creating the new page request -> " + ex.getMessage());
+        }
     }
     
@@ -357 +365 @@
             _spatialSearchClickHandler = null;
         }
-    }
-    
-    /**
-     * Gets the timer than checks for when the pages is loaded and then loads the page
-     * @param url is the url being loaded
-     * @return the timer
-     */
-    public Timer getLoadedTimer()
-    {
-        return new Timer()
-        {
-            int timercount = 0;
-
-            public void run()
-            {
-                //Check to see if we should timeout yet
-                if (timercount++ > 50)
-                {
-                    logToConsole("Failed to load page after 50 attempts");
-                    this.cancel();
-                    return;
-                }
-
-                //Check to see if the page is loaded
-                if (tempFrameGetElementById("banner") != null && tempFrameGetElementById("content") != null && tempFrameGetElementById("footer") != null)
-                {
-                    this.cancel();
-                    showLoadedPage();
-                }   
-            }
-        };
     }
     
@@ -398 +375 @@
         if (!_initialised)
         {
+            //Fix webpage elements so that they point to the correct address
+            fixForms();
+            fixAnchors(); 
+            fixImages();
+            
+            initialiseATLAS();
+            
+            //Add <link> and <script> elements to <head>
+            //changeCSSLinksAndScripts();
+        }
+        else
+        {
+            //Add <link> and <script> elements to <head>
+            //changeCSSLinksAndScripts();
+
             //Fix webpage elements so that they point to the correct address
             fixForms();
@@ -403 +395 @@
             fixImages(); 
             
-            initialiseATLAS();
+            Element newPageElem = getElementById("newpage");
+            NodeList<com.google.gwt.dom.client.Element> divs = newPageElem.getElementsByTagName("div");
             
-            //Add <link> and <script> elements to <head>
-            changeCSSLinksAndScripts();
-        }
-        else
-        {
-            //Add <link> and <script> elements to <head>
-            changeCSSLinksAndScripts();
-
-            //Fix webpage elements so that they point to the correct address
-            fixForms();
-            fixAnchors(); 
-            fixImages(); 
+            Element newBanner = null;
+            Element newContent = null;
+            
+            for(int i = 0; i < divs.getLength(); i++)
+            {
+                if(divs.getItem(i).getId().equals("gs_banner"))
+                {
+                    newBanner = (Element) divs.getItem(i);
+                }
+                else if(divs.getItem(i).getId().equals("gs_content"))
+                {
+                    newContent = (Element) divs.getItem(i);
+                }
+            }
             
             //Swap the current banner with the new banner
-            Element oldBanner = getElementById("banner");
-            Element newBanner = tempFrameGetElementById("banner");
+            Element oldBanner = getElementById("gs_banner");
             oldBanner.getParentElement().removeChild(oldBanner);
             _headerDiv.insert(HTML.wrap(newBanner), 0);
@@ -433 +427 @@
 
             //Swap the current Greenstone content with the new Greenstone content
-            _gsPanel.setHTML(HTML.wrap(tempFrameGetElementById("content")).getHTML());
+            _gsPanel.setHTML(HTML.wrap(newContent).getHTML());
         }
 
@@ -444 +438 @@
         //The page has now finished being updated
         _statusBar.removeUpdate("LoadPage");
-
-        //Do an initial resize of the page elements 
-        Timer tempResizeTimer = new Timer()
-        {
-            public void run()
-            {
-                resizeElements();
-            }
-        };
-        tempResizeTimer.schedule(500);
 
         //Check the document's text for places
@@ -499 +483 @@
      */
     public void initialiseATLAS()
-    {
-        //Get the head section of the HTML page
-        Element head = getDocumentHead();
-
-        //Get all of the <link> elements from the HTML header 
-        logToConsole("Saving links");
-        NodeList<com.google.gwt.dom.client.Element> linksToSave = head.getElementsByTagName("link");
-        
-        for(int i = 0; i < linksToSave.getLength(); i++)
-        {
-            logToConsole("Link save = " + linksToSave.getItem(i).getAttribute("href"));
-            _mainLinks.add(linksToSave.getItem(i));
-        }
-        
-        //Get all of the <script> elements from the HTML header 
-        logToConsole("Saving scripts");
-        NodeList<com.google.gwt.dom.client.Element> scriptsToSave = head.getElementsByTagName("script");
-        
-        for(int i = 0; i < scriptsToSave.getLength(); i++)
-        {
-            logToConsole("Script save = " + scriptsToSave.getItem(i).getAttribute("src"));
-            _mainScripts.add(scriptsToSave.getItem(i));
-        }
-        
+    {       
         //Reload the page when the view type is changed
         _textViewSelector.addChangeHandler(new ChangeHandler()
@@ -530 +491 @@
                 if (getDocTextElement() != null)
                 {
-                    loadPageFromUrl(_gsTempFrame.getUrl());
+                    loadPageFromUrl(_currentURL);
                 }
             }
@@ -544 +505 @@
         _viewPanel.add(_textViewSelector);
         _viewPanel.setVisible(false);
+        
+        Element newPageElem = getElementById("newpage");
+        NodeList<com.google.gwt.dom.client.Element> divs = newPageElem.getElementsByTagName("div");
+        
+        Element headerElem = null;
+        Element bodyElem = null;
+        Element footerElem = null;
+        
+        for(int i = 0; i < divs.getLength(); i++)
+        {
+            if(divs.getItem(i).getId().equals("gs_banner"))
+            {
+                headerElem = (Element) divs.getItem(i);
+            }
+            else if(divs.getItem(i).getId().equals("gs_content"))
+            {
+                bodyElem = (Element) divs.getItem(i);
+            }
+            else if(divs.getItem(i).getId().equals("gs_footer"))
+            {
+                footerElem = (Element) divs.getItem(i);
+            }
+        }
+        
+        if(headerElem == null)
+        {
+            alert("header is null");
+        }
+        if(bodyElem == null)
+        {
+            alert("body is null");
+        }   
+        if(footerElem == null)
+        {
+            alert("footer is null");
+        }
 
         // Add header
-        _headerDiv.add(HTML.wrap(tempFrameGetElementById("banner")));
+        //Node newHeader = importNode(newPage, tempFrameGetElementById("banner"), true);
+        _headerDiv.add(HTML.wrap(headerElem));
         _headerDiv.add(_viewPanel);
         _headerDiv.setWidth("100%");
@@ -558 +556 @@
 
         // Add content
-        Element contentElement = tempFrameGetElementById("content");
-        _gsPanel = HTML.wrap(contentElement);
+        //Node newContent = importNode(Document.get(), tempFrameGetElementById("content"), true);
+        _gsPanel = HTML.wrap(bodyElem);
         _contentDiv.add(_gsPanel);
         _contentDiv.add(_map);
 
         // Add footer
-        _footerDiv.add(HTML.wrap(tempFrameGetElementById("footer")));
+        //Node newFooter = importNode(Document.get(), tempFrameGetElementById("footer"), true);
+        _footerDiv.add(HTML.wrap(footerElem));
         _footerDiv.setWidth("100%");
         _footerDiv.getElement().setId("GSFooter");
@@ -622 +621 @@
         //Get the response text
         String text = response.getText();
-
+        
         //Get the hash codes for the documents
-        ArrayList<String> docURLs = getDocURLsFromResponse(text);
-
-        TemporaryFrame.setCurrentFrameIndex(getNumberOfFrames() - 1);
-        //Load each search result in a temporary frame
-        final ArrayList<TemporaryFrame> tempFrames = new ArrayList<TemporaryFrame>();
-        for (int j = 0; j < docURLs.size(); j++)
-        {
-            //Create the url of the search result
-            String url = _GREENSTONEURL + "/" + docURLs.get(j);
-            
-            //Create the temporary frame
-            TemporaryFrame currentFrame = new TemporaryFrame(url);
-            
-            //Add the frame to the footer of the page
-            _footerDiv.add(currentFrame.getFrame());
-            
-            //Begin loading the page
-            currentFrame.loadPage();
-            
-            //Store the frame
-            tempFrames.add(currentFrame);
-        }
-
-        //Create a timer that periodically checks if all the frames have finished loading
-        Timer docsReadyTimer = new Timer()
-        {
-            public void run()
-            {
-                //Check to see if all of the frames have finished loading
-                boolean allDone = true;
-                for (int i = 0; i < tempFrames.size(); i++)
-                {
-                    if (!tempFrames.get(i).isFinishedLoading())
+        final ArrayList<String> docURLs = getDocURLsFromResponse(text);     
+        final String[] texts = new String[docURLs.size()];
+        
+        for(int i = 0; i < texts.length; i++)
+        {
+            texts[i] = null;
+        }
+        
+        for(int i = 0; i < docURLs.size(); i++)
+        {
+            String url = docURLs.get(i);
+            RequestBuilder xmlRequest = new RequestBuilder(RequestBuilder.GET, _GREENSTONEURL + "/" + (url.contains("?") ? (url + "&excerptid=gs-document-text") : (url + "?excerptid=gs-document-text")));
+            try
+            {
+                final int index = i;
+                xmlRequest.sendRequest(null, new RequestCallback()
+                {
+                    public void onResponseReceived(Request request, Response response)
                     {
-                        logToConsole(i + " has NOT finished loading");
-                        allDone = false;
-                    }
-                    else
-                    {
-                        logToConsole(i + " has finished loading");
-                    }
-                }
-
-                //If all the frames have finished loading
-                if (allDone && _gazetteerLoaded)
-                {
-                    this.cancel();
-                    
-                    //Get all of the texts from the frames
-                    ArrayList<String> texts = new ArrayList<String>();
-                    while (tempFrames.size() > 0)
-                    {
-                        texts.add(tempFrames.get(0).getText());
-                        tempFrames.get(0).removeFromParent();
-                        tempFrames.remove(0);
+                        if(response.getStatusCode() == Response.SC_OK)
+                        {
+                            texts[index] = response.getText();
+                        }
                     }
                     
+                    public void onError(Request request, Throwable exception)
+                    {
+                        alert("Exception requesting new page -> " + exception.getMessage());
+                        texts[index] =  "";
+                    }
+                });
+            }
+            catch(Exception ex)
+            {
+                alert("Exception requesting " + url + " -> " + ex.getMessage());
+            }
+        }
+        
+        Timer checkDoneTimer = new Timer()
+        {
+            int _count = 0;
+            
+            public void run()
+            {
+                boolean done = true;
+                if(_count < 20)
+                {
+                    for(int i = 0; i < texts.length; i++)
+                    {
+                        if(texts[i] == null)
+                        {
+                            done = false;
+                            break;
+                        }
+                    }
+                }
+                _count++;
+                
+                if(done)
+                {
+                    this.cancel();
                     findPlacesInTexts(texts);
                 }
-                else
-                {
-                    logToConsole("Still getting doc text...");
-                }
             }
         };
-        docsReadyTimer.scheduleRepeating(2000);
+        checkDoneTimer.scheduleRepeating(500);
     }
     
@@ -696 +695 @@
      * @param texts is a list of texts from different documents
      */
-    private void findPlacesInTexts(ArrayList<String> texts)
+    private void findPlacesInTexts(String[] texts)
     {
         logToConsole("Finished gettings doc text and gazetteer loaded!");
@@ -785 +784 @@
 
                     //If this is not the first point then add a line between this and the previous point
-                    logToConsole("Points array size = " + _areaPoints.size());
                     if (_areaPoints.size() > 1)
                     {
@@ -792 +790 @@
 
                         Polyline line = new Polyline(new LatLng[] { point, _areaPoints.get(_areaPoints.size() - 2) }, "#FFFFFF", 3, 1, po);
-                        logToConsole("Adding line");
                         _map.addOverlay(line);
                     }
@@ -879 +876 @@
      */
     public void changeCSSLinksAndScripts()
-    {
+    {       
         //Get the head section of the HTML page
         Element head = getDocumentHead();
@@ -888 +885 @@
         //Get all of the <script> elements from the HTML header 
         NodeList<com.google.gwt.dom.client.Element> currentScripts = head.getElementsByTagName("script");
-        
-        //Remove all of the old links on the page
-        for(int i = 0; i < currentLinks.getLength(); i++)
-        {
-            currentLinks.getItem(i).getParentElement().removeChild(currentLinks.getItem(i));
-        }
-        
-        //Remove all of the old scripts on the page
-        for(int i = 0; i < currentScripts.getLength(); i++)
-        {
-            currentScripts.getItem(i).getParentElement().removeChild(currentScripts.getItem(i));
-        }
-        
-        //Add the links present in every page
-        for (int i = 0; i < _mainLinks.size(); i++)
-        {
-            Element e = (Element) _mainLinks.get(i);
-            if(!e.getAttribute("href").startsWith("http://"))
+
+        //Add the new links
+        com.google.gwt.xml.client.NodeList newLinks = _currentNewPageDoc.getElementsByTagName("link");  
+        for (int i = 0; i < newLinks.getLength(); i++)
+        {
+            com.google.gwt.xml.client.Element e = (com.google.gwt.xml.client.Element) newLinks.item(i);
+            boolean found = false;
+            for(int j = 0; j < currentLinks.getLength(); j++)
+            {
+                Element elem = (Element) currentLinks.getItem(j);
+                if(e.getAttribute("href").equals(elem.getAttribute("href"))
+                && e.getAttribute("type").equals(elem.getAttribute("type"))
+                && e.getAttribute("rel").equals(elem.getAttribute("rel")))
+                {
+                    found = true;
+                }
+            }
+            
+            if(!found)
+            {
+                Element newElem = DOM.createElement("link");
+                
+                NamedNodeMap map = e.getAttributes();
+                for(int k = 0; k < e.getAttributes().getLength(); k++)
+                {
+                    newElem.setAttribute(map.item(k).getNodeName(), map.item(k).getNodeValue());
+                }
+                
+                if(!newElem.getAttribute("href").startsWith("http://"))
+                {
+                    newElem.setAttribute("href", _GREENSTONEURL + "/" + newElem.getAttribute("href"));  
+                }
+                head.appendChild(newElem);
+            }
+        }
+        
+        //Add the new scripts on the page
+        com.google.gwt.xml.client.NodeList newScripts = _currentNewPageDoc.getElementsByTagName("script");  
+        for (int i = 0; i < newScripts.getLength(); i++)
+        {
+            com.google.gwt.xml.client.Element e = (com.google.gwt.xml.client.Element) newScripts.item(i);
+            boolean found = false;
+            for(int j = 0; j < currentScripts.getLength(); j++)
+            {
+                Element elem = (Element) currentLinks.getItem(j);
+                if(e.getAttribute("src").equals(elem.getAttribute("src")) 
+                && e.getAttribute("type").equals(elem.getAttribute("type"))
+                && e.getAttribute("charset").equals(elem.getAttribute("charset")))
+                {
+                    found = true;
+                }
+            }
+            
+            if(!found)
+            {
+                Element newElem = DOM.createElement("link");
+                
+                NamedNodeMap map = e.getAttributes();
+                for(int k = 0; k < e.getAttributes().getLength(); k++)
+                {
+                    newElem.setAttribute(map.item(k).getNodeName(), map.item(k).getNodeValue());
+                }
+                
+                
+                if(!e.getAttribute("src").startsWith("http://"))
+                {
+                    e.setAttribute("src", _GREENSTONEURL + "/" + e.getAttribute("src"));
+                }
+                head.appendChild(newElem);
+            }
+        }
+    }
+
+    /**
+     * Go through each form on the page and add a javascript function in place of its action attribute
+     */
+    public void fixForms()
+    {
+        NodeList<com.google.gwt.dom.client.Element> forms = getElementById("newpage").getElementsByTagName("form");
+        for (int i = 0; i < forms.getLength(); i++)
+        {
+            Element e = (Element)forms.getItem(i);
+            e.setAttribute("id", "form" + i);
+
+            if(e.getAttribute("action").isEmpty())
+            {
+                continue;
+            }
+            if (!e.getAttribute("action").startsWith("http://") && !e.getAttribute("action").startsWith("/"))
+            {
+                e.setAttribute("action", "javascript:loadPageFromFormJS(document.getElementById('form" + i + "'))");
+            }
+        }
+    }
+
+    /**
+     * Go through each anchor on the page and add a javascript function in place of the href attribute
+     */
+    public void fixAnchors()
+    {
+        NodeList<com.google.gwt.dom.client.Element> anchors = getElementById("newpage").getElementsByTagName("a");
+        for (int i = 0; i < anchors.getLength(); i++)
+        {
+            Element e = (Element)anchors.getItem(i);
+            if(e.getAttribute("href").isEmpty())
+            {
+                continue;
+            }
+            if (!e.getAttribute("href").startsWith("http://") && !e.getAttribute("href").startsWith("/"))
             {
                 e.setAttribute("href", _GREENSTONEURL + "/" + e.getAttribute("href"));
             }
-            head.appendChild(e);
-        }
-        
-        //Add the scripts present in every page
-        for (int i = 0; i < _mainScripts.size(); i++)
-        {
-            Element e = (Element) _mainScripts.get(i);
-            if(!e.getAttribute("src").startsWith("http://"))
-            {
-                e.setAttribute("src", _GREENSTONEURL + "/" + e.getAttribute("src"));
-            }
-            head.appendChild(e);
-        }
-        
-        //Add the new links
-        JsArray<Element> newLinks = tempFrameGetElementsByTagName("link");
-        for (int i = 0; i < newLinks.length(); i++)
-        {
-            Element e = newLinks.get(i);
-            if(!e.getAttribute("href").startsWith("http://"))
-            {
-                e.setAttribute("href", _GREENSTONEURL + "/" + e.getAttribute("href"));  
-            }
-            head.appendChild(e);
-        }
-        
-        //Add the new scripts on the page
-        JsArray<Element> scripts = tempFrameGetElementsByTagName("script");
-        for (int i = 0; i < scripts.length(); i++)
-        {
-            Element e = scripts.get(i);
-            if(!e.getAttribute("src").startsWith("http://"))
-            {
-                e.setAttribute("src", _GREENSTONEURL + "/" + e.getAttribute("src"));
-            }
-            head.appendChild(e);
-        }
-    }
-
-    /**
-     * Go through each form on the page and add a javascript function in place of its action attribute
-     */
-    public void fixForms()
-    {
-        JsArray<Element> forms = tempFrameGetElementsByTagName("form");
-        for (int i = 0; i < forms.length(); i++)
-        {
-            Element e = forms.get(i);
-            e.setAttribute("id", "form" + i);
-
-            if (!e.getAttribute("action").startsWith("http://"))
-            {
-                e.setAttribute("action", "javascript:loadPageFromFormJS(document.getElementById('form" + i + "'))");
-            }
-        }
-    }
-
-    /**
-     * Go through each anchor on the page and add a javascript function in place of the href attribute
-     */
-    public void fixAnchors()
-    {
-        JsArray<Element> anchors = tempFrameGetElementsByTagName("a");
-        for (int i = 0; i < anchors.length(); i++)
-        {
-            Element e = anchors.get(i);
-
-            if (!e.getAttribute("href").startsWith("http://"))
-            {
-                e.setAttribute("href", _GREENSTONEURL + "/" + e.getAttribute("href"));
-                e.setAttribute("onClick", "loadPageFromUrlJS('" + e.getAttribute("href") + "'); return false;");
-            }
+            //e.setAttribute("onClick", "loadPageFromUrlJS('" + e.getAttribute("href") + "'); return false;");
+            e.setAttribute("href", "javascript:loadPageFromUrlJS('" + e.getAttribute("href") + "');");
         }
     }
@@ -989 +1007 @@
     public void fixImages()
     {
-        JsArray<Element> images = tempFrameGetElementsByTagName("img");
-        for (int i = 0; i < images.length(); i++)
-        {
-            Element e = images.get(i);
-            if (!e.getAttribute("src").startsWith("http://"))
+        NodeList<com.google.gwt.dom.client.Element> images = getElementById("newpage").getElementsByTagName("img");
+        for (int i = 0; i < images.getLength(); i++)
+        {
+            Element e = (Element)images.getItem(i);
+            
+            if(e.getAttribute("src").isEmpty())
+            {
+                continue;
+            }
+            
+            if (!e.getAttribute("src").startsWith("http://") && !e.getAttribute("src").startsWith("/"))
             {
                 e.setAttribute("src", _GREENSTONEURL + "/" + e.getAttribute("src"));
@@ -1101 +1125 @@
 
     /**
+     * Prints a given message to screen in a window
+     * @param msg is the message to print
+     */
+    public static native void alert(String msg)
+    /*-{
+        alert(msg);
+    }-*/;
+    
+    /**
      * Prints a given message to the Firebug console
      * @param msg is the message to print
@@ -1106 +1139 @@
     public static native void logToConsole(String msg)
     /*-{
-        console.log(msg);
+        //alert(msg);
+        //console.log(msg);
     }-*/;
 
@@ -1117 +1151 @@
         return $doc.getElementsByTagName("head")[0];
     }-*/;
+    
+    /**
+     * Patch GWT Document.importNode, which fails to return the imported nodes
+     */
+    public static final native Node importNode(Document doc, Node node, boolean deep) /*-{
+            return doc.importNode(node, deep);
+    }-*/;
+
 
     /**
@@ -1184 +1226 @@
         //Get the width and height we want to use for the content div
         int cwidth = Window.getClientWidth() - 45;
-        int cheight = (int) (Window.getClientHeight() - _headerDiv.getOffsetHeight() - _footerDiv.getOffsetHeight() - 70);
+        int cheight = (int) (Window.getClientHeight() - _headerDiv.getOffsetHeight() - _footerDiv.getOffsetHeight() - _statusBar.getStatusBarDiv().getOffsetHeight() - 50);
 
         //If the height is less than 300 then set it to 300 
-        if (cheight < 300)
-        {
-            cheight = 300;
+        if (cheight < 200)
+        {
+            cheight = 200;
         }
 
@@ -1197 +1239 @@
         
         //Set the size of the content div
-        _contentDiv.setSize(cwidth + "px", (cheight + 50) + "px");
+        _contentDiv.setSize(cwidth + "px", cheight + "px");
         
         //Set up the style of the Greenstone panel
@@ -1210 +1252 @@
         if (_mapVisible && _gsVisible)
         {
-            _map.setSize((cwidth / 2 - 60) + "px", cheight + "px");
+            _map.setSize((cwidth / 2 - 60) + "px", (cheight - 25) + "px");
             _map.getElement().getStyle().setProperty("left", (cwidth / 2 + 50) + "px");
-            _gsPanel.setSize((cwidth / 2) + "px", cheight + "px");
+            _gsPanel.setSize((cwidth / 2) + "px", (cheight - 25) + "px");
         }
 
@@ -1317 +1359 @@
 
         //Work out the size of the new marker based on the current zoom level
-        double size = 4.0 / (_map.getZoomLevel() * (_map.getZoomLevel() / 2));
-
+        double zoomLevel = _map.getZoomLevel();
+        double size = (8.0 * Math.pow(2.0, -zoomLevel)) + (0.05 * (zoomLevel / 20.0));
+        
+        //Work out the transparency of the new marker based on the current zoom level
+        double transparency = 0.8 * ((20.0 - zoomLevel) / 20.0);
+        
         //Create the corner of the polygon
         LatLng tl = LatLng.newInstance(lat - size, lng + size);
@@ -1329 +1375 @@
         if (_highlightedPlaces.contains(p.getName()))
         {
-            newMarker = new Polygon(new LatLng[] { tl, tr, br, bl, tl }, borderColour, 1, 1, "#FF0000", 0.75);
+            newMarker = new Polygon(new LatLng[] { tl, tr, br, bl, tl }, borderColour, 1, 1, "#FF7F27", transparency);
         }
         //Otherwise make it the normal colour
         else
         {
-            newMarker = new Polygon(new LatLng[] { tl, tr, br, bl, tl }, borderColour, 1, 1, fillColour, 0.75);
+            newMarker = new Polygon(new LatLng[] { tl, tr, br, bl, tl }, borderColour, 1, 1, fillColour, transparency);
         }
 
@@ -1749 +1795 @@
             public void onFailure(Throwable caught)
             {
-                logToConsole("Find multi places fail" + caught.getMessage());
+                alert("Find multi places fail" + caught.getMessage());
             }
 
@@ -1757 +1803 @@
                 _statusBar.addUpdate("Displaying places", "DisPlaces");
 
-                logToConsole("Find multi places success");
                 _currentMultiPlaces = places;
                 _visiblePlaceSets = new ArrayList<Boolean>();
@@ -1919 +1964 @@
                 for (int j = 0; j < textPlaces.length(); j++)
                 {
-                    logToConsole("Attempting to match " + textPlaces.get(j).getAttribute("class") + " with place");
                     if (textPlaces.get(j).getAttribute("class").equals("place"))
                     {
@@ -2031 +2075 @@
         logToConsole("Adding columns to panel");
 
-        if (_contentDiv.getWidget(0).getElement().getId() == "content")
+        if (_contentDiv.getWidget(0).getElement().getId() == "gs_content")
         {
             VerticalPanel newDocTextPanel = new VerticalPanel();
@@ -2129 +2173 @@
             if (event.getY() < 125)
             {
-                logToConsole("1");
                 _columnViewBox.getElement().getStyle().setProperty("top", (event.getY() + _label.getAbsoluteTop() + 25) + "px");
             }
             else
             {
-                logToConsole("2");
                 _columnViewBox.getElement().getStyle().setProperty("top", (event.getY() + _label.getAbsoluteTop() - 125) + "px");
             }
@@ -2839 +2881 @@
                     form.setWidget(tempForm);
 
-                    tempFrameGetElementsByTagName("body").get(0).appendChild(form.getElement());
+                    getElementsByTagName("body").get(0).appendChild(form.getElement());
 
                     logToConsole("Adding hidden form elements");