Fix bug in reading 3GPP attributes from parameter file

bodastage · Jun 26, 2018 · a3e7755 · a3e7755
1 parent b4b659e
commit a3e7755
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/dist/boda-bulkcmparser.jar b/dist/boda-bulkcmparser.jar
diff --git a/src/main/java/com/bodastage/boda_bulkcmparser/BodaBulkCMParser.java b/src/main/java/com/bodastage/boda_bulkcmparser/BodaBulkCMParser.java
@@ -37,7 +37,7 @@ public class BodaBulkCMParser {
      * 
      * Since 1.3.0
      */
-    final String VERSION = "1.3.1";
+    final String VERSION = "1.3.2";
 
     /**
      * Tracks XML elements.
@@ -776,7 +776,7 @@ public void endELementEvent(XMLEvent xmlEvent)
         if (qName.equals("attributes")) {
             attrMarker = false;
 
-            if(parserState == ParserStates.EXTRACTING_PARAMETERS && vsDataType == null){
+            if(parserState == ParserStates.EXTRACTING_PARAMETERS && vsDataType == null ){
                 updateThreeGPPAttrMap();
             }
             return;
@@ -1219,7 +1219,11 @@ private void updateThreeGPPAttrMap(){
             while (iter.hasNext()) {
                 Map.Entry<String, String> me = iter.next();
                 String parameter = me.getKey();
-                if( !attrs.contains( parameter ) ){
+
+                //Only add missing parameter is a paramterFile was not specified.
+                //The parameter file parameter list is our only interest in this 
+                //case
+                if( !attrs.contains( parameter ) && parameterFile == null ){
                     attrs.push(parameter);
                 }
             }
@@ -1348,7 +1352,7 @@ public void closeMOPWMap() {
      * @version 1.0.0
      */
     public void showHelp() {
-        System.out.println("boda-bulkcmparser "+ VERSION +" Copyright (c) 2017 Bodastage(http://www.bodastage.com)");
+        System.out.println("boda-bulkcmparser "+ VERSION +" Copyright (c) 2018 Bodastage(http://www.bodastage.com)");
         System.out.println("Parses 3GPP Bulk CM XML to csv.");
         System.out.println("Usage: java -jar boda-bulkcmparser.jar <fileToParse.xml|Directory> <outputDirectory> [parameter.conf]");
     }