Changeset 8685

Timestamp:

02/15/09 20:07:52 (4 years ago)

Author:

mcarrick

Message:

hwdevreg and childhwdev work for a single level

Location:

ossiedev/branches/mcarrick/DPD

Files:

• DevicePkgRef.cpp (modified) (1 diff)
• DevicePkgRef.h (modified) (1 diff)
• HWDeviceRegistration.cpp (modified) (3 diffs)
• HWDeviceRegistration.h (modified) (4 diffs)
• testApp.cpp (modified) (3 diffs)

ossiedev/branches/mcarrick/DPD/DevicePkgRef.cpp

@@ -20 +20 @@
         type = elem->Attribute("type"); // store type from devicepkgref tag
 
-        std::cout << "creating reference to devicepkgref localfile..." << std::endl;
         TiXmlElement *local = elem->FirstChildElement("localfile"); // get link to localfile tag
-
-        std::cout << "getting devicepkgref localfile..." << std::endl;
         localfile = local->Attribute("name"); // store path
 }
 
-std::string DevicePkgRef::getType()
+std::string DevicePkgRef::getTypeDevPkgRef()
 {
         return type;
 }
 
-std::string DevicePkgRef::getLocalFile()
+std::string DevicePkgRef::getLocalFileDevPkgRef()
 {
         return localfile;

ossiedev/branches/mcarrick/DPD/DevicePkgRef.h

@@ -16 +16 @@
                 ~DevicePkgRef();
 
-                std::string getType();
-                std::string getLocalFile();
+                std::string getTypeDevPkgRef();
+                std::string getLocalFileDevPkgRef();
 
         protected:

ossiedev/branches/mcarrick/DPD/HWDeviceRegistration.cpp

@@ -11 +11 @@
 {
         parseElement(elem); // parse tags in hwdeviceregistration, with exception of propertyfile, deviceclass, childhwdevice
-
-        // parse childhwdevice tag(s)
-        TiXmlElement *child = elem->FirstChildElement("childhwdevice");
-        for (; child; child=child->NextSiblingElement("childhwdevice"))
-        {
-                ChildHWDevice *cDevice;
-                cDevice = new ChildHWDevice(elem->FirstChildElement("childhwdevice"));
-                std::cout << "childhwdevice object created..." << std::endl;
-
-                childHWDevices.push_back(cDevice);
-                std::cout << "childhwdevice pushed..." << std::endl;
-        }
-
-        std::cout << "returning from hwdeviceregistration constructor..." << std::endl;
+        constructChildHWDevice(elem->FirstChildElement("childhwdevice")); // cannot call constructor on ChildHWDevice, use this function to do it
 }
 
@@ -31 +18 @@
 }
 
+void HWDeviceRegistration::constructChildHWDevice(TiXmlElement *elem)
+{
+        std::cout << "constructing hwdeviceregistration ... " << std::endl;
+
+        // parse childhwdevice tag(s)
+        for (; elem; elem=elem->NextSiblingElement("childhwdevice"))
+        {
+                // create child device object
+                ChildHWDevice *cDevice;
+                cDevice = new ChildHWDevice(elem);
+
+                // push new child device onto vector
+                childHWDevices.push_back(cDevice);
+        }
+}
+
+// parse attributes within hwdeviceregistration tag
 void HWDeviceRegistration::parseElement(TiXmlElement *elem)
 {
@@ -51 +55 @@
 }
 
-ChildHWDevice* HWDeviceRegistration::parseChildHWDevice(TiXmlElement *elem)
+ChildHWDevice::ChildHWDevice(TiXmlElement *elem):DevicePkgRef(elem->FirstChildElement("devicepkgref")),HWDeviceRegistration(elem->FirstChildElement("hwdeviceregistration"))
 {
-        std::cout << "parsing childhwdevice..." << std::endl;
-}
-
-ChildHWDevice::ChildHWDevice(TiXmlElement *elem):DevicePkgRef(elem->FirstChildElement("devicepkgref"))
-{
-        std::cout << "child hw device constructor..." << std::endl;
+        std::cout << "childhwdevice constructor ... " << std::endl;
 }
 

ossiedev/branches/mcarrick/DPD/HWDeviceRegistration.h

@@ -34 +34 @@
         protected:
                 void parseElement(TiXmlElement *elem);
-                ChildHWDevice* parseChildHWDevice(TiXmlElement *elem);
+                void constructChildHWDevice(TiXmlElement *elem);
 
         private:
@@ -51 +51 @@
 };
 
-class ChildHWDevice:public DevicePkgRef
+class ChildHWDevice:public DevicePkgRef, public HWDeviceRegistration
 {
         public:
@@ -57 +57 @@
                 ~ChildHWDevice();
 
-                //HWDeviceRegistration getHWDeviceRegistration();
+        //      HWDeviceRegistration getHWDeviceRegistration();
 
         protected:
@@ -66 +66 @@
                 ChildHWDevice(const ChildHWDevice& aChildHWDevice); // no copying
 
-                //HWDeviceRegistration hwDeviceReg(TiXmlElement *elem);
-                //void parseHWDeviceRegistration(TiXmlElement *elem);
+        //      HWDeviceRegistration hwDeviceReg(TiXmlElement *elem);
+        //      void parseHWDeviceRegistration(TiXmlElement *elem);
 
 };

ossiedev/branches/mcarrick/DPD/testApp.cpp

@@ -1 @@
-//#include "DeviceClass.h"
 #include "DevicePkgRef.h"
-//#include "PropertyFile.h"
 #include "HWDeviceRegistration.h"
 //#include "DevicePkg.h"
@@ -75 +73 @@
                 std::cout << std::endl << std::endl;
 
-                std::cout << "<hwdeviceregistration " << parse.getID() << " version=" << parse.getVersion() << " name=" << parse.getName() << ">" << std::endl;
-                std::cout << "          <propertyfile type=" << parse.getType() << ">" << std::endl;
-                std::cout << "                  <localfile name=" << parse.getLocalFile() << ">" << std::endl;
-                std::cout << "          </propertyfile>" << std::endl;
-                std::cout << "          <description>" << parse.getDescription() << "</description" << std::endl;
-                std::cout << "          <manufacturer>" << parse.getManufacturer() << "</manufacturer>" << std::endl;
-                std::cout << "          <modelnumber>" << parse.getModelNumber() << "</modelnumber>" << std::endl;
-                std::cout << "          <deviceclass>" << std::endl;
+                std::cout << "<hwdeviceregistration id=" << parse.getID() << " version=" << parse.getVersion() << " name=" << parse.getName() << ">" << std::endl;
+                std::cout << "  <propertyfile type=" << parse.getType() << ">" << std::endl;
+                std::cout << "          <localfile name=" << parse.getLocalFile() << ">" << std::endl;
+                std::cout << "  </propertyfile>" << std::endl;
+                std::cout << "  <description>" << parse.getDescription() << "</description" << std::endl;
+                std::cout << "  <manufacturer>" << parse.getManufacturer() << "</manufacturer>" << std::endl;
+                std::cout << "  <modelnumber>" << parse.getModelNumber() << "</modelnumber>" << std::endl;
+                std::cout << "  <deviceclass>" << std::endl;
 
                 for (int i = 0; i < parse.getDeviceClass().size(); i++)
                 {
-                        std::cout << "                  <class>" << parse.getDeviceClass()[i] << "</class>" << std::endl;
+                        std::cout << "          <class>" << parse.getDeviceClass()[i] << "</class>" << std::endl;
                 }
-                std::cout << "          </deviceclass>" << std::endl;
+                std::cout << "  </deviceclass>" << std::endl;
+
+                std::cout << "  <childhwdevice>" << std::endl;
+                std::cout << "          <hwdeviceregistration id=" << parse.getChildHWDevice()[0]->getID();
+                        std::cout << " version=" << parse.getChildHWDevice()[0]->getVersion() << " name=" << parse.getChildHWDevice()[0]->getName() << " >" << std::endl;
+                std::cout << "                  <propertyfile " << parse.getChildHWDevice()[0]->getType() << "> " << std::endl;
+                std::cout << "                          <localfile name=" << parse.getChildHWDevice()[0]->getLocalFile() << "/> " << std::endl;
+                std::cout << "                  </propertyfile>" << std::endl;
+                std::cout << "                  <description>" << parse.getChildHWDevice()[0]->getDescription() << "</description>" << std::endl;
+                std::cout << "                  <manufacturer>" << parse.getChildHWDevice()[0]->getManufacturer() << "</manufacturer>" << std::endl;
+                std::cout << "                  <modelnumber>" << parse.getChildHWDevice()[0]->getModelNumber() << "</modelnumber>" << std::endl;
+                std::cout << "                  <deviceclass>" << std::endl;
+                std::cout << "                          <class>" << parse.getChildHWDevice()[0]->getDeviceClass()[0] << "</class>" << std::endl;
+                std::cout << "                  </deviceclass>" << std::endl;
+                std::cout << "          </hwdeviceregistration>" << std::endl;
+                std::cout << "          <devicepkgref>" << std::endl;
+                std::cout << "                  <localfile name=" << parse.getChildHWDevice()[0]->getLocalFileDevPkgRef() << "/>" << std::endl;
+                std::cout << "          </devicepkgref>" << std::endl;
+                std::cout << "  </childhwdevice>" << std::endl;
                 std::cout << "</hwdeviceregistration>" << std::endl;
+
 
                 std::cout << std::endl << std::endl;
@@ -117 +134 @@
                 std::cout << "********************" << std::endl;
                 std::cout << "DevicePkgRef:" << std::endl;
-                std::cout << "type: " << parse.getType() << std::endl;
-                std::cout << "localfile: " << parse.getLocalFile() << std::endl;
+                std::cout << "type: " << parse.getTypeDevPkgRef() << std::endl;
+                std::cout << "localfile: " << parse.getLocalFileDevPkgRef() << std::endl;
                 std::cout << "********************" << std::endl;