Changeset 2834

Timestamp:

04/25/13 13:54:44 (11 years ago)

Author:

keeloo

Message:

Temporarily removed references to the tag facet from FacetConstants?, FacetConcepts? and FacetMappingFactoryTest?. This should enable the 2.13 beta release. Some minor changes regarding default parameter settings were applied to VloConfig? and VloConfigTest?.

Location:

vlo/trunk/vlo_importer/src

Files:

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

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

@@ -25 +25 @@
     public static final String FIELD_COMPLETE_METADATA = "metadataSource";
     public static final String FIELD_NATIONAL_PROJECT = "nationalProject";
-    public static final String FIELD_TAG = "tag";
+    // public static final String FIELD_TAG = "tag";
     
     //The _ facets are not meant to be shown to users.

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

@@ -5 +5 @@
     <maxOnHeap>128</maxOnHeap>
     
-    <useMaxFileSize>false</useMaxFileSize>
+    <useMaxFileSize>true</useMaxFileSize>
     
-    <maxFileSize>20000000</maxFileSize>
+    <maxFileSize>10000000</maxFileSize>
     
     <useHandleResolver>false</useHandleResolver>

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

@@ -81 +81 @@
     <pattern>/c:CMD/c:Header/c:MdProfile/text()</pattern>
   </facetConcept>
-  <facetConcept name="tag">
+<!--  <facetConcept name="tag">
         <concept>http://www.isocat.org/datcat/DC-5436</concept>
-        <concept>http://www.isocat.org/rest/dc/5436</concept> <!-- not an official ISOcat PID - added to support LrtInventoryResource, should be removed in the future--> 
-  </facetConcept>
+        <concept>http://www.isocat.org/rest/dc/5436</concept>  not an official ISOcat PID - added to support LrtInventoryResource, should be removed in the future 
+  </facetConcept>-->
 </facetConcepts>

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

@@ -126 +126 @@
         System.out.println("getUseMaxFileSize");
         
-        boolean expResult = false;
+        boolean expResult = true;
         boolean result = VloConfig.getUseMaxFileSize();
         
@@ -157 +157 @@
         System.out.println("getMaxFileSize");
         
-        int expResult = 20000000;
+        int expResult = 10000000;
         int result = VloConfig.getMaxFileSize();
         

vlo/trunk/vlo_importer/src/test/java/eu/clarin/cmdi/vlo/importer/FacetMappingFactoryTest.java

@@ -166 +166 @@
                 .getFacetMapping("http://catalog.clarin.eu/ds/ComponentRegistry/rest/registry/profiles/clarin.eu:cr1:p_1289827960126/xsd");
         List<FacetConfiguration> facets = facetMapping.getFacets();
-        assertEquals(16, facets.size());
+        assertEquals(15, facets.size());
         int index = 0;
         FacetConfiguration mapping = facets.get(index++);
@@ -229 +229 @@
         assertEquals("/c:CMD/c:Header/c:MdProfile/text()", mapping.getPatterns().get(0));
         assertEquals(1, mapping.getPatterns().size());
-        mapping = facets.get(index++);
-        assertEquals(FacetConstants.FIELD_TAG, mapping.getName());
-        assertEquals(1, mapping.getPatterns().size());
-        assertEquals("/c:CMD/c:Components/c:LrtInventoryResource/c:tags/c:tag/text()", mapping.getPatterns().get(0));
+//        mapping = facets.get(index++);
+//        assertEquals(FacetConstants.FIELD_TAG, mapping.getName());
+//        assertEquals(1, mapping.getPatterns().size());
+//        assertEquals("/c:CMD/c:Components/c:LrtInventoryResource/c:tags/c:tag/text()", mapping.getPatterns().get(0));
         assertEquals("check to see we tested them all", facets.size(), index);
     }