Changeset 18588 in vbox

Timestamp:

Apr 1, 2009 9:06:55 AM (15 years ago)

Author:

vboxsync

Message:

OVF: write tags only if they aren't empty

File:

• trunk/src/VBox/Main/ApplianceImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -2626 +2626 @@
             std::list<VirtualSystemDescriptionEntry*> llVendorUrl = vsdescThis->findByType(VirtualSystemDescriptionType_VendorUrl);
             std::list<VirtualSystemDescriptionEntry*> llVersion = vsdescThis->findByType(VirtualSystemDescriptionType_Version);
-            if (llProduct.size() ||
-                llProductUrl.size() ||
-                llVendor.size() ||
-                llVendorUrl.size() ||
-                llVersion.size())
+            bool fProduct = llProduct.size() && !llProduct.front()->strVbox.isEmpty();
+            bool fProductUrl = llProductUrl.size() && !llProductUrl.front()->strVbox.isEmpty();
+            bool fVendor = llVendor.size() && !llVendor.front()->strVbox.isEmpty();
+            bool fVendorUrl = llVendorUrl.size() && !llVendorUrl.front()->strVbox.isEmpty();
+            bool fVersion = llVersion.size() && !llVersion.front()->strVbox.isEmpty();
+            if (fProduct ||
+                fProductUrl ||
+                fVersion ||
+                fVendorUrl ||
+                fVersion)
             {
                 /* <Section ovf:required="false" xsi:type="ovf:ProductSection_Type">
@@ -2642 +2647 @@
                 xml::ElementNode *pelmAnnotationSection = pelmVirtualSystem->createChild("ProductSection");
                 pelmAnnotationSection->createChild("Info")->addContent("Meta-information about the installed software");
-                if (llProduct.size() && !llProduct.front()->strVbox.isEmpty())
+                if (fProduct)
                     pelmAnnotationSection->createChild("Product")->addContent(llProduct.front()->strVbox);
-                if (llVendor.size() && !llVendor.front()->strVbox.isEmpty())
+                if (fVendor)
                     pelmAnnotationSection->createChild("Vendor")->addContent(llVendor.front()->strVbox);
-                if (llVersion.size() && !llVersion.front()->strVbox.isEmpty())
+                if (fVersion)
                     pelmAnnotationSection->createChild("Version")->addContent(llVersion.front()->strVbox);
-                if (llProductUrl.size() && !llProductUrl.front()->strVbox.isEmpty())
+                if (fProductUrl)
                     pelmAnnotationSection->createChild("ProductUrl")->addContent(llProductUrl.front()->strVbox);
-                if (llVendorUrl.size() && !llVendorUrl.front()->strVbox.isEmpty())
+                if (fVendorUrl)
                     pelmAnnotationSection->createChild("VendorUrl")->addContent(llVendorUrl.front()->strVbox);
             }
@@ -2656 +2661 @@
             // description
             std::list<VirtualSystemDescriptionEntry*> llDescription = vsdescThis->findByType(VirtualSystemDescriptionType_Description);
-            if (llDescription.size())
+            if (llDescription.size() &&
+                !llDescription.front()->strVbox.isEmpty())
             {
                 /*  <Section ovf:required="false" xsi:type="ovf:AnnotationSection_Type">
@@ -2669 +2675 @@
             // license
             std::list<VirtualSystemDescriptionEntry*> llLicense = vsdescThis->findByType(VirtualSystemDescriptionType_License);
-            if (llLicense.size())
+            if (llLicense.size() &&
+                !llLicense.front()->strVbox.isEmpty())
             {
                 /* <EulaSection>