Changeset 2174

Timestamp:

08/29/12 15:19:28 (12 years ago)

Author:

olhsha

Message:

#50 fix is refactored and the test is refined (the result is written in the file). Next: try the fix on the specs generated via TomCat?.
#181 how to send the generated channel to the RssReader?? where to get "practical abstract description files", largeProfile is not marshallable to abstract/profile/component!!

Location:

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src

Files:

• main/java/clarin/cmdi/componentregistry/CMDComponentTypeWrapper.java (modified) (1 diff)
• test/java/clarin/cmdi/componentregistry/CMDComponentTypeWrapperTest.java (modified) (2 diffs)
• test/resources/xml/Component1.xml (modified) (1 diff)
• test/resources/xml/Component2.xml (modified) (1 diff)
• test/resources/xml/largeProfileUndummied.xml (added)
• test/resources/xml/rssTest.xml (modified) (3 diffs)

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/CMDComponentTypeWrapper.java

@@ -34 +34 @@
         if (component != null) {component.setFilename(null);}
         
-        for (CMDComponentType currentcomponent : listofcomponents) { 
-                CMDComponentTypeWrapper currentwrapper = new CMDComponentTypeWrapper(currentcomponent);
-                currentwrapper.setFileNamesToNull();
+        setFileNamesFromListToNull(listofcomponents);
+    
+    }
+    
+    
+    private void setFileNamesFromListToNull(List<CMDComponentType> listofcomponents){ 
+     
+        for (CMDComponentType currentcomponent : listofcomponents) {
+                setFileNamesToNullCurrent(currentcomponent);
                 } 
+    
+    }
+    
+    private void setFileNamesToNullCurrent(CMDComponentType currentcomponent){ 
+     
+      currentcomponent.setFilename(null);
+      setFileNamesFromListToNull(currentcomponent.getCMDComponent());
     
     }

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/CMDComponentTypeWrapperTest.java

@@ -256 +256 @@
           writeSpecToFile(compspec, "src/test/resources/xml/largeProfileDummyFilenames.xml");
           
-          
-          
       }
         
@@ -280 +278 @@
          
          checkNullnessOfFilenamesInListOfComponents(newcompspec.getCMDComponent());
-      }
-      
-      
-     
-    }
-    
-    
-    
-    
-
+         writeSpecToFile(newcompspec, "src/test/resources/xml/largeProfileUndummied.xml");
+         
+         
+      }
+      
+      
+     
+    }
+    
+    
+    
+    
+

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/test/resources/xml/Component1.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <componentDescription xmlns:ns2="http://www.w3.org/1999/xlink">
-    <id>clarin.eu:cr1:c_1346251472675</id>
+    <id>clarin.eu:cr1:c_1346252981279</id>
     <description>description1dum</description>
     <name>name1dum</name>
-    <registrationDate>2012-08-29T14:44:32+00:00</registrationDate>
+    <registrationDate>2012-08-29T15:12:50+00:00</registrationDate>
     <creatorName>God</creatorName>
     <userId>uid1dum</userId>

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/test/resources/xml/Component2.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <componentDescription xmlns:ns2="http://www.w3.org/1999/xlink">
-    <id>clarin.eu:cr1:c_1346251472676</id>
+    <id>clarin.eu:cr1:c_1346252981280</id>
     <description>description2dum</description>
     <name>name2dum</name>
-    <registrationDate>2012-08-29T14:44:32+00:00</registrationDate>
+    <registrationDate>2012-08-29T15:12:50+00:00</registrationDate>
     <creatorName>Allah</creatorName>
     <userId>uid2dum</userId>

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/test/resources/xml/rssTest.xml

@@ -1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+,<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <rss>
     <channel>
@@ -7 +7 @@
             <link>href1dum</link>
             <author>God</author>
-            <pubDate>2012-08-29T14:44:09+00:00</pubDate>
+            <pubDate>2012-08-29T15:05:08+00:00</pubDate>
         </item>
         <item>
@@ -14 +14 @@
             <link>href2dum</link>
             <author>Allah</author>
-            <pubDate>2012-08-29T14:44:10+00:00</pubDate>
+            <pubDate>2012-08-29T15:05:08+00:00</pubDate>
         </item>
     </channel>