* merged from dpkg-log branch

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

diff --git a/apt-pkg/pkgrecords.h b/apt-pkg/pkgrecords.h
index b5205f1ac0f20b7248079ca6dd65cc26043d44e8..f3bf7b6a14bda179a9dff645c0f8a7ad6264fe73 100644 (file)
--- a/apt-pkg/pkgrecords.h
+++ b/apt-pkg/pkgrecords.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: pkgrecords.h,v 1.4 1999/04/07 05:30:17 jgg Exp $
+// $Id: pkgrecords.h,v 1.6 2001/03/13 06:51:46 jgg Exp $

 /* ######################################################################
    
    Package Records - Allows access to complete package description records
 /* ######################################################################
    
    Package Records - Allows access to complete package description records


@@ -14,16 +14,13 @@
    
    ##################################################################### */
                                                                        /*}}}*/
    
    ##################################################################### */
                                                                        /*}}}*/

-// Header section: pkglib

 #ifndef PKGLIB_PKGRECORDS_H
 #define PKGLIB_PKGRECORDS_H
 
 #ifndef PKGLIB_PKGRECORDS_H
 #define PKGLIB_PKGRECORDS_H
 

-#ifdef __GNUG__
-#pragma interface "apt-pkg/pkgrecords.h"
-#endif 

 
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/fileutl.h>
 
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/fileutl.h>

+#include <vector>

 
 class pkgRecords
 {
 
 class pkgRecords
 {


@@ -33,22 +30,13 @@ class pkgRecords
    private:
    
    pkgCache &Cache;
    private:
    
    pkgCache &Cache;

-   
-   // List of package files
-   struct PkgFile
-   {
-      FileFd *File;
-      Parser *Parse;
+   std::vector<Parser *>Files;

 
 

-      PkgFile() : File(0), Parse(0) {};
-      ~PkgFile();
-   };
-   PkgFile *Files;
-   

    public:
 
    // Lookup function
    Parser &Lookup(pkgCache::VerFileIterator const &Ver);
    public:
 
    // Lookup function
    Parser &Lookup(pkgCache::VerFileIterator const &Ver);

+   Parser &Lookup(pkgCache::DescFileIterator const &Desc);

 
    // Construct destruct
    pkgRecords(pkgCache &Cache);
 
    // Construct destruct
    pkgRecords(pkgCache &Cache);


@@ -60,20 +48,28 @@ class pkgRecords::Parser
    protected:
    
    virtual bool Jump(pkgCache::VerFileIterator const &Ver) = 0;
    protected:
    
    virtual bool Jump(pkgCache::VerFileIterator const &Ver) = 0;

+   virtual bool Jump(pkgCache::DescFileIterator const &Desc) = 0;

    
    public:
    
    public:

-   friend pkgRecords;
+   friend class pkgRecords;

    
    // These refer to the archive file for the Version
    virtual string FileName() {return string();};
    virtual string MD5Hash() {return string();};
    
    // These refer to the archive file for the Version
    virtual string FileName() {return string();};
    virtual string MD5Hash() {return string();};

+   virtual string SHA1Hash() {return string();};
+   virtual string SHA256Hash() {return string();};

    virtual string SourcePkg() {return string();};
    virtual string SourcePkg() {return string();};

-   
+   virtual string SourceVer() {return string();};
+

    // These are some general stats about the package
    virtual string Maintainer() {return string();};
    virtual string ShortDesc() {return string();};
    virtual string LongDesc() {return string();};
    // These are some general stats about the package
    virtual string Maintainer() {return string();};
    virtual string ShortDesc() {return string();};
    virtual string LongDesc() {return string();};

-
+   virtual string Name() {return string();};
+   
+   // The record in binary form
+   virtual void GetRec(const char *&Start,const char *&Stop) {Start = Stop = 0;};
+   

    virtual ~Parser() {};
 };
 
    virtual ~Parser() {};
 };