Some fixes to the namespace using.

the first test implementation of regexp-search for addressbook (disabled)

1 files changed, 31 insertions, 6 deletions

diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp
index 3142f75..bb5c99b 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp
@@ -554,110 +554,135 @@ QArray<int> OPimContactAccessBackend_SQL::queryByExample ( const OPimContact &qu
 
                                 if ( settings & OPimContactAccess::DateDay ){
                                         if ( ( settings & OPimContactAccess::DateDiff ) 
                                              || ( settings & OPimContactAccess::DateYear ) 
                                              || ( settings & OPimContactAccess::DateMonth ) )
                                                 searchQuery += " AND";
 
                                         searchQuery += QString( " (\"%1\" LIKE '%-%-%2')" )
                                                 .arg( *it )
                                                 .arg( QString::number( endDate->day() ).rightJustify( 2, '0' ) );
                                 }
 
                                 break;
                         default:
                                 // Switching between case sensitive and insensitive...
                                 // LIKE is not case sensitive, GLOB is case sensitive
                                 // Do exist a better solution to switch this ?
                                 if ( settings & OPimContactAccess::IgnoreCase )
                                         searchQuery += "(\"" + *it + "\"" + " LIKE " + "'" 
                                                 + queryStr.replace(QRegExp("\\*"),"%") + "'" + ")"; 
                                 else
                                         searchQuery += "(\"" + *it + "\"" + " GLOB " + "'" 
                                                 + queryStr + "'" + ")"; 
                                         
                         }
                 }
         }
         // Skip trailing "AND"
         // if ( isAnyFieldSelected )
         //      qu = qu.left( qu.length() - 4 );
 
         qu += searchQuery;
 
         qDebug( "queryByExample query: %s", qu.latin1() );
 
         // Execute query and return the received uid's
         OSQLRawQuery raw( qu );
         OSQLResult res = m_driver->query( &raw );
         if ( res.state() != OSQLResult::Success ){
                 QArray<int> empty;
                 return empty;
         }
 
         QArray<int> list = extractUids( res );
 
                 return list;    
 }
 
-QArray<int> OPimContactAccessBackend_SQL::matchRegexp(  const QRegExp &r ) const
+QArray<int> OPimContactAccessBackend_SQL::matchRegexp( const QRegExp &r ) const
 {
+#if 1
         QArray<int> nix(0);
         return nix;
+
+#else
+        QString qu = "SELECT uid FROM addressbook WHERE (";
+        QString searchlist;
+
+        QStringList fieldList = OPimContactFields::untrfields( false );
+        // QMap<QString, int> translate = OPimContactFields::untrFieldsToId();
+        for ( QStringList::Iterator it = ++fieldList.begin(); it != fieldList.end(); ++it ){
+                if ( !searchlist.isEmpty() )
+                        searchlist += " OR ";
+                searchlist += "\"" + *it + "\" rlike(\"" + r.pattern() + "\") ";
+        }
+                
+        qu = qu + searchlist + ")";
+
+        qDebug( "query: %s", qu.latin1() );
+
+        OSQLRawQuery raw( qu );
+        OSQLResult res = m_driver->query( &raw );
+
+        return extractUids( res );
+
+
+#endif
 }
 
 const uint OPimContactAccessBackend_SQL::querySettings()
 {
         return OPimContactAccess::IgnoreCase 
-                || OPimContactAccess::WildCards
-                || OPimContactAccess::DateDiff
-                || OPimContactAccess::DateYear
-                || OPimContactAccess::DateMonth
-                || OPimContactAccess::DateDay
+                | OPimContactAccess::WildCards
+                | OPimContactAccess::DateDiff
+                | OPimContactAccess::DateYear
+                | OPimContactAccess::DateMonth
+                | OPimContactAccess::DateDay
                 ;
 }
 
 bool OPimContactAccessBackend_SQL::hasQuerySettings (uint querySettings) const
 {
         /* OPimContactAccess::IgnoreCase, DateDiff, DateYear, DateMonth, DateDay
          * may be added with any of the other settings. IgnoreCase should never used alone.
          * Wildcards, RegExp, ExactMatch should never used at the same time...
          */
 
         // Step 1: Check whether the given settings are supported by this backend
         if ( ( querySettings & ( 
                                 OPimContactAccess::IgnoreCase
                                 | OPimContactAccess::WildCards
                                 | OPimContactAccess::DateDiff
                                 | OPimContactAccess::DateYear
                                 | OPimContactAccess::DateMonth
                                 | OPimContactAccess::DateDay
         //                      | OPimContactAccess::RegExp
         //                      | OPimContactAccess::ExactMatch
                                ) ) != querySettings )
                 return false;
 
         // Step 2: Check whether the given combinations are ok..
 
         // IngoreCase alone is invalid
         if ( querySettings == OPimContactAccess::IgnoreCase )
                 return false;
 
         // WildCards, RegExp and ExactMatch should never used at the same time 
         switch ( querySettings & ~( OPimContactAccess::IgnoreCase
                                     | OPimContactAccess::DateDiff
                                     | OPimContactAccess::DateYear
                                     | OPimContactAccess::DateMonth
                                     | OPimContactAccess::DateDay
                                     )
                  ){
         case OPimContactAccess::RegExp:
                 return ( true );
         case OPimContactAccess::WildCards:
                 return ( true );
         case OPimContactAccess::ExactMatch:
                 return ( true );
         case 0: // one of the upper removed bits were set..
                 return ( true );
         default:
                 return ( false );
         }