move 'search' implementations as well

Git-Dch: Ignore

1 files changed, 2 insertions, 200 deletions

diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 82cb45acd..24ed9eef3 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -44,6 +44,7 @@
 #include <apt-private/private-cacheset.h>
 #include <apt-private/private-cmndline.h>
 #include <apt-private/private-show.h>
+#include <apt-private/private-search.h>
 
 #include <regex.h>
 #include <stddef.h>
@@ -65,38 +66,6 @@
 
 using namespace std;
 
-// LocalitySort - Sort a version list by package file locality		/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-static int LocalityCompare(const void *a, const void *b)
-{
-   pkgCache::VerFile *A = *(pkgCache::VerFile **)a;
-   pkgCache::VerFile *B = *(pkgCache::VerFile **)b;
-   
-   if (A == 0 && B == 0)
-      return 0;
-   if (A == 0)
-      return 1;
-   if (B == 0)
-      return -1;
-   
-   if (A->File == B->File)
-      return A->Offset - B->Offset;
-   return A->File - B->File;
-}
-
-static void LocalitySort(pkgCache::VerFile **begin,
-		  unsigned long Count,size_t Size)
-{   
-   qsort(begin,Count,Size,LocalityCompare);
-}
-
-static void LocalitySort(pkgCache::DescFile **begin,
-		  unsigned long Count,size_t Size)
-{   
-   qsort(begin,Count,Size,LocalityCompare);
-}
-									/*}}}*/
 // UnMet - Show unmet dependencies					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -1215,173 +1184,6 @@ static bool Dotty(CommandLine &CmdL)
    return true;
 }
 									/*}}}*/
-struct ExDescFile
-{
-   pkgCache::DescFile *Df;
-   pkgCache::VerIterator V;
-   map_id_t ID;
-};
-
-// Search - Perform a search						/*{{{*/
-// ---------------------------------------------------------------------
-/* This searches the package names and package descriptions for a pattern */
-static bool Search(CommandLine &CmdL)
-{
-   bool const ShowFull = _config->FindB("APT::Cache::ShowFull",false);
-   bool const NamesOnly = _config->FindB("APT::Cache::NamesOnly",false);
-   unsigned int const NumPatterns = CmdL.FileSize() -1;
-   
-   pkgCacheFile CacheFile;
-   pkgCache *Cache = CacheFile.GetPkgCache();
-   pkgDepCache::Policy *Plcy = CacheFile.GetPolicy();
-   if (unlikely(Cache == NULL || Plcy == NULL))
-      return false;
-
-   // Make sure there is at least one argument
-   if (NumPatterns < 1)
-      return _error->Error(_("You must give at least one search pattern"));
-   
-   // Compile the regex pattern
-   regex_t *Patterns = new regex_t[NumPatterns];
-   memset(Patterns,0,sizeof(*Patterns)*NumPatterns);
-   for (unsigned I = 0; I != NumPatterns; I++)
-   {
-      if (regcomp(&Patterns[I],CmdL.FileList[I+1],REG_EXTENDED | REG_ICASE | 
-		  REG_NOSUB) != 0)
-      {
-	 for (; I != 0; I--)
-	    regfree(&Patterns[I]);
-	 return _error->Error("Regex compilation error");
-      }      
-   }
-   
-   if (_error->PendingError() == true)
-   {
-      for (unsigned I = 0; I != NumPatterns; I++)
-	 regfree(&Patterns[I]);
-      return false;
-   }
-   
-   size_t const descCount = Cache->HeaderP->GroupCount + 1;
-   ExDescFile *DFList = new ExDescFile[descCount];
-   memset(DFList,0,sizeof(*DFList) * descCount);
-
-   bool *PatternMatch = new bool[descCount * NumPatterns];
-   memset(PatternMatch,false,sizeof(*PatternMatch) * descCount * NumPatterns);
-
-   // Map versions that we want to write out onto the VerList array.
-   for (pkgCache::GrpIterator G = Cache->GrpBegin(); G.end() == false; ++G)
-   {
-      size_t const PatternOffset = G->ID * NumPatterns;
-      size_t unmatched = 0, matched = 0;
-      for (unsigned I = 0; I < NumPatterns; ++I)
-      {
-	 if (PatternMatch[PatternOffset + I] == true)
-	    ++matched;
-	 else if (regexec(&Patterns[I],G.Name(),0,0,0) == 0)
-	    PatternMatch[PatternOffset + I] = true;
-	 else
-	    ++unmatched;
-      }
-
-      // already dealt with this package?
-      if (matched == NumPatterns)
-	 continue;
-
-      // Doing names only, drop any that don't match..
-      if (NamesOnly == true && unmatched == NumPatterns)
-	 continue;
-
-      // Find the proper version to use
-      pkgCache::PkgIterator P = G.FindPreferredPkg();
-      if (P.end() == true)
-	 continue;
-      pkgCache::VerIterator V = Plcy->GetCandidateVer(P);
-      if (V.end() == false)
-      {
-	 pkgCache::DescIterator const D = V.TranslatedDescription();
-	 //FIXME: packages without a description can't be found
-	 if (D.end() == true)
-	    continue;
-	 DFList[G->ID].Df = D.FileList();
-	 DFList[G->ID].V = V;
-	 DFList[G->ID].ID = G->ID;
-      }
-
-      if (unmatched == NumPatterns)
-	 continue;
-
-      // Include all the packages that provide matching names too
-      for (pkgCache::PrvIterator Prv = P.ProvidesList() ; Prv.end() == false; ++Prv)
-      {
-	 pkgCache::VerIterator V = Plcy->GetCandidateVer(Prv.OwnerPkg());
-	 if (V.end() == true)
-	    continue;
-
-	 unsigned long id = Prv.OwnerPkg().Group()->ID;
-	 pkgCache::DescIterator const D = V.TranslatedDescription();
-	 //FIXME: packages without a description can't be found
-	 if (D.end() == true)
-	    continue;
-	 DFList[id].Df = D.FileList();
-	 DFList[id].V = V;
-	 DFList[id].ID = id;
-
-	 size_t const PrvPatternOffset = id * NumPatterns;
-	 for (unsigned I = 0; I < NumPatterns; ++I)
-	    PatternMatch[PrvPatternOffset + I] |= PatternMatch[PatternOffset + I];
-      }
-   }
-
-   LocalitySort(&DFList->Df,Cache->HeaderP->GroupCount,sizeof(*DFList));
-
-   // Create the text record parser
-   pkgRecords Recs(*Cache);
-   // Iterate over all the version records and check them
-   for (ExDescFile *J = DFList; J->Df != 0; ++J)
-   {
-      pkgRecords::Parser &P = Recs.Lookup(pkgCache::DescFileIterator(*Cache,J->Df));
-      size_t const PatternOffset = J->ID * NumPatterns;
-
-      if (NamesOnly == false)
-      {
-	 string const LongDesc = P.LongDesc();
-	 for (unsigned I = 0; I < NumPatterns; ++I)
-	 {
-	    if (PatternMatch[PatternOffset + I] == true)
-	       continue;
-	    else if (regexec(&Patterns[I],LongDesc.c_str(),0,0,0) == 0)
-	       PatternMatch[PatternOffset + I] = true;
-	 }
-      }
-
-      bool matchedAll = true;
-      for (unsigned I = 0; I < NumPatterns; ++I)
-	 if (PatternMatch[PatternOffset + I] == false)
-	 {
-	    matchedAll = false;
-	    break;
-	 }
-
-      if (matchedAll == true)
-      {
-	 if (ShowFull == true)
-	    DisplayRecordV1(CacheFile, J->V, std::cout);
-	 else
-	    printf("%s - %s\n",P.Name().c_str(),P.ShortDesc().c_str());
-      }
-   }
-   
-   delete [] DFList;
-   delete [] PatternMatch;
-   for (unsigned I = 0; I != NumPatterns; I++)
-      regfree(&Patterns[I]);
-   delete [] Patterns;
-   if (ferror(stdout))
-       return _error->Error("Write to stdout failed");
-   return true;
-}
-									/*}}}*/
 /* ShowAuto - show automatically installed packages (sorted)		{{{*/
 static bool ShowAuto(CommandLine &)
 {
@@ -1776,7 +1578,7 @@ int main(int argc,const char *argv[])					/*{{{*/
                                     {"dump",&Dump},
                                     {"dumpavail",&DumpAvail},
                                     {"unmet",&UnMet},
-                                    {"search",&Search},
+                                    {"search",&DoSearch},
                                     {"depends",&Depends},
                                     {"rdepends",&RDepends},
                                     {"dotty",&Dotty},