* merged ddtp support

Patches applied:

 * michael.vogt@ubuntu.com--2005/apt--ddtp--0--base-0
   tag of otavio@debian.org--2005/apt--ddtp--0.6--patch-14

 * michael.vogt@ubuntu.com--2005/apt--ddtp--0--patch-1
   * fixed a problem when it comes to the cache rebuilding

 * michael.vogt@ubuntu.com--2005/apt--ddtp--0--patch-2
   * try harder to get the correct language code

 * michael.vogt@ubuntu.com--2005/apt--ddtp--0--patch-3
   * fix for output of the description and the debTranslationsIndex::Exists()

 * michael.vogt@ubuntu.com--2005/apt--ddtp--0--patch-4
   * made the translation downloading work

 * michael.vogt@ubuntu.com--2005/apt--ddtp--0--patch-5
   * FindInCache() uses the correct file now

 * michael.vogt@ubuntu.com--2005/apt--ddtp--0--patch-6
   * don't throw any more warnings

 * michael.vogt@ubuntu.com--2005/apt--ddtp--0--patch-7
   * merged with otavoi

 * michael.vogt@ubuntu.com--2005/apt--ddtp--0--patch-8
   * merged with otavios branch

 * michael.vogt@ubuntu.com--2005/apt--ddtp--0--patch-9
   * code cleanups (thanks matt!), moved UsePackage before the description list build in pkgcachegen to catch MMap errors early

 * michael.vogt@ubuntu.com--2005/apt--ddtp--0--patch-10
   * added a BUGS file with known problem, added apt-cdrom support for translated package descriptions

 * michael.vogt@ubuntu.com--2005/apt--ddtp--0--patch-11
   * updated with mainline

 * michael.vogt@ubuntu.com--2005/apt--ddtp--0--patch-12
   * added README.ddtp

 * michael.vogt@ubuntu.com--2005/apt--ddtp--0--patch-13
   * merged with apt--mvo

 * michael.vogt@ubuntu.com--2005/apt--ddtp--0--patch-14
   * added DDTP::URL-Remap. KILL THIS FEATURE once ddtp support is offical 

 * michael.vogt@ubuntu.com--2005/apt--ddtp--0--patch-15
   * remvoed the remap feature again, dosn't work anyway

 * otavio@debian.org--2005/apt--ddtp--0.6--base-0
   tag of apt@packages.debian.org/apt--main--0--patch-71

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-1
   Port DDTP to APT 0.6 branch

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-2
   Fix sintax error on apt-cache

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-3
   Remove a unused var.

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-4
   Fix problems due APT and structural changes.

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-5
   Fix problems due APT and structural changes.

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-6
   Sync with apt@packages.debian.org/apt--main--0--patch-74

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-7
   Sync with apt@packages.debian.org/apt--main--0--patch-75

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-8
   Sync with apt--main--0--patch-76

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-9
   Remote a changelog entry added by mistake while merging.

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-10
   Sync with apt--main--0--patch-78

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-11
   Revert fixes changes to move these to apt--fixes--0 branch.

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-12
   Another fix included here by mistake. Moving it to apt--fixes--0 branch.

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-13
   Merge last changes from apt--main--0.

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-14
   Add FindInCache method to skip the rebuild of cache every time.

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-15
   Merge changes did by Michael Vogt to solve some rebuilding mistakes.

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-16
   Does't show Description twice

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-17
   Merge last fixes did by Michael but preserve my version of apt-cache.cc fix.

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-18
   Revert changes did by mistake on translation files.

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-19
   Merge last changes did from upstream side.

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-20
   Sync with apt--main--0--patch-87

1 files changed, 111 insertions, 6 deletions

diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index 2340f97fd..1ba791b45 100644
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -125,16 +125,46 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
       string Version = List.Version();
       if (Version.empty() == true)
       {
+	 // we first process the package, then the descriptions
+	 // (this has the bonus that we get MMap error when we run out
+	 //  of MMap space)
 	 if (List.UsePackage(Pkg,pkgCache::VerIterator(Cache)) == false)
 	    return _error->Error(_("Error occurred while processing %s (UsePackage1)"),
 				 PackageName.c_str());
+
+ 	 // Find the right version to write the description
+ 	 MD5SumValue CurMd5 = List.Description_md5();
+ 	 pkgCache::VerIterator Ver = Pkg.VersionList();
+ 	 map_ptrloc *LastVer = &Pkg->VersionList;
+
+  	 for (; Ver.end() == false; LastVer = &Ver->NextVer, Ver++) 
+ 	 {
+ 	    pkgCache::DescIterator Desc = Ver.DescriptionList();
+ 	    map_ptrloc *LastDesc = &Ver->DescriptionList;
+
+ 	    for (; Desc.end() == false; LastDesc = &Desc->NextDesc, Desc++)
+	    {
+
+ 	       if (MD5SumValue(Desc.md5()) == CurMd5) 
+               {
+ 		  // Add new description
+ 		  *LastDesc = NewDescription(Desc, List.DescriptionLanguage(), CurMd5, *LastDesc);
+ 		  Desc->ParentPkg = Pkg.Index();
+		  
+ 		  if (NewFileDesc(Desc,List) == false)
+ 		     return _error->Error(_("Error occured while processing %s (NewFileDesc1)"),PackageName.c_str());
+ 		  break;
+ 	       }
+	    }
+ 	 }
+
 	 continue;
       }
 
       pkgCache::VerIterator Ver = Pkg.VersionList();
-      map_ptrloc *Last = &Pkg->VersionList;
+      map_ptrloc *LastVer = &Pkg->VersionList;
       int Res = 1;
-      for (; Ver.end() == false; Last = &Ver->NextVer, Ver++)
+      for (; Ver.end() == false; LastVer = &Ver->NextVer, Ver++)
       {
 	 Res = Cache.VS->CmpVersion(Version,Ver.VerStr());
 	 if (Res >= 0)
@@ -168,7 +198,7 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
       // Skip to the end of the same version set.
       if (Res == 0)
       {
-	 for (; Ver.end() == false; Last = &Ver->NextVer, Ver++)
+	 for (; Ver.end() == false; LastVer = &Ver->NextVer, Ver++)
 	 {
 	    Res = Cache.VS->CmpVersion(Version,Ver.VerStr());
 	    if (Res != 0)
@@ -177,9 +207,10 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
       }
 
       // Add a new version
-      *Last = NewVersion(Ver,Version,*Last);
+      *LastVer = NewVersion(Ver,Version,*LastVer);
       Ver->ParentPkg = Pkg.Index();
       Ver->Hash = Hash;
+
       if (List.NewVersion(Ver) == false)
 	 return _error->Error(_("Error occurred while processing %s (NewVersion1)"),
 			      PackageName.c_str());
@@ -199,6 +230,21 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
 	 FoundFileDeps |= List.HasFileDeps();
 	 return true;
       }      
+
+      /* Record the Description data. Description data always exist in
+	 Packages and Translation-* files. */
+      pkgCache::DescIterator Desc = Ver.DescriptionList();
+      map_ptrloc *LastDesc = &Ver->DescriptionList;
+      
+      // Skip to the end of description set
+      for (; Desc.end() == false; LastDesc = &Desc->NextDesc, Desc++);
+
+      // Add new description
+      *LastDesc = NewDescription(Desc, List.DescriptionLanguage(), List.Description_md5(), *LastDesc);
+      Desc->ParentPkg = Pkg.Index();
+
+      if (NewFileDesc(Desc,List) == false)
+	 return _error->Error(_("Error occured while processing %s (NewFileDesc2)"),PackageName.c_str());
    }
 
    FoundFileDeps |= List.HasFileDeps();
@@ -209,6 +255,9 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
    if (Cache.HeaderP->VersionCount >= (1ULL<<(sizeof(Cache.VerP->ID)*8))-1)
       return _error->Error(_("Wow, you exceeded the number of versions "
 			     "this APT is capable of."));
+   if (Cache.HeaderP->DescriptionCount >= (1ULL<<(sizeof(Cache.DescP->ID)*8))-1)
+      return _error->Error(_("Wow, you exceeded the number of descriptions "
+			     "this APT is capable of."));
    if (Cache.HeaderP->DependsCount >= (1ULL<<(sizeof(Cache.DepP->ID)*8))-1ULL)
       return _error->Error(_("Wow, you exceeded the number of dependencies "
 			     "this APT is capable of."));
@@ -271,7 +320,7 @@ bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,string Name)
    Pkg = Cache.FindPkg(Name);
    if (Pkg.end() == false)
       return true;
-       
+
    // Get a structure
    unsigned long Package = Map.Allocate(sizeof(pkgCache::Package));
    if (Package == 0)
@@ -349,6 +398,62 @@ unsigned long pkgCacheGenerator::NewVersion(pkgCache::VerIterator &Ver,
    return Version;
 }
 									/*}}}*/
+// CacheGenerator::NewFileDesc - Create a new File<->Desc association	/*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool pkgCacheGenerator::NewFileDesc(pkgCache::DescIterator &Desc,
+				   ListParser &List)
+{
+   if (CurrentFile == 0)
+      return true;
+   
+   // Get a structure
+   unsigned long DescFile = Map.Allocate(sizeof(pkgCache::DescFile));
+   if (DescFile == 0)
+      return 0;
+
+   pkgCache::DescFileIterator DF(Cache,Cache.DescFileP + DescFile);
+   DF->File = CurrentFile - Cache.PkgFileP;
+
+   // Link it to the end of the list
+   map_ptrloc *Last = &Desc->FileList;
+   for (pkgCache::DescFileIterator D = Desc.FileList(); D.end() == false; D++)
+      Last = &D->NextFile;
+
+   DF->NextFile = *Last;
+   *Last = DF.Index();
+   
+   DF->Offset = List.Offset();
+   DF->Size = List.Size();
+   if (Cache.HeaderP->MaxDescFileSize < DF->Size)
+      Cache.HeaderP->MaxDescFileSize = DF->Size;
+   Cache.HeaderP->DescFileCount++;
+   
+   return true;
+}
+									/*}}}*/
+// CacheGenerator::NewDescription - Create a new Description		/*{{{*/
+// ---------------------------------------------------------------------
+/* This puts a description structure in the linked list */
+map_ptrloc pkgCacheGenerator::NewDescription(pkgCache::DescIterator &Desc,
+					    const string &Lang, const MD5SumValue &md5sum,
+					    map_ptrloc Next)
+{
+   // Get a structure
+   map_ptrloc Description = Map.Allocate(sizeof(pkgCache::Description));
+   if (Description == 0)
+      return 0;
+
+   // Fill it in
+   Desc = pkgCache::DescIterator(Cache,Cache.DescP + Description);
+   Desc->NextDesc = Next;
+   Desc->ID = Cache.HeaderP->DescriptionCount++;
+   Desc->language_code = Map.WriteString(Lang);
+   Desc->md5sum = Map.WriteString(md5sum.Value());
+
+   return Description;
+}
+									/*}}}*/
 // ListParser::NewDepends - Create a dependency element			/*{{{*/
 // ---------------------------------------------------------------------
 /* This creates a dependency element in the tree. It is linked to the
@@ -580,7 +685,7 @@ static bool CheckValidity(string CacheFile, FileIterator Start,
       pkgCache::PkgFileIterator File = (*Start)->FindInCache(Cache);
       if (File.end() == true)
 	 return false;
-      
+
       Visited[File->ID] = true;
    }