Project

General

Profile

« Previous | Next » 

Revision 892efc69

Added by Andreas Kohlbecker almost 14 years ago

merging /branches/cdmlib/SPRINT-Chichorieae1/ to trunk

View differences:

app-import/src/main/java/eu/etaxonomy/cdm/io/PalmaeImageImport.java
105 105
				
106 106
				Item item = (Item) object;
107 107
				
108
				
109
				
110 108
				if(item.getKeyword().equals("ObjectName")){
111 109
					logger.debug("File: " + imageFile.getName() + ". ObjectName string is: " + item.getText());
112 110
					String[] objectNameSplit = item.getText().split(";");
......
126 124
	}
127 125
	
128 126
	public Map<MetaData, String> getMetaData(File imageFile, List<MetaData> metaData){
129
		HashMap result = new HashMap();
127
		HashMap<MetaData, String> result = new HashMap<MetaData, String>();
130 128
		
131 129
		IImageMetadata metadata = null;
132 130
		List<String> metaDataStrings = new ArrayList<String>();
......
149 147
		if(metadata instanceof JpegImageMetadata){
150 148
			JpegImageMetadata jpegMetadata = (JpegImageMetadata) metadata;
151 149
			
152
			int counter = 0;
153
				for (Object object : jpegMetadata.getItems()){
154
					Item item = (Item) object;
155
					
156
					if(metaDataStrings.contains(item.getKeyword().toLowerCase())){
157
						logger.debug("File: " + imageFile.getName() + ". "+ item.getKeyword() +"string is: " + item.getText());
158
						result.put(MetaData.valueOf(item.getKeyword().toUpperCase()), item.getText());
159
						Set<Entry<MetaData, String>> resultSet = result.entrySet();
160
							
161
					}
162
						
150
			for (Object object : jpegMetadata.getItems()){
151
				Item item = (Item) object;
152
				
153
				if(metaDataStrings.contains(item.getKeyword().toLowerCase())){
154
					logger.debug("File: " + imageFile.getName() + ". "+ item.getKeyword() +"string is: " + item.getText());
155
					result.put(MetaData.valueOf(item.getKeyword().toUpperCase()), item.getText());
156
					Set<Entry<MetaData, String>> resultSet = result.entrySet();
163 157
				}
158
			}
164 159
		}
165 160
		
166 161
		return result;
......
183 178
					logger.debug("Looking up taxa with taxon name: " + taxonName);
184 179
					
185 180
					//TODO:
186
					ArrayList<MetaData> metaDataList = new ArrayList();
181
					ArrayList<MetaData> metaDataList = new ArrayList<MetaData>();
187 182
					metaDataList.add (MetaData.ARTIST);
188 183
					metaDataList.add (MetaData.COPYRIGHT);
189 184
					metaDataList.add (MetaData.COPYRIGHTNOTICE);
......
285 280
						
286 281
						feature.addMedia(media);
287 282
						
288
						feature.setType(Feature.IMAGE());
283
						feature.setFeature(Feature.IMAGE());
289 284
						ReferenceBase sourceRef = config.getSourceReference();
290 285
						TaxonDescription description = taxon.getOrCreateImageGallery(sourceRef == null ? null :sourceRef.getTitleCache());
291 286
						

Also available in: Unified diff