Merge pull request #119 from daveneiman/LIBDRS-5076-additional-fix

Change missed ERROR logging statement to WARN.
harvard-lts · Oct 14, 2016 · 609c1ee · 609c1ee
2 parents 20e08aa + e0ca2c6
commit 609c1ee
Showing 1 changed file with 17 additions and 20 deletions.
diff --git a/src/edu/harvard/hul/ois/fits/XmlContentConverter.java b/src/edu/harvard/hul/ois/fits/XmlContentConverter.java
@@ -545,27 +545,24 @@ else if (fitsElem == ImageElement.digitalCameraModelSerialNo)
             }
         }//end of for loop
 
-
-       try {
-            if(fileinfo != null) {
-            	Element created = fileinfo.getChild (ImageElement.created.toString(),ns);
-            	if(created != null) {
-            		String date = null;
-            		try {
-            			date = XmlDateFormat.exifDateTimeToXml(created.getText().trim());
-            		}
-            		catch (ParseException e) {
-            			logger.error("Warning - unable to parse date: " + e.getMessage ());
-            		}
-            		if(date != null) {
-            			mm.icm.getGeneralCaptureInformation().setDateTimeCreated(date);
-            		}
-            	}
+        if(fileinfo != null) {
+            Element created = fileinfo.getChild (ImageElement.created.toString(),ns);
+            if(created != null) {
+                String date = null;
+                try {
+                    date = XmlDateFormat.exifDateTimeToXml(created.getText().trim());
+                    if(date != null) {
+                        mm.icm.getGeneralCaptureInformation().setDateTimeCreated(date);
+                    }
+                }
+                catch (ParseException e) {
+                    logger.warn("Warning - unable to parse date: " + e.getMessage ());
+                }
+                catch (XmlContentException e) {
+                    logger.warn("Invalid MIX content for data element [" + date + "]: " + e.getMessage ());
+                }
             }
-       }
-       catch (XmlContentException e) {
-    	   logger.error("Invalid MIX content: " + e.getMessage ());
-       }
+        }
 
         return mm.mix;
     }