Author: mlandres Date: Sun May 6 17:05:10 2007 New Revision: 5494 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5494&view=rev Log: fixed to use typedefs Modified: trunk/libzypp/zypp/parser/yum/PrimaryFileReader.cc Modified: trunk/libzypp/zypp/parser/yum/PrimaryFileReader.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/yum/PrimaryFileReader.cc?rev=5494&r1=5493&r2=5494&view=diff ============================================================================== --- trunk/libzypp/zypp/parser/yum/PrimaryFileReader.cc (original) +++ trunk/libzypp/zypp/parser/yum/PrimaryFileReader.cc Sun May 6 17:05:10 2007 @@ -45,7 +45,7 @@ // DBG << "**node: " << reader_r->name() << " (" << reader_r->nodeType() << ")" << endl; if (_tag == tag_format) return consumeFormatChildNodes(reader_r); - + if (reader_r->nodeType() == XML_READER_TYPE_ELEMENT) { if (reader_r->name() == "metadata") @@ -59,38 +59,38 @@ // DBG << "got " << reader_r->getAttribute("type") << " package" << endl; if (_package) delete _package; _package = new zypp::data::Package(); - - return true; + + return true; } - + if (reader_r->name() == "name") { _package->name = reader_r.nodeText().asString(); return true; } - + if (reader_r->name() == "arch") { //if (arch == "src" || arch == "nosrc") arch = "noarch"; _package->arch = Arch(reader_r.nodeText().asString()); return true; } - + if (reader_r->name() == "version") { _package->edition = Edition(reader_r->getAttribute("ver").asString(), reader_r->getAttribute("rel").asString(), reader_r->getAttribute("epoch").asString()); } - + if (reader_r->name() == "checksum") { _package->checksum = CheckSum(reader_r->getAttribute("type").asString(), reader_r.nodeText().asString()); - // ignoring pkgid attribute + // ignoring pkgid attribute return true; } - + if (reader_r->name() == "summary") { _package->summary.setText( @@ -98,7 +98,7 @@ Locale(reader_r->getAttribute("lang").asString())); return true; } - + if (reader_r->name() == "description") { _package->description.setText( @@ -106,11 +106,11 @@ Locale(reader_r->getAttribute("lang").asString())); return true; } - + if (reader_r->name() == "packager") { _package->packager = reader_r.nodeText().asString(); -// DBG << "packager: " << _package->packager << endl; +// DBG << "packager: " << _package->packager << endl; return true; } @@ -134,12 +134,10 @@ // reader_r->getAttribute("archive").asString(); // installed size - ByteCount size(str::strtonum<long long>(reader_r->getAttribute("installed").asString()), Unit()); - _package->size = size; + _package->size = str::strtonumByteCount::SizeType( reader_r->getAttribute("installed").asString() ); // rpm package size - ByteCount size_rpm(str::strtonum<long long>(reader_r->getAttribute("package").asString()), Unit()); - _package->archive_size = size_rpm; + _package->archive_size = str::strtonumByteCount::SizeType( reader_r->getAttribute("package").asString() ); return true; } @@ -310,7 +308,7 @@ _expect_rpm_entry = true; return true; } - + if (reader_r->name() == "file") { // TODO figure out how to read files -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org