Subversion Repositories SmartDukaan

Rev

Rev 448 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 448 Rev 450
Line 114... Line 114...
114
	    			media.setContentType("");
114
	    			media.setContentType("");
115
    			}
115
    			}
116
    			this.addMedia(media);
116
    			this.addMedia(media);
117
    			log.info("entity ID:" + this.entityID);
117
    			log.info("entity ID:" + this.entityID);
118
    			log.info("slide ID:" + this.slideID);
118
    			log.info("slide ID:" + this.slideID);
-
 
119
    			
-
 
120
    			String contentLabel = "";
-
 
121
    			log.info("type filename and location :" + media.getType() + "~!~" + media.getFileName() + media.getLocation());
-
 
122
    			
-
 
123
    			if(media.getType().compareTo("image")==0){
-
 
124
    				contentLabel = media.getLabel() + "~!~" + media.getFileName();
-
 
125
    				log.info("Type is image :" + contentLabel);
-
 
126
        		}
-
 
127
        		if(media.getType().compareTo("youtube")==0){
-
 
128
        			contentLabel = media.getLabel() + "~!~" + media.getLocation();
-
 
129
        			log.info("Type is youtube :" + contentLabel);
-
 
130
        		}
-
 
131
    			
-
 
132
    			
119
    			EntityContainer enContainer = Catalog.getInstance().getEntityContainer();
133
    			EntityContainer enContainer = Catalog.getInstance().getEntityContainer();
120
    			Entity entity = enContainer.getEntity(Long.parseLong(this.entityID));
134
    			Entity entity = enContainer.getEntity(Long.parseLong(this.entityID));
121
    			FreeformContent freeformContent = entity.getSlide(Long.parseLong(this.slideID)).getFreeformContent();
135
    			FreeformContent freeformContent = entity.getSlide(Long.parseLong(this.slideID)).getFreeformContent();
122
    			freeformContent.addMedia(media.getType(), media.getLabel());
136
    			freeformContent.addMedia(media.getType(), contentLabel);
123
    			entity.getSlide(Long.parseLong(slideID)).setFreeformContent(freeformContent);
137
    			entity.getSlide(Long.parseLong(slideID)).setFreeformContent(freeformContent);
124
    			updateEntity(entity);
138
    			updateEntity(entity);
125
    			//CreationUtils.storeEntity(entity);
139
    			//CreationUtils.storeEntity(entity);
126
    		}
140
    		}
127
 
141
 
Line 150... Line 164...
150
    		log.info("slide:" + label);
164
    		log.info("slide:" + label);
151
    		log.info("entity:" + label);
165
    		log.info("entity:" + label);
152
    		
166
    		
153
    		label = URLDecoder.decode(label, "UTF-8");
167
    		label = URLDecoder.decode(label, "UTF-8");
154
    		
168
    		
-
 
169
    		Media media = CreationUtils.getRawMedia(entityID).get(label);
155
    		CreationUtils.removeMedia(entityID, label);
170
    		CreationUtils.removeMedia(entityID, label);
-
 
171
    		String contentLabel ="";
-
 
172
    		if(media.getType().compareTo("image") == 0){
-
 
173
    			contentLabel = media.getLabel() + "~!~" + media.getFileName();
-
 
174
    			log.info("Type is image :" + contentLabel);
156
    		
175
    		}
-
 
176
    		if(media.getType().compareTo("youtube") == 0){
-
 
177
    			contentLabel = media.getLabel() + "~!~" + media.getLocation();
-
 
178
    			log.info("Type is youtube :" + contentLabel);
-
 
179
    		}
-
 
180
			
-
 
181
			
157
    		Entity entity = Catalog.getInstance().getEntityContainer().getEntity(entityID);
182
    		Entity entity = Catalog.getInstance().getEntityContainer().getEntity(entityID);
158
			FreeformContent freeformContent = entity.getSlide(slideID).getFreeformContent(); 
183
			FreeformContent freeformContent = entity.getSlide(slideID).getFreeformContent(); 
159
			freeformContent.removeMedia("youtube",label);
-
 
160
			freeformContent.removeMedia("image",label);
184
			freeformContent.removeMedia(media.getType(), contentLabel);
161
			entity.getSlide(slideID).setFreeformContent(freeformContent);
185
			entity.getSlide(slideID).setFreeformContent(freeformContent);
162
			updateEntity(entity);
186
			updateEntity(entity);
163
			//CreationUtils.storeEntity(entity);
187
			//CreationUtils.storeEntity(entity);
164
			
188
			
165
		} catch (Exception e) {
189
		} catch (Exception e) {