* apt-pkg/tagfile.cc:

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

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

-// $Id: pkgcachegen.h,v 1.18 2001/02/20 07:03:17 jgg Exp $
+// $Id: pkgcachegen.h,v 1.19 2002/07/08 03:13:30 jgg Exp $

 /* ######################################################################
    
    Package Cache Generator - Generator for the cache structure.
 /* ######################################################################
    
    Package Cache Generator - Generator for the cache structure.


@@ -24,6 +24,7 @@
 #endif 
 
 #include <apt-pkg/pkgcache.h>
 #endif 
 
 #include <apt-pkg/pkgcache.h>

+#include <apt-pkg/md5.h>

 
 class pkgSourceList;
 class OpProgress;
 
 class pkgSourceList;
 class OpProgress;


@@ -49,23 +50,31 @@ class pkgCacheGenerator
    
    string PkgFileName;
    pkgCache::PackageFile *CurrentFile;
    
    string PkgFileName;
    pkgCache::PackageFile *CurrentFile;

+
+   // Flag file dependencies
+   bool FoundFileDeps;

    
    

-   bool NewPackage(pkgCache::PkgIterator &Pkg,string Pkg);
+   bool NewPackage(pkgCache::PkgIterator &Pkg,const string &Pkg);

    bool NewFileVer(pkgCache::VerIterator &Ver,ListParser &List);
    bool NewFileVer(pkgCache::VerIterator &Ver,ListParser &List);

-   unsigned long NewVersion(pkgCache::VerIterator &Ver,string VerStr,unsigned long Next);
+   bool NewFileDesc(pkgCache::DescIterator &Desc,ListParser &List);
+   unsigned long NewVersion(pkgCache::VerIterator &Ver,const string &VerStr,unsigned long Next);
+   map_ptrloc NewDescription(pkgCache::DescIterator &Desc,const string &Lang,const MD5SumValue &md5sum,map_ptrloc Next);

 
    public:
 
    unsigned long WriteUniqString(const char *S,unsigned int Size);
 
    public:
 
    unsigned long WriteUniqString(const char *S,unsigned int Size);

-   inline unsigned long WriteUniqString(string S) {return WriteUniqString(S.c_str(),S.length());};
+   inline unsigned long WriteUniqString(const string &S) {return WriteUniqString(S.c_str(),S.length());};

 
    void DropProgress() {Progress = 0;};
 
    void DropProgress() {Progress = 0;};

-   bool SelectFile(string File,string Site,pkgIndexFile const &Index,
+   bool SelectFile(const string &File,const string &Site,pkgIndexFile const &Index,

                   unsigned long Flags = 0);
    bool MergeList(ListParser &List,pkgCache::VerIterator *Ver = 0);
    inline pkgCache &GetCache() {return Cache;};
    inline pkgCache::PkgFileIterator GetCurFile() 
          {return pkgCache::PkgFileIterator(Cache,CurrentFile);};
                   unsigned long Flags = 0);
    bool MergeList(ListParser &List,pkgCache::VerIterator *Ver = 0);
    inline pkgCache &GetCache() {return Cache;};
    inline pkgCache::PkgFileIterator GetCurFile() 
          {return pkgCache::PkgFileIterator(Cache,CurrentFile);};

+
+   bool HasFileDeps() {return FoundFileDeps;};
+   bool MergeFileProvides(ListParser &List);

       
    pkgCacheGenerator(DynamicMMap *Map,OpProgress *Progress);
    ~pkgCacheGenerator();
       
    pkgCacheGenerator(DynamicMMap *Map,OpProgress *Progress);
    ~pkgCacheGenerator();


@@ -80,17 +89,21 @@ class pkgCacheGenerator::ListParser
    // Some cache items
    pkgCache::VerIterator OldDepVer;
    map_ptrloc *OldDepLast;
    // Some cache items
    pkgCache::VerIterator OldDepVer;
    map_ptrloc *OldDepLast;

+
+   // Flag file dependencies
+   bool FoundFileDeps;

       
    protected:
 
    inline unsigned long WriteUniqString(string S) {return Owner->WriteUniqString(S);};
    inline unsigned long WriteUniqString(const char *S,unsigned int Size) {return Owner->WriteUniqString(S,Size);};
       
    protected:
 
    inline unsigned long WriteUniqString(string S) {return Owner->WriteUniqString(S);};
    inline unsigned long WriteUniqString(const char *S,unsigned int Size) {return Owner->WriteUniqString(S,Size);};

-   inline unsigned long WriteString(string S) {return Owner->Map.WriteString(S);};
+   inline unsigned long WriteString(const string &S) {return Owner->Map.WriteString(S);};

    inline unsigned long WriteString(const char *S,unsigned int Size) {return Owner->Map.WriteString(S,Size);};
    inline unsigned long WriteString(const char *S,unsigned int Size) {return Owner->Map.WriteString(S,Size);};

-   bool NewDepends(pkgCache::VerIterator Ver,string Package,
-                  string Version,unsigned int Op,
+   bool NewDepends(pkgCache::VerIterator Ver,const string &Package,
+                  const string &Version,unsigned int Op,

                   unsigned int Type);
                   unsigned int Type);

-   bool NewProvides(pkgCache::VerIterator Ver,string Package,string Version);
+   bool NewProvides(pkgCache::VerIterator Ver,const string &Package,
+                   const string &Version);

    
    public:
    
    
    public:
    


@@ -98,6 +111,9 @@ class pkgCacheGenerator::ListParser
    virtual string Package() = 0;
    virtual string Version() = 0;
    virtual bool NewVersion(pkgCache::VerIterator Ver) = 0;
    virtual string Package() = 0;
    virtual string Version() = 0;
    virtual bool NewVersion(pkgCache::VerIterator Ver) = 0;

+   virtual string Description() = 0;
+   virtual string DescriptionLanguage() = 0;
+   virtual MD5SumValue Description_md5() = 0;

    virtual unsigned short VersionHash() = 0;
    virtual bool UsePackage(pkgCache::PkgIterator Pkg,
                           pkgCache::VerIterator Ver) = 0;
    virtual unsigned short VersionHash() = 0;
    virtual bool UsePackage(pkgCache::PkgIterator Pkg,
                           pkgCache::VerIterator Ver) = 0;


@@ -106,6 +122,11 @@ class pkgCacheGenerator::ListParser
    
    virtual bool Step() = 0;
    
    
    virtual bool Step() = 0;
    

+   inline bool HasFileDeps() {return FoundFileDeps;};
+   virtual bool CollectFileProvides(pkgCache &Cache,
+                                   pkgCache::VerIterator Ver) {return true;};
+
+   ListParser() : FoundFileDeps(false) {};

    virtual ~ListParser() {};
 };
 
    virtual ~ListParser() {};
 };