Changeset 3820

Timestamp:

Sep 6, 2010, 2:57:32 PM (13 years ago)

Author:

Fredrik Levander

Message:

Refs #701. Updated string matching to so that <contact not matches <contactInfo but <contact> or <contact ...

File:

• trunk/plugin/src/org/proteios/plugins/PrideExportPlugin.java (modified) (2 diffs)

trunk/plugin/src/org/proteios/plugins/PrideExportPlugin.java

@@ -3354 +3354 @@
       // selectedXMLBlockStartLinePattern example: ".*<mzData.*"
       String selectedXMLBlockStartLinePattern = new String(
-        ".*<" + selectedXmlTagName + ".*");
+        ".*<" + selectedXmlTagName + "[\\s>].*");
       // selectedXMLBlockStartTagPattern example: "<mzData"
       String selectedXMLBlockStartTagPattern = new String(
@@ -3391 +3391 @@
           {
             int startTagIndex = currentLine
-              .indexOf(selectedXMLBlockStartTagPattern);
+              .indexOf(selectedXMLBlockStartTagPattern+" ");
+            if (startTagIndex<0)
+            {
+              startTagIndex = currentLine
+              .indexOf(selectedXMLBlockStartTagPattern+">");
+            }
             if (startTagIndex >= 0)
             {