FIX BUG: A bunch of MOs are missing

When the MO names in the parameter file are not exactly the
same as those in the dump file, the MO csv files are not
generated

pom.xml

@@ -4,7 +4,7 @@
  <groupId>com.bodastage.boda_huaweicmobjectparser</groupId>
  <artifactId>boda-huaweicmobjectparser</artifactId>
  <packaging>jar</packaging>
- <version>1.0.6-SNAPSHOT</version>
+ <version>1.0.7-SNAPSHOT</version>
  <name>boda-huaweicmobjectparser</name>
  <url>http://maven.apache.org</url>
  <dependencies>

src/main/java/com/bodastage/boda_huaweicmobjectparser/HuaweiCMObjectParser.java

@@ -46,7 +46,7 @@
  */
 public class HuaweiCMObjectParser {
 
- final static String VERSION = "1.0.6";
+ final static String VERSION = "1.0.7";
 
  Logger logger = LoggerFactory.getLogger(HuaweiCMObjectParser.class);
 
@@ -789,14 +789,14 @@ public void endELementEvent(XMLEvent xmlEvent)
  objectDepth--;
 
  //Skip mo if it is not in the parameter file 
- String classNameMinusNodeType = className.replaceAll("_.*$" ,"");
+ //String className = className.replaceAll("_.*$" ,"");
 
- if (!moColumns.containsKey(classNameMinusNodeType)) return;
+ if (!moColumns.containsKey(className)) return;
 
- //logger.info("classNameMinusNodeType : " + classNameMinusNodeType);
+ //logger.info("className : " + className);
 
  //Get the parameter listed in the parameter file for the managed object
- Stack<String> parameterList = moColumns.get(classNameMinusNodeType);
+ Stack<String> parameterList = moColumns.get(className);
 
  String paramNames = "";
  String paramValues = "";
@@ -807,7 +807,7 @@ public void endELementEvent(XMLEvent xmlEvent)
  String moiFile = outputDirectory + File.separatorChar + className + ".csv";
  moiPrintWriters.put(className, new PrintWriter(moiFile));
 
- Stack moiAttributes = moColumns.get(classNameMinusNodeType);
+ Stack moiAttributes = moColumns.get(className);
 
  String pName = paramNames;
  for(int i = 0; i< moiAttributes.size(); i++){
@@ -820,15 +820,15 @@ public void endELementEvent(XMLEvent xmlEvent)
  moiPrintWriters.get(className).flush();
  }
 
- Stack moiAttributes = moColumns.get(classNameMinusNodeType);
+ Stack moiAttributes = moColumns.get(className);
  moiParameterValueMap = classNameAttrsMap;
 // moiParameterValueMap = classNameAttrsMap.get(className);
 
  for (int i = 0; i < moiAttributes.size(); i++) {
  String moiName = moiAttributes.get(i).toString();
 
  //String mvParameter = className + "_" + moiName;
- String mvParameter = classNameMinusNodeType + "_" + moiName;
+ String mvParameter = className + "_" + moiName;
 
  if (moiParameterValueMap.containsKey(moiName)) {
  //Handle multivalued parameters