* Swedish translation update. Closes: #592366

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

diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h
index 307b121335cbfdd80f38948082d669feb0dddc44..e15314a5e796fbd87a7eb1ded8101e6790bbdc8e 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.12 2002/07/01 21:41:11 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.

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


@@ -29,33 +29,19 @@
 
 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>

+#include <map>

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

-#include <apt-pkg/indexfile.h>
+#include <apt-pkg/metaindex.h>

 
 using std::string;
 using std::vector;
     
 
 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
    {


@@ -70,30 +56,31 @@ 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,
                             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;
-
+                            unsigned long const &CurLine,string const &File) const;
+      virtual bool CreateItem(vector<metaIndex *> &List,string const &URI,
+                             string const &Dist,string const &Section,
+                             std::map<string, string> const &Options) 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();};


@@ -103,7 +90,7 @@ 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(string File);
    
    pkgSourceList();
    pkgSourceList(string File);