fix nested lamp components

Author: kflemin

…c 26W Compact Fluorescent/component.xml …uorescent Integral Ballast/component.xmllib/components/Electric Lighting/Lamps/Non-SSL Lamps/Generic 26W Compact Fluorescent/Generic 26W Compact Fluorescent/component.xml renamed to lib/components/Electric Lighting/Lamps/Non-SSL Lamps/Generic 26W Compact Fluorescent Integral Ballast/component.xml lib/components/Electric Lighting/Lamps/Non-SSL Lamps/Generic 26W Compact Fluorescent/Generic 26W Compact Fluorescent/component.xml renamed to lib/components/Electric Lighting/Lamps/Non-SSL Lamps/Generic 26W Compact Fluorescent Integral Ballast/component.xml

@@ -1,16 +1,16 @@
 <component xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="component.xsd">
  <schema_version/>
  <name>Generic  42W Compact Fluorescent</name>
- <uid>b1190ac0-7709-0131-79d1-00ff50f47a08</uid>
- <version_id>6ed24d2c-862e-4c59-802e-b322a877df9b</version_id>
+ <uid>1c4f9e30-1749-0131-bd0c-00ffb04b4107</uid>
+ <version_id>fbb45497-a4ac-4db5-a560-96eef2b5f5b4</version_id>
  <xml_checksum/>
  <display_name/>
  <description/>
  <modeler_description/>
  <source>
   <manufacturer/>
   <model/>
-  <serial_no>2014.0</serial_no>
+  <serial_no>2013.0</serial_no>
   <year/>
   <url/>
  </source>
@@ -25,13 +25,28 @@
   </attribute>
   <attribute>
    <name>Integral Ballast</name>
-   <value>false</value>
+   <value>true</value>
    <datatype>string</datatype>
   </attribute>
   <attribute>
    <name>Input Power</name>
    <value>42.0</value>
    <datatype>float</datatype>
   </attribute>
+  <attribute>
+   <name>Mean Luminous Flux</name>
+   <value>2850.0</value>
+   <datatype>float</datatype>
+  </attribute>
+  <attribute>
+   <name>Correlated Color Temperature</name>
+   <value>6500.0</value>
+   <datatype>float</datatype>
+  </attribute>
+  <attribute>
+   <name>Color Rendering Index</name>
+   <value>81.0</value>
+   <datatype>float</datatype>
+  </attribute>
  </attributes>
 </component>

…c 42W Compact Fluorescent/component.xml …uorescent Integral Ballast/component.xmllib/components/Electric Lighting/Lamps/Non-SSL Lamps/Generic 42W Compact Fluorescent/Generic 42W Compact Fluorescent/component.xml renamed to lib/components/Electric Lighting/Lamps/Non-SSL Lamps/Generic 42W Compact Fluorescent Integral Ballast/component.xml lib/components/Electric Lighting/Lamps/Non-SSL Lamps/Generic 42W Compact Fluorescent/Generic 42W Compact Fluorescent/component.xml renamed to lib/components/Electric Lighting/Lamps/Non-SSL Lamps/Generic 42W Compact Fluorescent Integral Ballast/component.xml

@@ -1,16 +1,16 @@
 <component xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="component.xsd">
  <schema_version/>
  <name>Generic  42W Compact Fluorescent</name>
- <uid>1c4f9e30-1749-0131-bd0c-00ffb04b4107</uid>
- <version_id>fbb45497-a4ac-4db5-a560-96eef2b5f5b4</version_id>
+ <uid>b1190ac0-7709-0131-79d1-00ff50f47a08</uid>
+ <version_id>6ed24d2c-862e-4c59-802e-b322a877df9b</version_id>
  <xml_checksum/>
  <display_name/>
  <description/>
  <modeler_description/>
  <source>
   <manufacturer/>
   <model/>
-  <serial_no>2013.0</serial_no>
+  <serial_no>2014.0</serial_no>
   <year/>
   <url/>
  </source>
@@ -25,28 +25,13 @@
   </attribute>
   <attribute>
    <name>Integral Ballast</name>
-   <value>true</value>
+   <value>false</value>
    <datatype>string</datatype>
   </attribute>
   <attribute>
    <name>Input Power</name>
    <value>42.0</value>
    <datatype>float</datatype>
   </attribute>
-  <attribute>
-   <name>Mean Luminous Flux</name>
-   <value>2850.0</value>
-   <datatype>float</datatype>
-  </attribute>
-  <attribute>
-   <name>Correlated Color Temperature</name>
-   <value>6500.0</value>
-   <datatype>float</datatype>
-  </attribute>
-  <attribute>
-   <name>Color Rendering Index</name>
-   <value>81.0</value>
-   <datatype>float</datatype>
-  </attribute>
  </attributes>
 </component>