Slower, but more appropriate status parser. Now identifies the state_status column and compares against installed.. This fixes the bug introduced where it hit 'ok installed' but not 'prefer installed', both of which are valid entries.

1 files changed, 10 insertions, 2 deletions

diff --git a/noncore/settings/aqpkg/package.cpp b/noncore/settings/aqpkg/package.cpp
index 99187ac..83e0706 100644
--- a/noncore/settings/aqpkg/package.cpp
+++ b/noncore/settings/aqpkg/package.cpp
@@ -1,136 +1,144 @@
 /***************************************************************************
                           package.cpp  -  description
                              -------------------
     begin                : Mon Aug 26 2002
     copyright            : (C) 2002 by Andy Qua
     email                : andy.qua@blueyonder.co.uk
  ***************************************************************************/
 
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #include "package.h"
 #include "global.h"
 
 Package::Package( QString &name )
 {
     packageName = name;
 
     version = "N/A";
     description = "N/A";
     packageSize = "N/A";
     section = "N/A";
     
     localPackage = 0;
     installed = false;
     packageStoredLocally = false;
     installedToRoot = false;
     installed = false;
     installedTo = 0;
 }
 
 Package::Package( char *name )
 {
     packageName = name;
 
     version = "N/A";
     description = "N/A";
     packageSize = "N/A";
     section = "N/A";
     
     localPackage = 0;
     installed = false;
     packageStoredLocally = false;
     installedToRoot = false;
     installed = false;
     installedTo = 0;
 }
 
 Package::~Package()
 {
 }
 
 QString Package :: toString()
 {
     QString ret = "Package - " + getPackageName() +
            "\n              version - " + getVersion();
 
     if ( localPackage )
         ret += "\n              inst version - " + localPackage->getVersion();
 
 
     return ret;
 }
 
 void Package :: setStatus( const QString &s )
 {
-    status = s;
+    QString state_status;
+    int two, three;
 
-    if ( status.find( "ok installed" ) != -1 )
+    status = s.simplifyWhiteSpace( );
+    
+    two = status.find( " " ); // find second column
+    three = status.find( " ", two + 1 ); // find third column
+
+    state_status = status.mid( three ).stripWhiteSpace( );
+
+    if ( state_status == "installed" )
         installed = true;
 }
 
 void Package :: setLocalPackage( Package *p )
 {
     localPackage = p;
 
     if ( localPackage )
         if ( localPackage->getVersion() != getVersion() )
             differentVersionAvailable = true;
         else
             differentVersionAvailable = false;
 }
 
 void Package :: setVersion( const QString &v )
 {
     version = v;
 
     if ( localPackage )
         if ( localPackage->getVersion() != getVersion() )
             differentVersionAvailable = true;
         else
             differentVersionAvailable = false;
 }
 
 void Package :: setPackageName( const QString &name )
 {
     packageName = name;
 }
 
 void Package :: setDescription( const QString &d )
 {
     description = d;
 }
 
 void Package :: setFilename( const QString &f )
 {
         filename = f;
 }
 
 
 QString Package :: getInstalledVersion()
 {
     if ( localPackage )
         return localPackage->getVersion();
     else
         return getVersion();
 }
 
 QString Package :: getInstalledPackageName()
 {
     if ( localPackage )
         return localPackage->getPackageName();
     else
         return getPackageName();
 }
 
 bool Package :: isInstalled()
 {
     return installed || ( localPackage && localPackage->isInstalled() );
 }