Changeset 5247

Timestamp:

05/21/14 09:29:17 (10 years ago)

Author:

Twan Goosen

Message:

Removed obsolete imdiBrowserUrl configuration parameter

Location:

vlo/trunk/vlo-commons/src

Files:

• main/java/eu/clarin/cmdi/vlo/config/VloConfig.java (modified) (1 diff)
• main/resources/VloConfig.xml (modified) (1 diff)
• test/java/eu/clarin/cmdi/vlo/config/DefaultVloConfigFactoryTest.java (modified) (1 diff)

vlo/trunk/vlo-commons/src/main/java/eu/clarin/cmdi/vlo/config/VloConfig.java

@@ -584 +584 @@
 
     /**
-     * Get the value of the ProfileSchemaUrl parameter combined with a
-     * handle<br><br>
-     *
-     * For a description of the schema, refer to the general VLO documentation.
-     *
-     * @param handle the handle the URL is based on
-     * @return the value
-     */
-    public String getImdiBrowserUrl(String handle) {
-        String result;
-        try {
-            result = imdiBrowserUrl + URLEncoder.encode(handle, "UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            result = imdiBrowserUrl + handle;
-        }
-        return result;
-    }
-
-    /**
-     * Set the value of the IMDIBrowserUrl parameter<br><br>
-     *
-     * For a description of the parameter, refer to the general VLO
-     * documentation.
-     *
-     * @param param the value
-     */
-    public void setImdiBrowserUrl(String param) {
-        imdiBrowserUrl = param;
-    }
-
-    /**
      * Get the value of the languageLinkPrefix parameter<br><br>
      *

vlo/trunk/vlo-commons/src/main/resources/VloConfig.xml

@@ -55 +55 @@
     <handleServerUrl>http://hdl.handle.net/</handleServerUrl>
     
-    <imdiBrowserUrl>http://corpus1.mpi.nl/ds/imdi_browser?openpath=</imdiBrowserUrl>
-    
     <nationalProjectMapping>/nationalProjectsMapping.xml</nationalProjectMapping>
     
     <!-- 
         Facet field used to populate collection selector on search page 
-        If removed, the collection facet will not be shown (can be used to
+        If disabled, the collection facet will not be shown (can be used to
         move the collection facet in with the other facets).
+        
+        Uncomment to activate the separate collection facet display item.
     -->
     <!--<collectionFacet>collection</collectionFacet>-->

vlo/trunk/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/config/DefaultVloConfigFactoryTest.java

@@ -496 +496 @@
 
         assertEquals(param, result);
-    }
-
-    /**
-     * Test the getIMDIBrowserUrl method
-     */
-    @Test
-    public void testGetIMDIBrowserUrl() {
-
-        System.out.println("getIMDIBrowserUrl");
-
-        String expResult;
-        try {
-            expResult = "http://corpus1.mpi.nl/ds/imdi_browser?openpath=" + URLEncoder.encode("handle", "UTF-8");
-        } catch (UnsupportedEncodingException ex) {
-            expResult = "http://corpus1.mpi.nl/ds/imdi_browser?openpath=" + "handle";
-        }
-        String result = config.getImdiBrowserUrl("handle");
-
-        assertEquals(expResult, result);
-    }
-
-    /**
-     * Test the setIMDIBrowserUrl method
-     */
-    @Test
-    public void testSetIMDIBrowserUrl() {
-
-        System.out.println("setIMDIBrowserUrl");
-
-        String param = "http://corpus1.mpi.nl/ds/imdi_browser?openpath=";
-
-        config.setImdiBrowserUrl(param);
-
-        String expResult;
-        try {
-            expResult = "http://corpus1.mpi.nl/ds/imdi_browser?openpath=" + URLEncoder.encode("handle", "UTF-8");
-        } catch (UnsupportedEncodingException ex) {
-            expResult = "http://corpus1.mpi.nl/ds/imdi_browser?openpath=" + "handle";
-        }
-
-        String result = config.getImdiBrowserUrl("handle");
-
-        assertEquals(expResult, result);
     }