Merging 7.8 to 7.10

* 7.8:
  It is now possible to map XPath expression that points to an attribute to a file chooser. Pointing to a tag will still automatically pick first src attribute from that tag when mapping to a file chooser.

src/com/hannonhill/smt/util/WebServicesUtil.java

@@ -220,8 +220,7 @@ private static String trimMetadataFieldValue(String fieldName, String fieldValue
 
     /**
      * Assigns given fieldValue of given fieldName to metadata object if it is a standard metadata field or
-     * adds it to the list of
-     * dynamicFields.
+     * adds it to the list of dynamicFields.
      * 
      * @param metadata
      * @param dynamicFields
@@ -306,6 +305,10 @@ else if (field.getChooserType() == ChooserType.FILE)
         {
             fieldValue = JTidy.tidyContentConditionally(fieldValue);
             String path = XmlAnalyzer.getFirstSrcAttribute(fieldValue);
+
+            if (path == null)
+                path = fieldValue;
+
             if (path != null && !path.trim().equals(""))
             {
                 path = path.trim();