* wording fixes (cherry picked from apt--mvo)

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

diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h
index 3a6b274f6264d4bf26fc9b905eee1d7ac4b212e5..123ae69849fedadbf5781ed57e8e669768d932fe 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.9 2001/02/20 07:03:17 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


@@ -14,10 +14,14 @@
    files.sgml.
 
    The types are mapped through a list of type definitions which handle
    files.sgml.
 
    The types are mapped through a list of type definitions which handle

-   the actual construction of the type. After loading a source list all
-   you have is a list of package index files that have the ability
+   the actual construction of the back end type. After loading a source 
+   list all you have is a list of package index files that have the ability

    to be Acquired.
    
    to be Acquired.
    

+   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 perform.
+   

    ##################################################################### */
                                                                        /*}}}*/
 #ifndef PKGLIB_SOURCELIST_H
    ##################################################################### */
                                                                        /*}}}*/
 #ifndef PKGLIB_SOURCELIST_H


@@ -26,7 +30,10 @@
 #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"
     
 #ifdef __GNUG__
 #pragma interface "apt-pkg/sourcelist.h"


@@ -51,39 +58,44 @@ class pkgSourceList
       const char *Label;
 
       bool FixupURI(string &URI) const;
       const char *Label;
 
       bool FixupURI(string &URI) const;

-      virtual bool ParseLine(vector<pkgIndexFile *> &List,
+      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,
+      virtual bool CreateItem(vector<metaIndex *> &List,string URI,

                              string Dist,string Section) const = 0;
                              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 *> List;
+
+   vector<metaIndex *> SrcList;

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

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

    
    // List accessors
    
    // List accessors

-   inline const_iterator begin() const {return List.begin();};
-   inline const_iterator end() const {return List.end();};
-   inline unsigned int size() const {return List.size();};
-   inline bool empty() const {return List.empty();};
+   inline const_iterator begin() const {return SrcList.begin();};
+   inline const_iterator end() const {return SrcList.end();};
+   inline unsigned int size() const {return SrcList.size();};
+   inline bool empty() const {return SrcList.empty();};

 
    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