* merged from apt--auto-mark

[apt.git] / apt-pkg / deb / debrecords.cc

diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc
index c28e11afbaf6ca1943b977a8d5a6520ef29158b8..518988bb660edffb6c2f00ef20d2267dc182bee0 100644 (file)
--- a/apt-pkg/deb/debrecords.cc
+++ b/apt-pkg/deb/debrecords.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: debrecords.cc,v 1.2 1998/10/08 04:55:02 jgg Exp $
+// $Id: debrecords.cc,v 1.10 2001/03/13 06:51:46 jgg Exp $
 /* ######################################################################
    
    Debian Package Records - Parser for debian package records
@@ -12,42 +12,46 @@
 #pragma implementation "apt-pkg/debrecords.h"
 #endif
 #include <apt-pkg/debrecords.h>
+#include <apt-pkg/strutl.h>
 #include <apt-pkg/error.h>
+#include <langinfo.h>
                                                                        /*}}}*/
 
 // RecordParser::debRecordParser - Constructor                         /*{{{*/
 // ---------------------------------------------------------------------
 /* */
-debRecordParser::debRecordParser(FileFd &File) : Tags(File,4*1024)
+debRecordParser::debRecordParser(string FileName,pkgCache &Cache) : 
+                  File(FileName,FileFd::ReadOnly), 
+                  Tags(&File,Cache.Head().MaxVerFileSize + 200)
 {
 }
                                                                        /*}}}*/
 // RecordParser::Jump - Jump to a specific record                      /*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool debRecordParser::Jump(pkgCache::VerFileIterator &Ver)
+bool debRecordParser::Jump(pkgCache::VerFileIterator const &Ver)
 {
    return Tags.Jump(Section,Ver->Offset);
+}
+bool debRecordParser::Jump(pkgCache::DescFileIterator const &Desc)
+{
+   return Tags.Jump(Section,Desc->Offset);
 }
                                                                        /*}}}*/
-// RecordParser::FindTag - Locate a tag and return a string            /*{{{*/
+// RecordParser::FileName - Return the archive filename on the site    /*{{{*/
 // ---------------------------------------------------------------------
 /* */
-string debRecordParser::FindTag(const char *Tag)
+string debRecordParser::FileName()
 {
-   const char *Start;
-   const char *Stop;
-   if (Section.Find(Tag,Start,Stop) == false)
-      return string();
-   return string(Start,Stop - Start);
+   return Section.FindS("Filename");
 }
                                                                        /*}}}*/
-// RecordParser::FileName - Return the archive filename on the site    /*{{{*/
+// RecordParser::Name - Return the package name                                /*{{{*/
 // ---------------------------------------------------------------------
 /* */
-string debRecordParser::FileName()
+string debRecordParser::Name()
 {
-   return FindTag("Filename");
+   return Section.FindS("Package");
 }
                                                                        /*}}}*/
 // RecordParser::MD5Hash - Return the archive hash                     /*{{{*/
@@ -55,7 +59,15 @@ string debRecordParser::FileName()
 /* */
 string debRecordParser::MD5Hash()
 {
-   return FindTag("MD5sum");
+   return Section.FindS("MD5Sum");
+}
+                                                                       /*}}}*/
+// RecordParser::SHA1Hash - Return the archive hash                    /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+string debRecordParser::SHA1Hash()
+{
+   return Section.FindS("SHA1Sum");
 }
                                                                        /*}}}*/
 // RecordParser::Maintainer - Return the maintainer email              /*{{{*/
@@ -63,7 +75,7 @@ string debRecordParser::MD5Hash()
 /* */
 string debRecordParser::Maintainer()
 {
-   return FindTag("Maintainer");
+   return Section.FindS("Maintainer");
 }
                                                                        /*}}}*/
 // RecordParser::ShortDesc - Return a 1 line description               /*{{{*/
@@ -71,7 +83,7 @@ string debRecordParser::Maintainer()
 /* */
 string debRecordParser::ShortDesc()
 {
-   string Res = FindTag("Description");
+   string Res = LongDesc();
    string::size_type Pos = Res.find('\n');
    if (Pos == string::npos)
       return Res;
@@ -83,6 +95,39 @@ string debRecordParser::ShortDesc()
 /* */
 string debRecordParser::LongDesc()
 {
-   return string();
+  string orig, dest;
+  char *codeset = nl_langinfo(CODESET);
+
+  if (!Section.FindS("Description").empty())
+     orig = Section.FindS("Description").c_str();
+  else 
+     orig = Section.FindS(("Description-" + pkgIndexFile::LanguageCode()).c_str()).c_str();
+
+  if (strcmp(codeset,"UTF-8") != 0) {
+     UTF8ToCodeset(codeset, orig, &dest);
+     orig = dest;
+   }    
+  
+   return orig;
+}
+                                                                       /*}}}*/
+// RecordParser::SourcePkg - Return the source package name if any     /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+string debRecordParser::SourcePkg()
+{
+   string Res = Section.FindS("Source");
+   string::size_type Pos = Res.find(' ');
+   if (Pos == string::npos)
+      return Res;
+   return string(Res,0,Pos);
+}
+                                                                       /*}}}*/
+// RecordParser::GetRec - Return the whole record                      /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+void debRecordParser::GetRec(const char *&Start,const char *&Stop)
+{
+   Section.GetSection(Start,Stop);
 }
                                                                        /*}}}*/