replace the per language addendum with a global addendum and

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

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

-// $Id: sourcelist.h,v 1.10 2001/03/13 06:51:46 jgg Exp $
+// $Id: sourcelist.h,v 1.12.2.1 2003/12/24 23:09:17 mdz Exp $

 /* ######################################################################
 
    SourceList - Manage a list of sources
 /* ######################################################################
 
    SourceList - Manage a list of sources


@@ -20,7 +20,7 @@
    
    The vendor machanism is similar, except the vendor types are hard 
    wired. Before loading the source list the vendor list is loaded.
    
    The vendor machanism is similar, except the vendor types are hard 
    wired. Before loading the source list the vendor list is loaded.

-   This doesn't load key data, just the checks to preform.
+   This doesn't load key data, just the checks to perform.

    
    ##################################################################### */
                                                                        /*}}}*/
    
    ##################################################################### */
                                                                        /*}}}*/


@@ -30,29 +30,17 @@
 #include <string>
 #include <vector>
 #include <apt-pkg/pkgcache.h>
 #include <string>
 #include <vector>
 #include <apt-pkg/pkgcache.h>

-#include <apt-pkg/indexfile.h>
+#include <apt-pkg/metaindex.h>
+
+using std::string;
+using std::vector;

     
     

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

 
 class pkgAquire;
 class pkgSourceList
 {
    public:
    
 
 class pkgAquire;
 class pkgSourceList
 {
    public:
    

-   // An available vendor
-   struct Vendor
-   {
-      string VendorID;
-      string FingerPrint;
-      string Description;
-
-      /* Lets revisit these..
-      bool MatchFingerPrint(string FingerPrint);
-      string FingerPrintDescr();*/
-   };
-   

    // List of supported source list types
    class Type
    {
    // List of supported source list types
    class Type
    {


@@ -67,30 +55,30 @@ class pkgSourceList
       const char *Label;
 
       bool FixupURI(string &URI) const;
       const char *Label;
 
       bool FixupURI(string &URI) const;

-      virtual bool ParseLine(vector<pkgIndexFile *> &List,
-                            Vendor const *Vendor,
+      virtual bool ParseLine(vector<metaIndex *> &List,

                             const char *Buffer,
                             unsigned long CurLine,string File) const;
                             const char *Buffer,
                             unsigned long CurLine,string File) const;

-      virtual bool CreateItem(vector<pkgIndexFile *> &List,string URI,
-                             string Dist,string Section,
-                             Vendor const *Vendor) const = 0;
-
+      virtual bool CreateItem(vector<metaIndex *> &List,string URI,
+                             string Dist,string Section) const = 0;

       Type();
       virtual ~Type() {};
    };
    
       Type();
       virtual ~Type() {};
    };
    

-   typedef vector<pkgIndexFile *>::const_iterator const_iterator;
+   typedef vector<metaIndex *>::const_iterator const_iterator;

    
    protected:
 
    
    protected:
 

-   vector<pkgIndexFile *> SrcList;
-   vector<Vendor const *> VendorList;
+   vector<metaIndex *> SrcList;

    
    public:
 
    bool ReadMainList();
    bool Read(string File);
    
    public:
 
    bool ReadMainList();
    bool Read(string File);

-   bool ReadVendors();
+
+   // CNC:2003-03-03
+   void Reset();
+   bool ReadAppend(string File);
+   bool ReadSourceDir(string Dir);

    
    // List accessors
    inline const_iterator begin() const {return SrcList.begin();};
    
    // List accessors
    inline const_iterator begin() const {return SrcList.begin();};


@@ -100,10 +88,11 @@ class pkgSourceList
 
    bool FindIndex(pkgCache::PkgFileIterator File,
                  pkgIndexFile *&Found) const;
 
    bool FindIndex(pkgCache::PkgFileIterator File,
                  pkgIndexFile *&Found) const;

-   bool GetIndexes(pkgAcquire *Owner) const;
+   bool GetIndexes(pkgAcquire *Owner, bool GetAll=false) const;

    
    pkgSourceList();
    
    pkgSourceList();

-   pkgSourceList(string File);   
+   pkgSourceList(string File);
+   ~pkgSourceList();      

 };
 
 #endif
 };
 
 #endif