Changeset 2150

Timestamp:

08/23/12 16:13:06 (12 years ago)

Author:

olhsha

Message:

key stuff for fixing tickets 50 and 180 is discussed and coded

Location:

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

Files:

• main/java/clarin/cmdi/componentregistry/RssCreator.java (added)
• main/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestService.java (modified) (2 diffs)
• test/java/clarin/cmdi/componentregistry/RssCreatorTest.java (added)

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

@@ -10 +10 @@
 import clarin.cmdi.componentregistry.UserUnauthorizedException;
 import clarin.cmdi.componentregistry.components.CMDComponentSpec;
+import clarin.cmdi.componentregistry.components.CMDComponentType;
 import clarin.cmdi.componentregistry.model.AbstractDescription;
 import clarin.cmdi.componentregistry.model.Comment;
@@ -793 +794 @@
             validate(response, descriptionValidator, validator);
             if (response.getErrors().isEmpty()) {
-                CMDComponentSpec spec = validator.getCMDComponentSpec();
+                
+                CMDComponentSpec spec = validator.getCMDComponentSpec();
+                
+                // Olha was here: remove filename from spec before it gets extended!!! recursion over all the components
+                List<CMDComponentType> listofcomponents=spec.getCMDComponent();
+                for (CMDComponentType currentcomponent : listofcomponents) {
+                    currentcomponent.setFilename(null);
+                }
+                
                 try {
+                       
+                    
                     // Expand to check for recursion
                     registry.getExpander().expandNestedComponent(spec.getCMDComponent(), desc.getId());
 
+                    
+                    
                     // Add profile
+                    
+                    
                     int returnCode = action.execute(desc, spec, response, registry);
                     if (returnCode == 0) {