Simplified time calculations

[apt.git] / apt-pkg / pkgrecords.cc

diff --git a/apt-pkg/pkgrecords.cc b/apt-pkg/pkgrecords.cc
index b3105da4444f2eaa7b364d49d178a271a123fd8b..5d112a5c10e4eec55532985af55f8f6f381aa077 100644 (file)
--- a/apt-pkg/pkgrecords.cc
+++ b/apt-pkg/pkgrecords.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: pkgrecords.cc,v 1.1 1998/08/09 00:51:35 jgg Exp $
+// $Id: pkgrecords.cc,v 1.5 1999/02/22 03:30:06 jgg Exp $
 /* ######################################################################
    
    Package Records - Allows access to complete package description records
@@ -15,6 +15,7 @@
 #include <apt-pkg/pkgrecords.h>
 #include <apt-pkg/debrecords.h>
 #include <apt-pkg/error.h>
+#include <apt-pkg/configuration.h>
                                                                        /*}}}*/
 
 // Records::pkgRecords - Constructor                                   /*{{{*/
@@ -22,14 +23,24 @@
 /* This will create the necessary structures to access the status files */
 pkgRecords::pkgRecords(pkgCache &Cache) : Cache(Cache), Files(0)
 {
-   Files = new PkgFile[Cache.HeaderP->PackageFileCount];   
+   Files = new PkgFile[Cache.HeaderP->PackageFileCount];
    for (pkgCache::PkgFileIterator I = Cache.FileBegin(); 
        I.end() == false; I++)
    {
+      // We can not initialize if the cache is out of sync.
+      if (I.IsOk() == false)
+      {
+        _error->Error("Package file %s is out of sync.",I.FileName());
+        return;
+      }
+   
+      // Create the file
       Files[I->ID].File = new FileFd(I.FileName(),FileFd::ReadOnly);
       if (_error->PendingError() == true)
         return;
-      Files[I->ID].Parse = new debRecordParser(*Files[I->ID].File);
+      
+      // Create the parser
+      Files[I->ID].Parse = new debRecordParser(*Files[I->ID].File,Cache);
       if (_error->PendingError() == true)
         return;
    }   
@@ -46,8 +57,8 @@ pkgRecords::~pkgRecords()
 // Records::Lookup - Get a parser for the package version file         /*{{{*/
 // ---------------------------------------------------------------------
 /* */
-pkgRecords::Parser &pkgRecords::Lookup(pkgCache::VerFileIterator &Ver)
-{   
+pkgRecords::Parser &pkgRecords::Lookup(pkgCache::VerFileIterator const &Ver)
+{
    PkgFile &File = Files[Ver.File()->ID];
    File.Parse->Jump(Ver);