From da724334d46c01ee9d4f04101dab5d048c35c833 Mon Sep 17 00:00:00 2001 From: ulf69 Date: Tue, 19 Oct 2004 00:49:09 +0000 Subject: final changes to have syncronisation in place --- diff --git a/pwmanager/pwmanager/pwmdoc.cpp b/pwmanager/pwmanager/pwmdoc.cpp index 2a7b11d..e9906a4 100644 --- a/pwmanager/pwmanager/pwmdoc.cpp +++ b/pwmanager/pwmanager/pwmdoc.cpp @@ -2802,6 +2802,21 @@ PwMerror PwMDoc::importFromGpasman(const QString *file) return e_success; } + +//US: we use the stl sort algorythm to sort all elements in the order +//of its listViewPos (in the order 1,2,3,5,...,x,-1, -1, -1 +struct PwMDataItemListViewPosSort +{ + bool operator()(PwMDataItem* rpStart, PwMDataItem* rpEnd) + { + //qDebug("pwMDoc::PwMDataItemListViewPosSort()"); + if ((rpEnd)->listViewPos < 0) + return false; + else + return (rpStart)->listViewPos < (rpEnd)->listViewPos; + } +}; + void PwMDoc::ensureLvp() { if (isDocEmpty()) @@ -2809,60 +2824,66 @@ void PwMDoc::ensureLvp() //US ENH BUG: when using syncronizing, this way of sorting //is not sufficient, because there might be empty spaces - // at the beginning. But this algorythm only can add elements - //to the end.The result are crashes because of listoverflows + // at the beginning. But the old algorythm only can add elements + //to the end.The result are crashes because of list overflows //we need something to fill all gaps. - vector< vector::iterator > undefined; - vector< vector::iterator > sorted; - vector< vector::iterator >::iterator undefBegin, - undefEnd, - undefI; - vector< vector::iterator >::iterator sortedBegin, - sortedEnd, - sortedI; + vector sorted; + vector< PwMDataItem*>::iterator sortedBegin, + sortedEnd, + sortedI; vector::iterator catBegin = dti.dta.begin(), catEnd = dti.dta.end(), catI = catBegin; vector::iterator entrBegin, entrEnd, entrI; int lvpTop, tmpLvp; + //qDebug("collect:"); + while (catI != catEnd) { lvpTop = -1; - undefined.clear(); + sorted.clear(); entrBegin = catI->d.begin(); entrEnd = catI->d.end(); entrI = entrBegin; + //US: we use the stl sort algorythm to sort all elements in the order + //of its listViewPos (in the order 1,2,2,3,5,...,x,-1, -1, -1 while (entrI != entrEnd) { - tmpLvp = entrI->listViewPos; - if (tmpLvp == -1) - undefined.push_back(entrI); - else - sorted[tmpLvp] = entrI; - //US else if (tmpLvp > lvpTop) - //US lvpTop = tmpLvp; - ++entrI; + //qDebug("found: %s, pos=%i", (*entrI).desc.c_str(), (*entrI).listViewPos); + sorted.push_back((PwMDataItem*)&(*entrI)); + ++entrI; } - //now we have all undefied in the collection. Now insert the existing + sortedBegin = sorted.begin(); + sortedEnd = sorted.end(); + + sort(sortedBegin, sortedEnd, PwMDataItemListViewPosSort()); + + // qDebug("resort:"); + //now we have all sorted in a collection + //Now start with the sorted and reset listviewpos. sortedBegin = sorted.begin(); sortedEnd = sorted.end(); sortedI = sortedBegin; while (sortedI != sortedEnd) { - tmpLvp = (*sortedI)->listViewPos; - undefined[tmpLvp] = *sortedI; - ++sortedI; + // qDebug("reset defined: %s, from pos=%i to pos=%i", (*sortedI)->desc.c_str(), (*sortedI)->listViewPos, lvpTop+1); + (*sortedI)->listViewPos = ++lvpTop; + ++sortedI; } - undefBegin = undefined.begin(); - undefEnd = undefined.end(); - undefI = undefBegin; - while (undefI != undefEnd) { - (*undefI)->listViewPos = ++lvpTop; - ++undefI; + /*/debug + entrBegin = catI->d.begin(); + entrEnd = catI->d.end(); + entrI = entrBegin; + + while (entrI != entrEnd) { + qDebug("check: %s, pos=%i", (*entrI).desc.c_str(), (*entrI).listViewPos); + ++entrI; } + */ + ++catI; } } @@ -2996,8 +3017,6 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s if ( ! fullDateRange ) { if ( syncItemLocal->lastSyncDate != syncItemRemote->lastSyncDate ) { - // qDebug("set fulldate to true %s %s" ,syncItemLocal->lastSyncDate.toString().latin1(), syncItemRemote->lastSyncDate.toString().latin1() ); - // qDebug("%d %d %d %d ", syncItemLocal->lastSyncDate.time().second(), addresseeLSync->dtStart().time().msec() , addresseeRSync->dtStart().time().second(), addresseeRSync->dtStart().time().msec()); fullDateRange = true; qDebug("FULLDATE 3 %s %s", syncItemLocal->lastSyncDate.toString().latin1() , syncItemRemote->lastSyncDate.toString().latin1() ); } @@ -3042,14 +3061,14 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s if ( take == 3 ) return e_syncError; if ( take == 1 ) {// take local - //US syncRemote->removeAddressee( inRemote ); + int oldlistpos = inRemote->listViewPos; (*inRemote) = (*inLocal); - //US syncRemote->insertAddressee( inRemote , false); + inRemote->listViewPos = oldlistpos; ++changedRemote; } else { // take == 2 take remote - //US syncLocal->removeAddressee( inLocal ); + int oldlistpos = inLocal->listViewPos; (*inLocal) = (*inRemote); - //US syncLocal->insertAddressee( inLocal , false ); + inLocal->listViewPos = oldlistpos; ++changedLocal; } } @@ -3137,11 +3156,6 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s syncItemLocal->lastSyncDate = mLastSync; syncItemRemote->lastSyncDate = mLastSync; - // addresseeRSync.setRole( i18n("!Remote from: ")+mCurrentSyncName ) ; - // addresseeLSync.setRole(i18n("!Local from: ") + mCurrentSyncName ); - - //US syncRemote->addSyncDataEntry( syncItemRemote, false ); - //US syncLocal->addSyncDataEntry( syncItemLocal, false ); QString mes; mes .sprintf( i18n("Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n"),addedPasswordsLocal, addedPasswordsRemote, changedLocal, changedRemote, deletedPasswordsLocal, deletedPasswordsRemote ); if ( manager->mShowSyncSummary ) { @@ -3170,16 +3184,16 @@ int PwMDoc::takePwMDataItem( PwMDataItem* local, PwMDataItem* remote, QDateTime //qDebug("%s %d %s %d", local->lastModified().toString().latin1() , localMod, remote->lastModified().toString().latin1(), remoteMod); //qDebug("%d %d %d %d ", local->lastModified().time().second(), local->lastModified().time().msec(), remote->lastModified().time().second(), remote->lastModified().time().msec() ); - full = true; //debug only + //full = true; //debug only if ( full ) { bool equ = ( (*local) == (*remote) ); if ( equ ) { - qDebug("equal "); + //qDebug("equal "); if ( mode < SYNC_PREF_FORCE_LOCAL ) return 0; - }else //debug only - qDebug("not equal %s %s ", local->desc.c_str(), remote->desc.c_str()); + }//else //debug only + //qDebug("not equal %s %s ", local->desc.c_str(), remote->desc.c_str()); } int result; diff --git a/pwmanager/pwmanager/pwmdoc.h b/pwmanager/pwmanager/pwmdoc.h index 6a1dd30..535fb92 100644 --- a/pwmanager/pwmanager/pwmdoc.h +++ b/pwmanager/pwmanager/pwmdoc.h @@ -209,9 +209,10 @@ struct PwMDataItem } //US ENH: we need this operator to compare two items if we have no unique ids //available. Generaly this happens before the first sync + bool PwMDataItem::operator==( const PwMDataItem &a ) const { - qDebug("oper==%s", a.desc.c_str()); + //qDebug("oper==%s", a.desc.c_str()); if ( desc != a.desc ) return false; if ( name != a.name ) return false; if ( pw != a.pw ) return false; @@ -221,26 +222,6 @@ struct PwMDataItem //all other field will not be checked. return true; } - - //US ENH:this operator is used to copy an elements data during syncronization - //Attention: listViewPos will not be copied. So the position will stay the same. - PwMDataItem& operator = (const PwMDataItem& x) - { - // qDebug("oper=%s", x.desc.c_str()); - desc = x.desc; - name = x.name; - pw = x.pw; - comment = x.comment; - url = x.url; - launcher = x.launcher; - lockStat = x.lockStat; - //Do not copy listViewPos!!! listViewPos = x.listViewPos; - binary = x.binary; - meta = x.meta; - rev = x.rev; - return *this; - } - }; struct PwMCategoryItem -- cgit v0.9.0.2