Changeset 4649

Timestamp:

15/12/08 16:47:08 (11 years ago)

Author:

sdonegan

Message:

Updated and tested - also works for EDP results too now!

File:

• TI01-discovery/branches/ws-Discovery2-upgrade/src/ndg/common/discovery/Utilities.java (modified) (2 diffs)

TI01-discovery/branches/ws-Discovery2-upgrade/src/ndg/common/discovery/Utilities.java

@@ -71 +71 @@
         }
         
+        
+        /**
+         * Returns the original format deduced from the original document filename as held in the postgres db
+         * (Needed for new system of matching sql xml recs to filename)
+         * 
+         * @param filename - original document filename  
+         * @return string representing the orignal format
+         */
+        public static String getOriginalFormatFromFilename(String filename) {
+
+                String originalFormat = "";
+                
+                // i.e. dassh.ac.uk__MDIP__MRMLN001000000EB.xml or badc.nerc.ac.uk__DIF__badc.nerc.ac.uk-DIF-dataent_12282343659427027.xml
+                
+                //get index of first "__"               
+                Integer firstIndex = filename.indexOf("__");
+                Integer secondIndex = filename.indexOf("__", firstIndex + 2);
+                //logger.info("firstindex = " + firstIndex.toString() + " second Index = " + secondIndex.toString());
+                
+                //extract the format
+                originalFormat = filename.substring(firstIndex + 2, secondIndex);
+                                
+                return originalFormat;
+        }
+        
         /**
          * Returns the closing element to be used with the regex depending on requestedFormat
@@ -94 +119 @@
                 }
                 
-        return closingElement;
+                return closingElement;
         }