More fixes

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

diff --git a/apt-pkg/pkgrecords.cc b/apt-pkg/pkgrecords.cc
index bb8b057..5d112a5 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.2 1998/08/19 06:16:10 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
@@ -23,9 +23,7 @@
 /* This will create the necessary structures to access the status files */
 pkgRecords::pkgRecords(pkgCache &Cache) : Cache(Cache), Files(0)
 {
-   string ListDir = _config->FindDir("Dir::State::lists");
-   
-   Files = new PkgFile[Cache.HeaderP->PackageFileCount];   
+   Files = new PkgFile[Cache.HeaderP->PackageFileCount];
    for (pkgCache::PkgFileIterator I = Cache.FileBegin(); 
        I.end() == false; I++)
    {
@@ -37,12 +35,12 @@ pkgRecords::pkgRecords(pkgCache &Cache) : Cache(Cache), Files(0)
       }
    
       // Create the file
-      Files[I->ID].File = new FileFd(ListDir + I.FileName(),FileFd::ReadOnly);
+      Files[I->ID].File = new FileFd(I.FileName(),FileFd::ReadOnly);
       if (_error->PendingError() == true)
         return;
       
       // Create the parser
-      Files[I->ID].Parse = new debRecordParser(*Files[I->ID].File);
+      Files[I->ID].Parse = new debRecordParser(*Files[I->ID].File,Cache);
       if (_error->PendingError() == true)
         return;
    }   
@@ -59,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);