| -rw-r--r-- | kde2file/caldump/main.cpp | 55 |
1 files changed, 31 insertions, 24 deletions
diff --git a/kde2file/caldump/main.cpp b/kde2file/caldump/main.cpp index 03571b9..755e792 100644 --- a/kde2file/caldump/main.cpp +++ b/kde2file/caldump/main.cpp | |||
| @@ -167,26 +167,11 @@ int main( int argc, char *argv[] ) | |||
| 167 | for( it = newInc.begin(); it != newInc.end(); ++it ) { | 167 | for( it = newInc.begin(); it != newInc.end(); ++it ) { |
| 168 | Incidence* cl = (*it)->clone(); | 168 | if ( (*it)->pilotId() > 0 ) { //changed |
| 169 | Incidence *incOld = calendarResource->incidence( cl->uid() ); | 169 | Incidence* cl = (*it)->clone(); |
| 170 | ResourceCalendar * res = 0; | 170 | Incidence *incOld = calendarResource->incidence( cl->uid() ); |
| 171 | if ( incOld ) | 171 | ResourceCalendar * res = 0; |
| 172 | res = calendarResource->resource( incOld ); | 172 | if ( incOld ) |
| 173 | if ( res ) { | 173 | res = calendarResource->resource( incOld ); |
| 174 | ++num; | 174 | if ( res ) { |
| 175 | if ( incOld->type() == "Journal" ) | 175 | cl->setPilotId( incOld->pilotId() ); |
| 176 | calendarResource->deleteJournal( (Journal *) incOld ); | 176 | ++num; |
| 177 | else if ( incOld->type() == "Todo" ) | ||
| 178 | calendarResource->deleteTodo( (Todo *) incOld ); | ||
| 179 | else if ( incOld->type() == "Event" ) | ||
| 180 | calendarResource->deleteEvent( (Event *) incOld ); | ||
| 181 | |||
| 182 | if ( cl->type() == "Journal" ) | ||
| 183 | calendarResource->addJournal( (Journal *) cl, res ); | ||
| 184 | else if ( cl->type() == "Todo" ) | ||
| 185 | calendarResource->addTodo( (Todo *) cl, res ); | ||
| 186 | else if ( cl->type() == "Event" ) | ||
| 187 | calendarResource->addEvent( (Event *) cl, res ); | ||
| 188 | |||
| 189 | } else { | ||
| 190 | if ( incOld ) { | ||
| 191 | qDebug("ERROR: no resource found for old incidence "); | ||
| 192 | if ( incOld->type() == "Journal" ) | 177 | if ( incOld->type() == "Journal" ) |
| @@ -197,4 +182,26 @@ int main( int argc, char *argv[] ) | |||
| 197 | calendarResource->deleteEvent( (Event *) incOld ); | 182 | calendarResource->deleteEvent( (Event *) incOld ); |
| 183 | |||
| 184 | if ( cl->type() == "Journal" ) | ||
| 185 | calendarResource->addJournal( (Journal *) cl, res ); | ||
| 186 | else if ( cl->type() == "Todo" ) | ||
| 187 | calendarResource->addTodo( (Todo *) cl, res ); | ||
| 188 | else if ( cl->type() == "Event" ) | ||
| 189 | calendarResource->addEvent( (Event *) cl, res ); | ||
| 190 | |||
| 191 | } else { | ||
| 192 | if ( incOld ) { | ||
| 193 | qDebug("ERROR: no resource found for old incidence "); | ||
| 194 | if ( incOld->type() == "Journal" ) | ||
| 195 | calendarResource->deleteJournal( (Journal *) incOld ); | ||
| 196 | else if ( incOld->type() == "Todo" ) | ||
| 197 | calendarResource->deleteTodo( (Todo *) incOld ); | ||
| 198 | else if ( incOld->type() == "Event" ) | ||
| 199 | calendarResource->deleteEvent( (Event *) incOld ); | ||
| 198 | 200 | ||
| 201 | } | ||
| 202 | calendarResource->addIncidence( cl ); | ||
| 203 | ++add; | ||
| 199 | } | 204 | } |
| 205 | } else { // added | ||
| 206 | Incidence* cl = (*it)->clone(); | ||
| 200 | calendarResource->addIncidence( cl ); | 207 | calendarResource->addIncidence( cl ); |