equal
deleted
inserted
replaced
24 #include "harvesterclientao.h" |
24 #include "harvesterclientao.h" |
25 #include "harvestersessionwatcher.h" |
25 #include "harvestersessionwatcher.h" |
26 #include "mdsutils.h" |
26 #include "mdsutils.h" |
27 #include "harvesterrequestactive.h" |
27 #include "harvesterrequestactive.h" |
28 #include "mdscommoninternal.h" |
28 #include "mdscommoninternal.h" |
|
29 #include "OstTraceDefinitions.h" |
|
30 #ifdef OST_TRACE_COMPILER_IN_USE |
|
31 #include "harvesterclientTraces.h" |
|
32 #endif |
29 |
33 |
30 /** @var Message slots */ |
34 /** @var Message slots */ |
31 const TInt KDefaultMessageSlots = -1; // Global pool |
35 const TInt KDefaultMessageSlots = -1; // Global pool |
32 |
36 |
33 /* Server name */ |
37 /* Server name */ |
46 // ---------------------------------------------------------------------------------------- |
50 // ---------------------------------------------------------------------------------------- |
47 // |
51 // |
48 EXPORT_C RHarvesterClient::RHarvesterClient() : RSessionBase() |
52 EXPORT_C RHarvesterClient::RHarvesterClient() : RSessionBase() |
49 { |
53 { |
50 WRITELOG( "RHarvesterClient::RHarvesterClient() - Constructor" ); |
54 WRITELOG( "RHarvesterClient::RHarvesterClient() - Constructor" ); |
|
55 OstTrace0( TRACE_NORMAL, RHARVESTERCLIENT_RHARVESTERCLIENT, "RHarvesterClient::RHarvesterClient" ); |
|
56 |
51 iHarvesterClientAO = NULL; |
57 iHarvesterClientAO = NULL; |
52 iObserver = NULL; |
58 iObserver = NULL; |
53 iHEO = NULL; |
59 iHEO = NULL; |
54 iRequestQueue = NULL; |
60 iRequestQueue = NULL; |
55 } |
61 } |
59 // ---------------------------------------------------------------------------------------- |
65 // ---------------------------------------------------------------------------------------- |
60 // |
66 // |
61 EXPORT_C TInt RHarvesterClient::Connect() |
67 EXPORT_C TInt RHarvesterClient::Connect() |
62 { |
68 { |
63 WRITELOG( "RHarvesterClient::Connect()" ); |
69 WRITELOG( "RHarvesterClient::Connect()" ); |
64 |
70 OstTrace0( TRACE_NORMAL, RHARVESTERCLIENT_CONNECT, "RHarvesterClient::Connect" ); |
|
71 |
|
72 |
65 RProperty property; |
73 RProperty property; |
66 const TInt error( property.Attach( KHarvesterPSShutdown, KShutdown, EOwnerThread ) ); |
74 const TInt error( property.Attach( KHarvesterPSShutdown, KShutdown, EOwnerThread ) ); |
67 TInt value = 0; |
75 TInt value = 0; |
68 property.Get( value ); |
76 property.Get( value ); |
69 property.Close(); |
77 property.Close(); |
135 // Pause |
143 // Pause |
136 // ---------------------------------------------------------------------------------------- |
144 // ---------------------------------------------------------------------------------------- |
137 // |
145 // |
138 EXPORT_C TInt RHarvesterClient::Pause() |
146 EXPORT_C TInt RHarvesterClient::Pause() |
139 { |
147 { |
|
148 OstTrace0( TRACE_NORMAL, RHARVESTERCLIENT_PAUSE, "RHarvesterClient::Pause" ); |
|
149 |
140 WRITELOG( "RHarvesterClient::Pause() - sending command EPauseHarvester" ); |
150 WRITELOG( "RHarvesterClient::Pause() - sending command EPauseHarvester" ); |
141 if( iHandle ) |
151 if( iHandle ) |
142 { |
152 { |
143 return SendReceive( EPauseHarvester ); |
153 return SendReceive( EPauseHarvester ); |
144 } |
154 } |
150 // ---------------------------------------------------------------------------------------- |
160 // ---------------------------------------------------------------------------------------- |
151 // |
161 // |
152 EXPORT_C TInt RHarvesterClient::Resume() |
162 EXPORT_C TInt RHarvesterClient::Resume() |
153 { |
163 { |
154 WRITELOG( "RHarvesterClient::Resume() - sending command EResumeHarvester" ); |
164 WRITELOG( "RHarvesterClient::Resume() - sending command EResumeHarvester" ); |
|
165 OstTrace0( TRACE_NORMAL, RHARVESTERCLIENT_RESUME, "RHarvesterClient::Resume" ); |
|
166 |
155 if( iHandle ) |
167 if( iHandle ) |
156 { |
168 { |
157 return SendReceive( EResumeHarvester ); |
169 return SendReceive( EResumeHarvester ); |
158 } |
170 } |
159 return KErrDisconnected; |
171 return KErrDisconnected; |
164 // ---------------------------------------------------------------------------------------- |
176 // ---------------------------------------------------------------------------------------- |
165 // |
177 // |
166 EXPORT_C void RHarvesterClient::Close() |
178 EXPORT_C void RHarvesterClient::Close() |
167 { |
179 { |
168 WRITELOG( "RHarvesterClient::Close()" ); |
180 WRITELOG( "RHarvesterClient::Close()" ); |
|
181 OstTrace0( TRACE_NORMAL, RHARVESTERCLIENT_CLOSE, "RHarvesterClient::Close" ); |
169 |
182 |
170 delete iSessionWatcher; |
183 delete iSessionWatcher; |
171 iSessionWatcher = NULL; |
184 iSessionWatcher = NULL; |
172 |
185 |
173 // cancels Harvest Complete request if it exist at server |
186 // cancels Harvest Complete request if it exist at server |
200 // ---------------------------------------------------------------------------------------- |
213 // ---------------------------------------------------------------------------------------- |
201 // |
214 // |
202 EXPORT_C void RHarvesterClient::SetObserver( MHarvestObserver* aObserver ) |
215 EXPORT_C void RHarvesterClient::SetObserver( MHarvestObserver* aObserver ) |
203 { |
216 { |
204 WRITELOG( "RHarvesterClient::SetObserver()" ); |
217 WRITELOG( "RHarvesterClient::SetObserver()" ); |
|
218 OstTrace0( TRACE_NORMAL, RHARVESTERCLIENT_SETOBSERVER, "RHarvesterClient::SetObserver" ); |
205 |
219 |
206 if ( iHarvesterClientAO ) |
220 if ( iHarvesterClientAO ) |
207 { |
221 { |
208 iHarvesterClientAO->SetObserver( aObserver ); |
222 iHarvesterClientAO->SetObserver( aObserver ); |
209 } |
223 } |
215 // ---------------------------------------------------------------------------------------- |
229 // ---------------------------------------------------------------------------------------- |
216 // |
230 // |
217 EXPORT_C void RHarvesterClient::RemoveObserver( MHarvestObserver* aObserver ) |
231 EXPORT_C void RHarvesterClient::RemoveObserver( MHarvestObserver* aObserver ) |
218 { |
232 { |
219 WRITELOG( "RHarvesterClient::RemoveObserver()" ); |
233 WRITELOG( "RHarvesterClient::RemoveObserver()" ); |
|
234 OstTrace0( TRACE_NORMAL, RHARVESTERCLIENT_REMOVEOBSERVER, "RHarvesterClient::RemoveObserver" ); |
220 |
235 |
221 if ( iHarvesterClientAO ) |
236 if ( iHarvesterClientAO ) |
222 { |
237 { |
223 iHarvesterClientAO->RemoveObserver( aObserver ); |
238 iHarvesterClientAO->RemoveObserver( aObserver ); |
224 } |
239 } |
281 // ---------------------------------------------------------------------------------------- |
296 // ---------------------------------------------------------------------------------------- |
282 // |
297 // |
283 EXPORT_C void RHarvesterClient::HarvestFile( const TDesC& aURI, RArray<TItemId>& aAlbumIds, TBool aAddLocation ) |
298 EXPORT_C void RHarvesterClient::HarvestFile( const TDesC& aURI, RArray<TItemId>& aAlbumIds, TBool aAddLocation ) |
284 { |
299 { |
285 WRITELOG1( "RHarvesterClient::HarvestFile() - file %S", &aURI ); |
300 WRITELOG1( "RHarvesterClient::HarvestFile() - file %S", &aURI ); |
|
301 OstTrace0( TRACE_NORMAL, RHARVESTERCLIENT_HARVESTFILE, "RHarvesterClient::HarvestFile" ); |
|
302 |
286 |
303 |
287 HBufC8* paramBuf = NULL; |
304 HBufC8* paramBuf = NULL; |
288 TRAPD( err, paramBuf = SerializeArrayL( aAlbumIds ) ); |
305 TRAPD( err, paramBuf = SerializeArrayL( aAlbumIds ) ); |
289 if ( err ) |
306 if ( err ) |
290 { |
307 { |
352 RArray<TItemId>& aAlbumIds, |
369 RArray<TItemId>& aAlbumIds, |
353 TBool aAddLocation, |
370 TBool aAddLocation, |
354 TUid /*aUid*/ ) |
371 TUid /*aUid*/ ) |
355 { |
372 { |
356 WRITELOG1( "RHarvesterClient::HarvestFileWithUID() - file %S", &aURI ); |
373 WRITELOG1( "RHarvesterClient::HarvestFileWithUID() - file %S", &aURI ); |
|
374 OstTrace0( TRACE_NORMAL, RHARVESTERCLIENT_HARVESTFILEWITHUID, "RHarvesterClient::HarvestFileWithUID" ); |
|
375 |
357 |
376 |
358 HBufC8* paramBuf = NULL; |
377 HBufC8* paramBuf = NULL; |
359 TRAPD( err, paramBuf = SerializeArrayL( aAlbumIds ) ); |
378 TRAPD( err, paramBuf = SerializeArrayL( aAlbumIds ) ); |
360 if ( err ) |
379 if ( err ) |
361 { |
380 { |
445 // ---------------------------------------------------------------------------------------- |
464 // ---------------------------------------------------------------------------------------- |
446 // |
465 // |
447 void RHarvesterClient::RegisterHarvestComplete(TDes& aURI, TRequestStatus& aStatus) |
466 void RHarvesterClient::RegisterHarvestComplete(TDes& aURI, TRequestStatus& aStatus) |
448 { |
467 { |
449 TIpcArgs ipcArgs( &aURI ); |
468 TIpcArgs ipcArgs( &aURI ); |
|
469 OstTrace0( TRACE_NORMAL, RHARVESTERCLIENT_REGISTERHARVESTCOMPLETE, "RHarvesterClient::RegisterHarvestComplete" ); |
|
470 |
450 |
471 |
451 if( !iHandle ) |
472 if( !iHandle ) |
452 { |
473 { |
453 return; |
474 return; |
454 } |
475 } |
510 // ---------------------------------------------------------------------------------------- |
531 // ---------------------------------------------------------------------------------------- |
511 // |
532 // |
512 static TInt StartServer() |
533 static TInt StartServer() |
513 { |
534 { |
514 WRITELOG( "StartServer() - begin" ); |
535 WRITELOG( "StartServer() - begin" ); |
|
536 OstTrace0( TRACE_NORMAL, _STARTSERVER, "::StartServer" ); |
515 |
537 |
516 TFindServer findHarvesterServer( KHarvesterServerName ); |
538 TFindServer findHarvesterServer( KHarvesterServerName ); |
517 TFullName name; |
539 TFullName name; |
518 |
540 |
519 TInt result = findHarvesterServer.Next( name ); |
541 TInt result = findHarvesterServer.Next( name ); |
553 // ---------------------------------------------------------------------------------------- |
575 // ---------------------------------------------------------------------------------------- |
554 // |
576 // |
555 static TInt CreateServerProcess() |
577 static TInt CreateServerProcess() |
556 { |
578 { |
557 WRITELOG( "CreateServerProcess() - begin" ); |
579 WRITELOG( "CreateServerProcess() - begin" ); |
|
580 OstTrace0( TRACE_NORMAL, _CREATESERVERPROCESS, "::CreateServerProcess" ); |
|
581 |
558 RProcess server; |
582 RProcess server; |
559 TInt result = server.Create( KHarvesterServerExe, KNullDesC ); |
583 TInt result = server.Create( KHarvesterServerExe, KNullDesC ); |
560 if ( result != KErrNone ) |
584 if ( result != KErrNone ) |
561 { |
585 { |
562 WRITELOG1( "CreateServerProcess() - failed to create server process, error: %d", result ); |
586 WRITELOG1( "CreateServerProcess() - failed to create server process, error: %d", result ); |