Changeset 2805

Timestamp:

04/11/13 13:02:15 (11 years ago)

Author:

keeloo

Message:

Added parameter for language link prefix.

Location:

vlo/trunk/vlo_importer/src

Files:

• main/java/eu/clarin/cmdi/vlo/FacetConstants.java (modified) (2 diffs)
• main/java/eu/clarin/cmdi/vlo/config/VloConfig.java (modified) (3 diffs)
• main/java/eu/clarin/cmdi/vlo/importer/CMDIParserVTDXML.java (modified) (2 diffs)
• main/java/eu/clarin/cmdi/vlo/importer/MetadataImporter.java (modified) (1 diff)
• main/resources/VloConfig.xml (modified) (1 diff)
• test/java/eu/clarin/cmdi/vlo/config/VloConfigTest.java (modified) (1 diff)

vlo/trunk/vlo_importer/src/main/java/eu/clarin/cmdi/vlo/FacetConstants.java

@@ -1 +1 @@
 package eu.clarin.cmdi.vlo;
+
+import eu.clarin.cmdi.vlo.config.VloConfig;
 
 /**
@@ -32 +34 @@
     public static final String FIELD_LANDINGPAGE = "_landingPageRef";
     
-    // PREFIX URL for the language-link
-    public static final String LANGUAGE_LINK_PREFIX = "http://www.clarin.eu/external/language.php?code=";
+    // PREFIX URL for the language-link    
+    public static final String LANGUAGE_LINK_PREFIX = VloConfig.getLanguageLinkPrefix();
 
     //Normalized mimeTypes

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

@@ -191 +191 @@
     private static String imdiBrowserUrl = "";
     
+    @Element
+    private static String languageLinkPrefix = 
+            "http://infra.clarin.eu/service/language/info.php?code=";
+    
     /**
      * Note: the national project mapping itself is not part of the web
@@ -488 +492 @@
 
     /**
-     * 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 static void setIMDIBrowserUrl(String param) {
-        imdiBrowserUrl = param;
-    }
-
-    /**
      * 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 
      */
@@ -517 +510 @@
 
     /**
+     * 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 static void setIMDIBrowserUrl(String param) {
+        imdiBrowserUrl = param;
+    }
+
+    /**
+     * Get the value of the languageLinkPrefix parameter<br><br>
+     *
+     * For a description of the parameter, refer to the general VLO
+     * documentation.
+     *
+     * @return the value
+     */
+    public static String getLanguageLinkPrefix() {
+        return languageLinkPrefix;
+    }
+    
+    /**
+     * Set the value of the languageLinkPrefix parameter<br><br>
+     *
+     * For a description of the parameter, refer to the general VLO
+     * documentation.
+     *
+     * @param param the value
+     */
+    public static void setLanguageLinkPrefix(String param) {
+        languageLinkPrefix = param;
+    }
+    
+    /**
      * Get the value of the FederatedContentSearchUrl parameter<br><br>
      *

vlo/trunk/vlo_importer/src/main/java/eu/clarin/cmdi/vlo/importer/CMDIParserVTDXML.java

@@ -99 +99 @@
     }
     
-    /*
-     * kj: describe 
-     */
     private void processResources(CMDIData result, VTDNav nav) throws VTDException {
         
@@ -119 +116 @@
             String mimeType = resourceMimeType.evalXPathToString();
             
-         // if (!ref.equals("") && !type.equals("")){
-            if (!ref.equals("")){
-                // mime type is allowed to be an empty string, kj: check if this is allowed in general
+            if (!ref.equals("") && !type.equals("")) {
+                // note that the mime type could be empty
                 result.addResource(ref, type, mimeType);
             }

vlo/trunk/vlo_importer/src/main/java/eu/clarin/cmdi/vlo/importer/MetadataImporter.java

@@ -303 +303 @@
         for (Resource resource : cmdiData.getLandingPageResources()) {
             solrDocument.addField(FacetConstants.FIELD_LANDINGPAGE, resource.getResourceName());
+            // solrDocument.addField(FacetConstants.FIELD_RESOURCE, resource.getResourceName());
+            // keeloo: this works, the web application stumbles because it assumes a mime type however
         }
         

vlo/trunk/vlo_importer/src/main/resources/VloConfig.xml

@@ -63 +63 @@
     
     <countryComponentUrl>http://catalog.clarin.eu/ds/ComponentRegistry/rest/registry/components/clarin.eu:cr1:c_1271859438104/xml</countryComponentUrl>
+    
+    <languageLinkPrefix>http://infra.clarin.eu/service/language/info.php?code=</languageLinkPrefix>
 
     <language2LetterCodeComponentUrl>http://catalog.clarin.eu/ds/ComponentRegistry/rest/registry/components/clarin.eu:cr1:c_1271859438109/xml</language2LetterCodeComponentUrl>

vlo/trunk/vlo_importer/src/test/java/eu/clarin/cmdi/vlo/config/VloConfigTest.java

@@ -391 +391 @@
     }
     
+        /**
+     * Test the getHandleServerUrl method
+     */
+    @Test
+    public void testGetLanguageLinkPrefix() {
+        
+        System.out.println("getLanguageLinkPrefix");
+        
+        String expResult = "http://infra.clarin.eu/service/language/info.php?code=";
+        String result = VloConfig.getLanguageLinkPrefix();
+        
+        assertEquals(expResult, result);
+    }
+
+    /**
+     * Test the setHandleServerUrl method
+     */
+    @Test
+    public void testSetLanguageLinkPrefix() {
+        
+        System.out.println("setLanguageLinkPrefix");
+        
+        String param = "http://infra.clarin.eu/service/language/info.php?code=";
+        
+        VloConfig.setLanguageLinkPrefix(param);
+
+        String result = VloConfig.getLanguageLinkPrefix();
+        
+        assertEquals(param, result);
+    }
+    
     /**
      * Test the getFederatedContentSearchUrl method