Add support for the nameorigin

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=473298

diff --git a/libscience/chemicaldataobject.h b/libscience/chemicaldataobject.h
index 7177879d622cfbd801bb067d5fb2f8fa42bea31a..ebe67a22bc36c54fada03a54d27878b3cb262b45 100644 (file)
--- a/libscience/chemicaldataobject.h
+++ b/libscience/chemicaldataobject.h
@@ -54,7 +54,8 @@ class ChemicalDataObject
                        radiusVDW/**< the van der Waals radius */,
                        meltingpoint,
                        boilingpoint,
-                       periodTableBlock
+                       periodTableBlock,
+                       nameOrigin
                };
 
                /**

diff --git a/libscience/elementparser.cpp b/libscience/elementparser.cpp
index d2da7a57842e29506448d6042e8f9c647047b156..ecf252e9e502b8e002063aab81fec73534f3019d 100644 (file)
--- a/libscience/elementparser.cpp
+++ b/libscience/elementparser.cpp
@@ -34,7 +34,8 @@ ElementSaxParser::ElementSaxParser()
        inRadiusVDW_(false),
        inBoilingPoint_(false),
        inMeltingPoint_(false),
-       inPeriodTableBlock_(false)
+       inPeriodTableBlock_(false),
+       inNameOrigin_(false)
 {
 }
 
@@ -72,6 +73,8 @@ bool ElementSaxParser::startElement(const QString&, const QString &localName, co
                                inBoilingPoint_ = true;
                        else if (attrs.value(i) == "bo:periodTableBlock")
                                inPeriodTableBlock_ = true;
+                       else if (attrs.value(i) == "bo:nameOrigin")
+                               inNameOrigin_ = true;
                }
        }
        return true;
@@ -161,6 +164,11 @@ bool ElementSaxParser::characters(const QString &ch)
                type = ChemicalDataObject::periodTableBlock; 
                inPeriodTableBlock_ = false;
        }
+       else if (inNameOrigin_) {
+               value = ch;
+               type = ChemicalDataObject::nameOrigin; 
+               inNameOrigin_ = false;
+       }
        else//it is a non known value. Do not create a wrong object but return
                return true;
 

diff --git a/libscience/elementparser.h b/libscience/elementparser.h
index 74602a230d86cecab81a5c0cbc3dfbb50e1ed070..afcb922039abcdcd35ec0580994173785d47c6a6 100644 (file)
--- a/libscience/elementparser.h
+++ b/libscience/elementparser.h
@@ -47,6 +47,7 @@ class ElementSaxParser : public QXmlDefaultHandler
                         inRadiusVDW_,
                         inBoilingPoint_,
                         inMeltingPoint_,
-                        inPeriodTableBlock_;
+                        inPeriodTableBlock_,
+                        inNameOrigin_;
 };
 #endif // ELEMENTPARSER_H