- its 'freshens'
authorKlaus Kaempf <kkaempf@suse.de>
Fri, 24 Feb 2006 18:54:53 +0000 (18:54 +0000)
committerKlaus Kaempf <kkaempf@suse.de>
Fri, 24 Feb 2006 18:54:53 +0000 (18:54 +0000)
- sane indentation

zypp/parser/yum/YUMPatchParser.cc

index 513cc0d..7e38889 100644 (file)
@@ -32,7 +32,7 @@ namespace zypp {
       YUMPatchParser::YUMPatchParser(istream &is, const string& baseUrl)
       : XMLNodeIterator<YUMPatchData_Ptr>(is, baseUrl,PATCHSCHEMA)
       {
-        fetchNext();
+       fetchNext();
       }
       
       YUMPatchParser::YUMPatchParser()
@@ -47,218 +47,220 @@ namespace zypp {
       bool 
       YUMPatchParser::isInterested(const xmlNodePtr nodePtr)
       {
-        return _helper.isElement(nodePtr) && _helper.name(nodePtr) == "patch";
+       return _helper.isElement(nodePtr) && _helper.name(nodePtr) == "patch";
       }
       
       // do the actual processing
       YUMPatchData_Ptr
       YUMPatchParser::process(const xmlTextReaderPtr reader)
       {
-        assert(reader);
-        YUMPatchData_Ptr patchPtr = new YUMPatchData;
-        xmlNodePtr dataNode = xmlTextReaderExpand(reader);
-        assert(dataNode);
-        patchPtr->timestamp = _helper.attribute(dataNode,"timestamp");
-        patchPtr->patchId = _helper.attribute(dataNode,"patchid");
-        patchPtr->engine = _helper.attribute(dataNode,"engine");
-      
-        // default values for optional entries
-        patchPtr->rebootNeeded = false;
-        patchPtr->packageManager = false;
-      
-        // FIXME move the respective method to a common class, inherit it  
-        YUMPrimaryParser prim;
-      
-        for (xmlNodePtr child = dataNode->children; 
-             child && child != dataNode;
-             child = child->next) {
-          if (_helper.isElement(child)) {
-            string name = _helper.name(child);
-            if (name == "name") {
+       assert(reader);
+       YUMPatchData_Ptr patchPtr = new YUMPatchData;
+       xmlNodePtr dataNode = xmlTextReaderExpand(reader);
+       assert(dataNode);
+       patchPtr->timestamp = _helper.attribute(dataNode,"timestamp");
+       patchPtr->patchId = _helper.attribute(dataNode,"patchid");
+       patchPtr->engine = _helper.attribute(dataNode,"engine");
+      
+       // default values for optional entries
+       patchPtr->rebootNeeded = false;
+       patchPtr->packageManager = false;
+      
+       // FIXME move the respective method to a common class, inherit it  
+       YUMPrimaryParser prim;
+      
+       for (xmlNodePtr child = dataNode->children; 
+            child && child != dataNode;
+            child = child->next) {
+         if (_helper.isElement(child)) {
+           string name = _helper.name(child);
+           if (name == "name") {
        patchPtr->name = _helper.content(child);
-            }
-            else if (name == "summary") {
-              patchPtr->summary.setText(_helper.content(child), Locale(_helper.attribute(child,"lang")));
-            }
-            else if (name == "description") {
-              patchPtr->description.setText(_helper.content(child), Locale(_helper.attribute(child,"lang")));
-            }
-            else if (name == "version") {
-              patchPtr->epoch = _helper.attribute(child,"epoch");
-              patchPtr->ver = _helper.attribute(child,"ver");
-              patchPtr->rel = _helper.attribute(child,"rel");
-            }
-            else if (name == "provides") {
-              prim.parseDependencyEntries(& patchPtr->provides, child);
-            }
-            else if (name == "conflicts") {
-              prim.parseDependencyEntries(& patchPtr->conflicts, child);
-            }
-            else if (name == "obsoletes") {
-              prim.parseDependencyEntries(& patchPtr->obsoletes, child);
-            }
-            else if (name == "requires") {
-              prim.parseDependencyEntries(& patchPtr->requires, child);
-            }
-            else if (name == "recommends") {
-              prim.parseDependencyEntries(& patchPtr->recommends, child);
-            }
-            else if (name == "suggests") {
-              prim.parseDependencyEntries(& patchPtr->suggests, child);
-            }
-            else if (name == "supplements") {
-              prim.parseDependencyEntries(& patchPtr->supplements, child);
-            }
-            else if (name == "enhances") {
-              prim.parseDependencyEntries(& patchPtr->enhances, child);
-            }
-            else if (name == "freshen") {
-              prim.parseDependencyEntries(& patchPtr->freshen, child);
-            }
-            else if (name == "category") {
+           }
+           else if (name == "summary") {
+             patchPtr->summary.setText(_helper.content(child), Locale(_helper.attribute(child,"lang")));
+           }
+           else if (name == "description") {
+             patchPtr->description.setText(_helper.content(child), Locale(_helper.attribute(child,"lang")));
+           }
+           else if (name == "version") {
+             patchPtr->epoch = _helper.attribute(child,"epoch");
+             patchPtr->ver = _helper.attribute(child,"ver");
+             patchPtr->rel = _helper.attribute(child,"rel");
+           }
+           else if (name == "provides") {
+             prim.parseDependencyEntries(& patchPtr->provides, child);
+           }
+           else if (name == "conflicts") {
+             prim.parseDependencyEntries(& patchPtr->conflicts, child);
+           }
+           else if (name == "obsoletes") {
+             prim.parseDependencyEntries(& patchPtr->obsoletes, child);
+           }
+           else if (name == "requires") {
+             prim.parseDependencyEntries(& patchPtr->requires, child);
+           }
+           else if (name == "recommends") {
+             prim.parseDependencyEntries(& patchPtr->recommends, child);
+           }
+           else if (name == "suggests") {
+             prim.parseDependencyEntries(& patchPtr->suggests, child);
+           }
+           else if (name == "supplements") {
+             prim.parseDependencyEntries(& patchPtr->supplements, child);
+           }
+           else if (name == "enhances") {
+             prim.parseDependencyEntries(& patchPtr->enhances, child);
+           }
+           else if (name == "freshens") {
+             prim.parseDependencyEntries(& patchPtr->freshen, child);
+           }
+           else if (name == "category") {
        patchPtr->category = _helper.content(child);
-            }
-            else if (name == "reboot_needed") {
+           }
+           else if (name == "reboot_needed") {
        patchPtr->rebootNeeded = true;
-            }
-            else if (name == "package_manager") {
+           }
+           else if (name == "package_manager") {
        patchPtr->packageManager = true;
-            }
-            else if (name == "update_script") {
+           }
+           else if (name == "update_script") {
        patchPtr->updateScript = _helper.content(child);
-            }
-            else if (name == "atoms") {
-              parseAtomsNode(patchPtr, child);
-            }
-            else {
-              WAR << "YUM <data> contains the unknown element <" << name << "> "
-                << _helper.positionInfo(child) << ", skipping" << endl;
-            }
-          }
-        }
-        return patchPtr;
+           }
+           else if (name == "atoms") {
+             parseAtomsNode(patchPtr, child);
+           }
+           else {
+             WAR << "YUM <data> contains the unknown element <" << name << "> "
+               << _helper.positionInfo(child) << ", skipping" << endl;
+           }
+         }
+       }
+       return patchPtr;
       } /* end process */
       
       
       void 
       YUMPatchParser::parseAtomsNode(YUMPatchData_Ptr dataPtr,
-                                     xmlNodePtr formatNode)
+                                    xmlNodePtr formatNode)
       {
-        assert(formatNode);
-        for (xmlNodePtr child = formatNode->children; 
-             child != 0;
-             child = child ->next) {
-          if (_helper.isElement(child)) {
-            string name = _helper.name(child);
-            if (name == "package")
-            {
-       parsePackageNode (dataPtr, child);
-            }
-            else if (name == "script")
-            {
-       parseScriptNode (dataPtr, child);
-            }
-            else if (name == "message")
-            {
-       parseMessageNode (dataPtr, child);
-            }
-            else {
-              WAR << "YUM <atoms> contains the unknown element <" << name << "> "
-                << _helper.positionInfo(child) << ", skipping" << endl;
-            }
-          }
-        }
+       assert(formatNode);
+       for (xmlNodePtr child = formatNode->children; 
+            child != 0;
+            child = child ->next) {
+         if (_helper.isElement(child)) {
+           string name = _helper.name(child);
+XXX << "parseAtomsNode(" << name << ")" << endl;
+           if (name == "package")
+           {
+               parsePackageNode (dataPtr, child);
+           }
+           else if (name == "script")
+           {
+               parseScriptNode (dataPtr, child);
+           }
+           else if (name == "message")
+           {
+               parseMessageNode (dataPtr, child);
+           }
+           else {
+             WAR << "YUM <atoms> contains the unknown element <" << name << "> "
+               << _helper.positionInfo(child) << ", skipping" << endl;
+           }
+         }
+       }
       }
       
       void 
       YUMPatchParser::parseFormatNode(YUMPatchPackage *dataPtr,
-                                              xmlNodePtr formatNode)
+                                             xmlNodePtr formatNode)
       {
-        assert(formatNode);
-        dataPtr->installOnly = false;
-      
-        // FIXME move the respective method to a common class, inherit it  
-        YUMPrimaryParser prim;
-      
-        for (xmlNodePtr child = formatNode->children; 
-             child != 0;
-             child = child ->next) {
-          if (_helper.isElement(child)) {
-            string name = _helper.name(child);
-            if (name == "license") {
-              dataPtr->license = _helper.content(child);
-            }
-            else if (name == "vendor") {
-              dataPtr->vendor = _helper.content(child);
-            }
-            else if (name == "group") {
-              dataPtr->group = _helper.content(child);
-            }
-            else if (name == "buildhost") {
-              dataPtr->buildhost = _helper.content(child);
-            }
-            else if (name == "sourcerpm") {
-              dataPtr->sourcerpm = _helper.content(child);
-            }
-            else if (name == "header-range") {
-              dataPtr->headerStart = _helper.attribute(child,"start");
-              dataPtr->headerEnd = _helper.attribute(child,"end");
-            }
-            else if (name == "provides") {
-              prim.parseDependencyEntries(& dataPtr->provides, child);
-            }
-            else if (name == "conflicts") {
-              prim.parseDependencyEntries(& dataPtr->conflicts, child);
-            }
-            else if (name == "obsoletes") {
-              prim.parseDependencyEntries(& dataPtr->obsoletes, child);
-            }
-            else if (name == "requires") {
-              prim.parseDependencyEntries(& dataPtr->requires, child);
-            }
-            else if (name == "recommends") {
-              prim.parseDependencyEntries(& dataPtr->recommends, child);
-            }
-            else if (name == "suggests") {
-              prim.parseDependencyEntries(& dataPtr->suggests, child);
-            }
-            else if (name == "supplements") {
-              prim.parseDependencyEntries(& dataPtr->supplements, child);
-            }
-            else if (name == "enhances") {
-              prim.parseDependencyEntries(& dataPtr->enhances, child);
-            }
-            else if (name == "file") {
-              dataPtr->files.push_back
-                (FileData(_helper.content(child),
-                          _helper.attribute(child,"type")));
-            }
-            /* SUSE specific elements */
-            else if (name == "authors") {
-              prim.parseAuthorEntries(& dataPtr->authors, child);
-            }
-            else if (name == "keywords") {
-              prim.parseKeywordEntries(& dataPtr->keywords, child);
-            }
-            else if (name == "media") {
-              dataPtr->media = _helper.attribute(child,"mediaid");
-            }
-            else if (name == "dirsizes") {
-              prim.parseDirsizeEntries(& dataPtr->dirSizes, child);
-            }
-            else if (name == "freshen") {
-              prim.parseDependencyEntries(& dataPtr->freshen, child);
-            }
-            else if (name == "install_only") {
-              dataPtr->installOnly = true;
-            }
-            else {
-              WAR << "YUM <atom/package/format> contains the unknown element <"
+       assert(formatNode);
+       dataPtr->installOnly = false;
+      
+       // FIXME move the respective method to a common class, inherit it  
+       YUMPrimaryParser prim;
+      
+       for (xmlNodePtr child = formatNode->children; 
+            child != 0;
+            child = child ->next) {
+         if (_helper.isElement(child)) {
+           string name = _helper.name(child);
+XXX << "parseFormatNode(" << name << ")" << endl;
+           if (name == "license") {
+             dataPtr->license = _helper.content(child);
+           }
+           else if (name == "vendor") {
+             dataPtr->vendor = _helper.content(child);
+           }
+           else if (name == "group") {
+             dataPtr->group = _helper.content(child);
+           }
+           else if (name == "buildhost") {
+             dataPtr->buildhost = _helper.content(child);
+           }
+           else if (name == "sourcerpm") {
+             dataPtr->sourcerpm = _helper.content(child);
+           }
+           else if (name == "header-range") {
+             dataPtr->headerStart = _helper.attribute(child,"start");
+             dataPtr->headerEnd = _helper.attribute(child,"end");
+           }
+           else if (name == "provides") {
+             prim.parseDependencyEntries(& dataPtr->provides, child);
+           }
+           else if (name == "conflicts") {
+             prim.parseDependencyEntries(& dataPtr->conflicts, child);
+           }
+           else if (name == "obsoletes") {
+             prim.parseDependencyEntries(& dataPtr->obsoletes, child);
+           }
+           else if (name == "requires") {
+             prim.parseDependencyEntries(& dataPtr->requires, child);
+           }
+           else if (name == "recommends") {
+             prim.parseDependencyEntries(& dataPtr->recommends, child);
+           }
+           else if (name == "suggests") {
+             prim.parseDependencyEntries(& dataPtr->suggests, child);
+           }
+           else if (name == "supplements") {
+             prim.parseDependencyEntries(& dataPtr->supplements, child);
+           }
+           else if (name == "enhances") {
+             prim.parseDependencyEntries(& dataPtr->enhances, child);
+           }
+           else if (name == "file") {
+             dataPtr->files.push_back
+               (FileData(_helper.content(child),
+                         _helper.attribute(child,"type")));
+           }
+           /* SUSE specific elements */
+           else if (name == "authors") {
+             prim.parseAuthorEntries(& dataPtr->authors, child);
+           }
+           else if (name == "keywords") {
+             prim.parseKeywordEntries(& dataPtr->keywords, child);
+           }
+           else if (name == "media") {
+             dataPtr->media = _helper.attribute(child,"mediaid");
+           }
+           else if (name == "dirsizes") {
+             prim.parseDirsizeEntries(& dataPtr->dirSizes, child);
+           }
+           else if (name == "freshens") {
+             prim.parseDependencyEntries(& dataPtr->freshen, child);
+           }
+           else if (name == "install_only") {
+             dataPtr->installOnly = true;
+           }
+           else {
+             WAR << "YUM <atom/package/format> contains the unknown element <"
          << name << "> "
-                << _helper.positionInfo(child) << ", skipping" << endl;
-            }
-          }
-        }
+               << _helper.positionInfo(child) << ", skipping" << endl;
+           }
+         }
+       }
       }
       
       void
@@ -266,21 +268,21 @@ namespace zypp {
                                xmlNodePtr formatNode)
       {
        PlainRpm plainRpm;
-        plainRpm.arch = _helper.attribute( formatNode, "arch" );
-        plainRpm.filename = _helper.attribute( formatNode, "filename" );
-        plainRpm.downloadsize = _helper.attribute( formatNode, "downloadsize" );
-        plainRpm.md5sum = _helper.attribute( formatNode, "md5sum" );
-        plainRpm.buildtime = _helper.attribute( formatNode, "buildtime" );
-        for (xmlNodePtr child = formatNode->children; 
-             child != 0;
-             child = child ->next) {
-          if (_helper.isElement(child)) {
-            string name = _helper.name(child);
-            WAR << "YUM <atom/package/pkgfiles/plain> contains the unknown element <"
+       plainRpm.arch = _helper.attribute( formatNode, "arch" );
+       plainRpm.filename = _helper.attribute( formatNode, "filename" );
+       plainRpm.downloadsize = _helper.attribute( formatNode, "downloadsize" );
+       plainRpm.md5sum = _helper.attribute( formatNode, "md5sum" );
+       plainRpm.buildtime = _helper.attribute( formatNode, "buildtime" );
+       for (xmlNodePtr child = formatNode->children; 
+            child != 0;
+            child = child ->next) {
+         if (_helper.isElement(child)) {
+           string name = _helper.name(child);
+           WAR << "YUM <atom/package/pkgfiles/plain> contains the unknown element <"
        << name << "> "
-              << _helper.positionInfo(child) << ", skipping" << endl;
-          }
-        }
+             << _helper.positionInfo(child) << ", skipping" << endl;
+         }
+       }
        dataPtr->plainRpms.push_back(plainRpm);
       }
       
@@ -289,28 +291,28 @@ namespace zypp {
                                xmlNodePtr formatNode)
       {
        PatchRpm patchRpm;
-        patchRpm.arch = _helper.attribute( formatNode, "arch" );
-        patchRpm.filename = _helper.attribute( formatNode, "filename" );
-        patchRpm.downloadsize = _helper.attribute( formatNode, "downloadsize" );
-        patchRpm.md5sum = _helper.attribute( formatNode, "md5sum" );
-        patchRpm.buildtime = _helper.attribute( formatNode, "buildtime" );
-        for (xmlNodePtr child = formatNode->children; 
-             child != 0;
-             child = child ->next) {
-          if (_helper.isElement(child)) {
-            string name = _helper.name(child);
-            if (name == "base_version") {
+       patchRpm.arch = _helper.attribute( formatNode, "arch" );
+       patchRpm.filename = _helper.attribute( formatNode, "filename" );
+       patchRpm.downloadsize = _helper.attribute( formatNode, "downloadsize" );
+       patchRpm.md5sum = _helper.attribute( formatNode, "md5sum" );
+       patchRpm.buildtime = _helper.attribute( formatNode, "buildtime" );
+       for (xmlNodePtr child = formatNode->children; 
+            child != 0;
+            child = child ->next) {
+         if (_helper.isElement(child)) {
+           string name = _helper.name(child);
+           if (name == "base_version") {
              YUMBaseVersion base_version;
              parsePkgBaseVersionNode( &base_version, child);
-              patchRpm.baseVersions.push_back( base_version );
-            }
-            else {
-              WAR << "YUM <atom/package/pkgfiles/patch> contains the unknown element <"
+             patchRpm.baseVersions.push_back( base_version );
+           }
+           else {
+             WAR << "YUM <atom/package/pkgfiles/patch> contains the unknown element <"
          << name << "> "
-                << _helper.positionInfo(child) << ", skipping" << endl;
-            }
-          }
-        }
+               << _helper.positionInfo(child) << ", skipping" << endl;
+           }
+         }
+       }
        dataPtr->patchRpms.push_back(patchRpm);
       }
       
@@ -319,27 +321,27 @@ namespace zypp {
                                xmlNodePtr formatNode)
       {
        DeltaRpm deltaRpm;
-        deltaRpm.arch = _helper.attribute( formatNode, "arch" );
-        deltaRpm.filename = _helper.attribute( formatNode, "filename" );
-        deltaRpm.downloadsize = _helper.attribute( formatNode, "downloadsize" );
-        deltaRpm.md5sum = _helper.attribute( formatNode, "md5sum" );
-        deltaRpm.buildtime = _helper.attribute( formatNode, "buildtime" );
-        for (xmlNodePtr child = formatNode->children; 
-             child != 0;
-             child = child ->next) {
-          if (_helper.isElement(child)) {
-            string name = _helper.name(child);
-            if (name == "base_version") {
+       deltaRpm.arch = _helper.attribute( formatNode, "arch" );
+       deltaRpm.filename = _helper.attribute( formatNode, "filename" );
+       deltaRpm.downloadsize = _helper.attribute( formatNode, "downloadsize" );
+       deltaRpm.md5sum = _helper.attribute( formatNode, "md5sum" );
+       deltaRpm.buildtime = _helper.attribute( formatNode, "buildtime" );
+       for (xmlNodePtr child = formatNode->children; 
+            child != 0;
+            child = child ->next) {
+         if (_helper.isElement(child)) {
+           string name = _helper.name(child);
+           if (name == "base_version") {
              parsePkgBaseVersionNode( &(deltaRpm.baseVersion), child);
-            }
-            else {
-              WAR << "YUM <atom/package/pkgfiles/delta> contains the unknown element <"
+           }
+           else {
+             WAR << "YUM <atom/package/pkgfiles/delta> contains the unknown element <"
          << name << "> "
-                << _helper.positionInfo(child) << ", skipping" << endl;
-            }
-          }
-        }
-        dataPtr->deltaRpms.push_back(deltaRpm);
+               << _helper.positionInfo(child) << ", skipping" << endl;
+           }
+         }
+       }
+       dataPtr->deltaRpms.push_back(deltaRpm);
       }
       
       
@@ -347,39 +349,39 @@ namespace zypp {
       YUMPatchParser::parsePkgBaseVersionNode(YUMBaseVersion *dataPtr,
                                        xmlNodePtr formatNode)
       {
-        dataPtr->epoch = _helper.attribute( formatNode, "epoch" );
-        dataPtr->ver = _helper.attribute( formatNode, "ver" );
-        dataPtr->rel = _helper.attribute( formatNode, "rel" );
-        dataPtr->md5sum = _helper.attribute( formatNode, "md5sum" );
-        dataPtr->buildtime = _helper.attribute( formatNode, "buildtime" );
-        dataPtr->source_info = _helper.attribute( formatNode, "source_info" );
+       dataPtr->epoch = _helper.attribute( formatNode, "epoch" );
+       dataPtr->ver = _helper.attribute( formatNode, "ver" );
+       dataPtr->rel = _helper.attribute( formatNode, "rel" );
+       dataPtr->md5sum = _helper.attribute( formatNode, "md5sum" );
+       dataPtr->buildtime = _helper.attribute( formatNode, "buildtime" );
+       dataPtr->source_info = _helper.attribute( formatNode, "source_info" );
       }
       
       void
       YUMPatchParser::parsePkgFilesNode(YUMPatchPackage *dataPtr,
                                 xmlNodePtr formatNode)
       {
-        for (xmlNodePtr child = formatNode->children; 
-             child != 0;
-             child = child ->next) {
-          if (_helper.isElement(child)) {
-            string name = _helper.name(child);
-            if (name == "plainrpm") {
+       for (xmlNodePtr child = formatNode->children; 
+            child != 0;
+            child = child ->next) {
+         if (_helper.isElement(child)) {
+           string name = _helper.name(child);
+           if (name == "plainrpm") {
        parsePkgPlainRpmNode( dataPtr, child );
-            }
-            else if (name == "patchrpm") {
+           }
+           else if (name == "patchrpm") {
        parsePkgPatchRpmNode( dataPtr, child );
-            }
-            else if (name == "deltarpm") {
+           }
+           else if (name == "deltarpm") {
        parsePkgDeltaRpmNode( dataPtr, child );
-            }
-            else {
-              WAR << "YUM <atom/package/pkgfiles> contains the unknown element <"
+           }
+           else {
+             WAR << "YUM <atom/package/pkgfiles> contains the unknown element <"
          << name << "> "
-                << _helper.positionInfo(child) << ", skipping" << endl;
-            }
-          }
-        }
+               << _helper.positionInfo(child) << ", skipping" << endl;
+           }
+         }
+       }
       }
       
       
@@ -389,202 +391,203 @@ namespace zypp {
       
       void
       YUMPatchParser::parsePackageNode(YUMPatchData_Ptr dataPtr,
-                                     xmlNodePtr formatNode)
+                                    xmlNodePtr formatNode)
       {
        shared_ptr<YUMPatchPackage> package(new YUMPatchPackage);
-        package->type = _helper.attribute(formatNode,"type");
-        package->installOnly = false;
-      
-        // FIXME move the respective method to a common class, inherit it  
-        YUMPrimaryParser prim;
-      
-        for (xmlNodePtr child = formatNode->children; 
-             child != 0;
-             child = child ->next) {
-          if (_helper.isElement(child)) {
-            string name = _helper.name(child);
-            if (name == "name") {
-       package->name = _helper.content(child);
-            }
-            else if (name == "arch") {
-              package->arch = _helper.content(child);
-            }
-            else if (name == "version") {
-              package->epoch = _helper.attribute(child,"epoch");
-              package->ver = _helper.attribute(child,"ver");
-              package->rel = _helper.attribute(child,"rel");
-            }
-            else if (name == "checksum") {
-              package->checksumType = _helper.attribute(child,"type");
-              package->checksumPkgid = _helper.attribute(child,"pkgid");
-              package->checksum = _helper.content(child);
-            }
-            else if (name == "summary") {
-              package->summary = _helper.content(child);
-            }
-            else if (name == "description") {
-              package->description = _helper.content(child);
-            }
-            else if (name == "packager") {
-              package->packager = _helper.content(child);
-            }
-            else if (name == "url") {
-              package->url = _helper.content(child);
-            }
-            else if (name == "time") {
-              package->timeFile = _helper.attribute(child,"file");
-              package->timeBuild = _helper.attribute(child,"build");
-            }
-            else if (name == "size") {
-              package->sizePackage = _helper.attribute(child,"package");
-              package->sizeInstalled = _helper.attribute(child,"installed");
-              package->sizeArchive = _helper.attribute(child,"archive");
-            }
-            else if (name == "location") {
-              package->location = _helper.attribute(child,"href");
-            }
-            else if (name == "format") {
-       parseFormatNode (&*package, child);
-            }
-            else if (name == "pkgfiles")
-            {
-       parsePkgFilesNode (&*package, child);
-            }
-            else {
-              WAR << "YUM <atoms/package> contains the unknown element <"
+       package->type = _helper.attribute(formatNode,"type");
+       package->installOnly = false;
+      
+       // FIXME move the respective method to a common class, inherit it  
+       YUMPrimaryParser prim;
+      
+       for (xmlNodePtr child = formatNode->children; 
+            child != 0;
+            child = child ->next) {
+         if (_helper.isElement(child)) {
+           string name = _helper.name(child);
+XXX << "parsePackageNode(" << name << ")" << endl;
+           if (name == "name") {
+               package->name = _helper.content(child);
+           }
+           else if (name == "arch") {
+             package->arch = _helper.content(child);
+           }
+           else if (name == "version") {
+             package->epoch = _helper.attribute(child,"epoch");
+             package->ver = _helper.attribute(child,"ver");
+             package->rel = _helper.attribute(child,"rel");
+           }
+           else if (name == "checksum") {
+             package->checksumType = _helper.attribute(child,"type");
+             package->checksumPkgid = _helper.attribute(child,"pkgid");
+             package->checksum = _helper.content(child);
+           }
+           else if (name == "summary") {
+             package->summary = _helper.content(child);
+           }
+           else if (name == "description") {
+             package->description = _helper.content(child);
+           }
+           else if (name == "packager") {
+             package->packager = _helper.content(child);
+           }
+           else if (name == "url") {
+             package->url = _helper.content(child);
+           }
+           else if (name == "time") {
+             package->timeFile = _helper.attribute(child,"file");
+             package->timeBuild = _helper.attribute(child,"build");
+           }
+           else if (name == "size") {
+             package->sizePackage = _helper.attribute(child,"package");
+             package->sizeInstalled = _helper.attribute(child,"installed");
+             package->sizeArchive = _helper.attribute(child,"archive");
+           }
+           else if (name == "location") {
+             package->location = _helper.attribute(child,"href");
+           }
+           else if (name == "format") {
+               parseFormatNode (&*package, child);
+           }
+           else if (name == "pkgfiles")
+           {
+               parsePkgFilesNode (&*package, child);
+           }
+           else {
+             WAR << "YUM <atoms/package> contains the unknown element <"
          << name << "> "
-                << _helper.positionInfo(child) << ", skipping" << endl;
-            }
-          }
-        }
-        dataPtr->atoms.push_back(package);
+               << _helper.positionInfo(child) << ", skipping" << endl;
+           }
+         }
+       }
+       dataPtr->atoms.push_back(package);
       }
       
       void
       YUMPatchParser::parseScriptNode(YUMPatchData_Ptr dataPtr,
-                                     xmlNodePtr formatNode)
+                                    xmlNodePtr formatNode)
       {
        shared_ptr<YUMPatchScript> script(new YUMPatchScript);
       
-        // FIXME move the respective method to a common class, inherit it  
-        YUMPrimaryParser prim;
+       // FIXME move the respective method to a common class, inherit it  
+       YUMPrimaryParser prim;
       
-        for (xmlNodePtr child = formatNode->children; 
-             child != 0;
-             child = child ->next) {
-          if (_helper.isElement(child)) {
-            string name = _helper.name(child);
-            if (name == "name") {
+       for (xmlNodePtr child = formatNode->children; 
+            child != 0;
+            child = child ->next) {
+         if (_helper.isElement(child)) {
+           string name = _helper.name(child);
+           if (name == "name") {
        script->name = _helper.content(child);
-            }
-            else if (name == "version") {
-              script->epoch = _helper.attribute(child,"epoch");
-              script->ver = _helper.attribute(child,"ver");
-              script->rel = _helper.attribute(child,"rel");
-            }
-            else if (name == "do") {
+           }
+           else if (name == "version") {
+             script->epoch = _helper.attribute(child,"epoch");
+             script->ver = _helper.attribute(child,"ver");
+             script->rel = _helper.attribute(child,"rel");
+           }
+           else if (name == "do") {
        script->do_script = _helper.content(child);
-            }
-            else if (name == "undo") {
+           }
+           else if (name == "undo") {
        script->undo_script = _helper.content(child);
-            }
-            else if (name == "provides") {
-              prim.parseDependencyEntries(& script->provides, child);
-            }
-            else if (name == "conflicts") {
-              prim.parseDependencyEntries(& script->conflicts, child);
-            }
-            else if (name == "obsoletes") {
-              prim.parseDependencyEntries(& script->obsoletes, child);
-            }
-            else if (name == "requires") {
-              prim.parseDependencyEntries(& script->requires, child);
-            }
-            else if (name == "recommends") {
-              prim.parseDependencyEntries(& script->recommends, child);
-            }
-            else if (name == "suggests") {
-              prim.parseDependencyEntries(& script->suggests, child);
-            }
-            else if (name == "supplements") {
-              prim.parseDependencyEntries(& script->supplements, child);
-            }
-            else if (name == "enhances") {
-              prim.parseDependencyEntries(& script->enhances, child);
-            }
-            else if (name == "freshen") {
-              prim.parseDependencyEntries(& script->freshen, child);
-            }
-            else {
-              WAR << "YUM <atoms/script> contains the unknown element <"
+           }
+           else if (name == "provides") {
+             prim.parseDependencyEntries(& script->provides, child);
+           }
+           else if (name == "conflicts") {
+             prim.parseDependencyEntries(& script->conflicts, child);
+           }
+           else if (name == "obsoletes") {
+             prim.parseDependencyEntries(& script->obsoletes, child);
+           }
+           else if (name == "requires") {
+             prim.parseDependencyEntries(& script->requires, child);
+           }
+           else if (name == "recommends") {
+             prim.parseDependencyEntries(& script->recommends, child);
+           }
+           else if (name == "suggests") {
+             prim.parseDependencyEntries(& script->suggests, child);
+           }
+           else if (name == "supplements") {
+             prim.parseDependencyEntries(& script->supplements, child);
+           }
+           else if (name == "enhances") {
+             prim.parseDependencyEntries(& script->enhances, child);
+           }
+           else if (name == "freshens") {
+             prim.parseDependencyEntries(& script->freshen, child);
+           }
+           else {
+             WAR << "YUM <atoms/script> contains the unknown element <"
          << name << "> "
-                << _helper.positionInfo(child) << ", skipping" << endl;
-            }
-          }
-        }
-        dataPtr->atoms.push_back(script);
+               << _helper.positionInfo(child) << ", skipping" << endl;
+           }
+         }
+       }
+       dataPtr->atoms.push_back(script);
       }
       
       void
       YUMPatchParser::parseMessageNode(YUMPatchData_Ptr dataPtr,
-                                     xmlNodePtr formatNode)
+                                    xmlNodePtr formatNode)
       {
        shared_ptr<YUMPatchMessage> message(new YUMPatchMessage);
       
-        // FIXME move the respective method to a common class, inherit it  
-        YUMPrimaryParser prim;
+       // FIXME move the respective method to a common class, inherit it  
+       YUMPrimaryParser prim;
       
-        for (xmlNodePtr child = formatNode->children; 
-             child != 0;
-             child = child ->next) {
-          if (_helper.isElement(child)) {
-            string name = _helper.name(child);
-            if (name == "name") {
+       for (xmlNodePtr child = formatNode->children; 
+            child != 0;
+            child = child ->next) {
+         if (_helper.isElement(child)) {
+           string name = _helper.name(child);
+           if (name == "name") {
              message->name = _helper.content(child);
-            }
-            else if (name == "version") {
-              message->epoch = _helper.attribute(child,"epoch");
-              message->ver = _helper.attribute(child,"ver");
-              message->rel = _helper.attribute(child,"rel");
-            }
-            else if (name == "text") {
+           }
+           else if (name == "version") {
+             message->epoch = _helper.attribute(child,"epoch");
+             message->ver = _helper.attribute(child,"ver");
+             message->rel = _helper.attribute(child,"rel");
+           }
+           else if (name == "text") {
              message->text.setText(_helper.content(child), Locale(_helper.attribute(child,"lang")));
-            }
-            else if (name == "provides") {
-              prim.parseDependencyEntries(& message->provides, child);
-            }
-            else if (name == "conflicts") {
-              prim.parseDependencyEntries(& message->conflicts, child);
-            }
-            else if (name == "obsoletes") {
-              prim.parseDependencyEntries(& message->obsoletes, child);
-            }
-            else if (name == "requires") {
-              prim.parseDependencyEntries(& message->requires, child);
-            }
-            else if (name == "recommends") {
-              prim.parseDependencyEntries(& message->recommends, child);
-            }
-            else if (name == "suggests") {
-              prim.parseDependencyEntries(& message->suggests, child);
-            }
-            else if (name == "supplements") {
-              prim.parseDependencyEntries(& message->supplements, child);
-            }
-            else if (name == "enhances") {
-              prim.parseDependencyEntries(& message->enhances, child);
-            }
-            else if (name == "freshen") {
-              prim.parseDependencyEntries(& message->freshen, child);
-            }
-            else {
-              WAR << "YUM <atoms/message> contains the unknown element <"
+           }
+           else if (name == "provides") {
+             prim.parseDependencyEntries(& message->provides, child);
+           }
+           else if (name == "conflicts") {
+             prim.parseDependencyEntries(& message->conflicts, child);
+           }
+           else if (name == "obsoletes") {
+             prim.parseDependencyEntries(& message->obsoletes, child);
+           }
+           else if (name == "requires") {
+             prim.parseDependencyEntries(& message->requires, child);
+           }
+           else if (name == "recommends") {
+             prim.parseDependencyEntries(& message->recommends, child);
+           }
+           else if (name == "suggests") {
+             prim.parseDependencyEntries(& message->suggests, child);
+           }
+           else if (name == "supplements") {
+             prim.parseDependencyEntries(& message->supplements, child);
+           }
+           else if (name == "enhances") {
+             prim.parseDependencyEntries(& message->enhances, child);
+           }
+           else if (name == "freshens") {
+             prim.parseDependencyEntries(& message->freshen, child);
+           }
+           else {
+             WAR << "YUM <atoms/message> contains the unknown element <"
          << name << "> "
-                << _helper.positionInfo(child) << ", skipping" << endl;
-            }
-          }
-        }
-        dataPtr->atoms.push_back(message);
+               << _helper.positionInfo(child) << ", skipping" << endl;
+           }
+         }
+       }
+       dataPtr->atoms.push_back(message);
       }
 
     } // namespace yum