File: sync-plan.patch

package info (click to toggle)
plan 1.8.7-3
  • links: PTS
  • area: main
  • in suites: sarge
  • size: 2,196 kB
  • ctags: 1,971
  • sloc: ansic: 24,392; perl: 1,361; sh: 1,030; makefile: 514; yacc: 120; sed: 17
file content (371 lines) | stat: -rw-r--r-- 10,235 bytes parent folder | download | duplicates (7)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
#
# This is a patch for the sync-plan package, which connects the netplan
# daemon with the 3Com PalmPilot. The original package can be found on
# ftp://ryeham.ee.ryerson.ca/pub/PalmOS . It has a bug that causes random
# aborts when large amounts of data are synced. This patch fixes it. Use
# the GNU "patch" utility to apply to sync-plan.
#
# Contributed by Joerg Weber <Joerg.Weber@interface-business.de>
#
# This patch was submitted to Kenneth Albanowski <kjahds@kjahds.com> for
# inclusion in the sync-plan on 10 Dec 1998. Newer versions of sync-plan
# may already contain this patch.
#

*** sync-plan	Fri Sep 25 19:12:09 1998
--- sync-plan_orig	Fri Sep 25 19:14:01 1998
***************
*** 7,19 ****
  use PDA::Pilot;
  use Data::Dumper;
  
- 
  sub id_v2netplan {
      $id="=plan<uid=$<,gid=$(,pid=$$>\n";
      SendPlanCommand($socket, $id);
  }
  
- 
  sub DatePlanToPerl {
  	my($PlanDate) = @_;
  	my($m,$d,$y) = split(m!/!,$PlanDate);
--- 7,17 ----
***************
*** 333,339 ****
  		splice @output, $i, 0, @US;
  	}
  	
! #	print "Generated record |",join("\n", @output),"|\n";
  
  	join("\n",@output);
  }
--- 331,337 ----
  		splice @output, $i, 0, @US;
  	}
  	
! 	print "Generated record |",join("\n", @output),"|\n";
  
  	join("\n",@output);
  }
***************
*** 576,581 ****
--- 574,583 ----
  
  
  sub doafterplan {
+ 
+ 	$ticklecount = 0;	# Reset ticklecount
+ 	$doticklecount = 100;	# Tickle every 100 loop
+ 
  	my($db,$socket,$control) = @_;
  	print "After stuff:\n";
  
***************
*** 624,629 ****
--- 626,638 ----
  	print "Pilot loop\n";	
  
  	foreach (keys %pilotID) {
+ 
+ # Tickle the pilot so it will not time out during this
+ 	$ticklecount++;
+ 	if ($ticklecount >= $doticklecount) {
+ 		$dlp->tickle();
+ 		$ticklecount = 0;
+ 	}
  	
  		# Pilot records originally downloaded from a different Plan database
  		# are off-limits during this pass.
***************
*** 631,637 ****
  		next if $dbname{$_} ne $control->{name}; 
  		
  		
! #		print "Pilot record: ",PrintPilotRecord($pilotID{$_}),"\n";
  		#print "Pilot record: ",Dumper($pilotID{$_}),"\n";
  		if ($pilotID{$_}->{deleted} || $pilotID{$_}->{archived}) {
  		#	
--- 640,646 ----
  		next if $dbname{$_} ne $control->{name}; 
  		
  		
! 		print "Pilot record: ",PrintPilotRecord($pilotID{$_}),"\n";
  		#print "Pilot record: ",Dumper($pilotID{$_}),"\n";
  		if ($pilotID{$_}->{deleted} || $pilotID{$_}->{archived}) {
  		#	
***************
*** 684,690 ****
  					# Action: Install the Pilot record in Plan, regardless of
  					# changed status
  					
! #					print "Action: Install Pilot record in Plan.\n";
  					
  					#print "Installing pilot record in plan: ",Dumper($pilotID{$_});
  					
--- 693,699 ----
  					# Action: Install the Pilot record in Plan, regardless of
  					# changed status
  					
! 					print "Action: Install Pilot record in Plan.\n";
  					
  					#print "Installing pilot record in plan: ",Dumper($pilotID{$_});
  					
***************
*** 843,849 ****
  	print "Plan loop\n";
  
  	foreach (keys %planRecord) {
! #		print "Plan record: ",PrintPlanRecord($planRecord{$_}),"\n";
  		my($record) = $planRecord{$_};
  		my($pid) = $planRecord{$_}->{pilotid};
  		
--- 852,866 ----
  	print "Plan loop\n";
  
  	foreach (keys %planRecord) {
! 
! # Tickle the pilot so it will not time out during this
! 	$ticklecount++;
! 	if ($ticklecount >= $doticklecount) {
! 		$dlp->tickle();
! 		$ticklecount = 0;
! 	}
! 
! 		print "Plan record: ",PrintPlanRecord($planRecord{$_}),"\n";
  		my($record) = $planRecord{$_};
  		my($pid) = $planRecord{$_}->{pilotid};
  		
***************
*** 905,911 ****
  					# Action: Install the Plan record in Pilot, regardless of
  					# changed status
  					
! #					print "Action: Install Plan record in Pilot.\n";
  
  					#print "Installing plan record in pilot: ",Dumper($record);
  					#print "Trying to install Plan record: ",Dumper($record),"\n";
--- 922,928 ----
  					# Action: Install the Plan record in Pilot, regardless of
  					# changed status
  					
! 					print "Action: Install Plan record in Pilot.\n";
  
  					#print "Installing plan record in pilot: ",Dumper($record);
  					#print "Trying to install Plan record: ",Dumper($record),"\n";
***************
*** 932,938 ****
  						my($id) = WritePilotRecord($db,$control,$newrecord);
  						#$db->setRecord($newrecord);
  
! #						print "ID of new Pilot record is $id\n";
  						
  						#my ($hash) = HashPilotRecord($newrecord);						
  						#$pilothash{$id} = $hash;
--- 949,955 ----
  						my($id) = WritePilotRecord($db,$control,$newrecord);
  						#$db->setRecord($newrecord);
  
! 						print "ID of new Pilot record is $id\n";
  						
  						#my ($hash) = HashPilotRecord($newrecord);						
  						#$pilothash{$id} = $hash;
***************
*** 1028,1040 ****
  
  	foreach (keys %pilotID) {
  
  		# Pilot records originally downloaded from a different Plan database
  		# are off-limits during this pass.
  		
  		next if $dbname{$_} ne $control->{name}; 
  
  		#print "Pilot record: ",Dumper($pilotID{$_}),"\n";
! #		print "Pilot record: ",PrintPilotRecord($pilotID{$_}),"\n";
  		if ($pilotID{$_}->{deleted} || $pilotID{$_}->{archived}) {
  			
  			# At this point are seeing Pilot records marked as deleted or
--- 1045,1065 ----
  
  	foreach (keys %pilotID) {
  
+ # Tickle the pilot so it will not time out during this
+ 	$ticklecount++;
+ 	if ($ticklecount >= $doticklecount) {
+ 		$dlp->tickle();
+ 		$ticklecount = 0;
+ 	}
+ 
+ 	
  		# Pilot records originally downloaded from a different Plan database
  		# are off-limits during this pass.
  		
  		next if $dbname{$_} ne $control->{name}; 
  
  		#print "Pilot record: ",Dumper($pilotID{$_}),"\n";
! 		print "Pilot record: ",PrintPilotRecord($pilotID{$_}),"\n";
  		if ($pilotID{$_}->{deleted} || $pilotID{$_}->{archived}) {
  			
  			# At this point are seeing Pilot records marked as deleted or
***************
*** 1044,1053 ****
  			# Action: If there is an associated Plan record that has not
  			# already been deleted, delete it.
  			
! #			print "Log: Deleting Pilot record.\n";
  			
  			if (defined $planID{$_} and not $planID{$_}->{deleted}) {
! #				print "Log: ... and associated Plan record.\n";
  				DeletePlanRecord($socket, $planID{$_});
  				delete $planRecord{$planID{$_}->{id}};
  				delete $planID{$_};
--- 1069,1078 ----
  			# Action: If there is an associated Plan record that has not
  			# already been deleted, delete it.
  			
! 			print "Log: Deleting Pilot record.\n";
  			
  			if (defined $planID{$_} and not $planID{$_}->{deleted}) {
! 				print "Log: ... and associated Plan record.\n";
  				DeletePlanRecord($socket, $planID{$_});
  				delete $planRecord{$planID{$_}->{id}};
  				delete $planID{$_};
***************
*** 1067,1077 ****
  	print "Plan delete loop\n";
  
  	foreach (keys %planRecord) {
  	
  		my($record) = $planRecord{$_};
  		my($pid) = $planRecord{$_}->{pilotid};
! #	        print "Plan record: ",Dumper($record),"\n";
! #		print "Plan record: ",PrintPlanRecord($planRecord{$_}),"\n";
  	
  		# In a fast sync, we might not have loaded the record yet.
  		
--- 1092,1109 ----
  	print "Plan delete loop\n";
  
  	foreach (keys %planRecord) {
+ 
+ # Tickle the pilot so it will not time out during this
+ 	$ticklecount++;
+ 	if ($ticklecount >= $doticklecount) {
+ 		$dlp->tickle();
+ 		$ticklecount = 0;
+ 	}
  	
  		my($record) = $planRecord{$_};
  		my($pid) = $planRecord{$_}->{pilotid};
! 		#print "Plan record: ",Dumper($record),"\n";
! 		print "Plan record: ",PrintPlanRecord($planRecord{$_}),"\n";
  	
  		# In a fast sync, we might not have loaded the record yet.
  		
***************
*** 1101,1109 ****
  			# Action: If there is an associated Plan record that has not
  			# already been deleted, delete it.
  			
! #			print "Log: Deleting Plan record.\n";
  			if (defined $pid and defined $pilotID{$pid} and not $pilotID{$_}->{deleted}) {
! #				print "Log: ... and associated Pilot record.\n";
  				DeletePilotRecord($db, $pid);
  				#$db->deleteRecord($pid);
  				#delete $pilotID{$pid};
--- 1133,1141 ----
  			# Action: If there is an associated Plan record that has not
  			# already been deleted, delete it.
  			
! 			print "Log: Deleting Plan record.\n";
  			if (defined $pid and defined $pilotID{$pid} and not $pilotID{$_}->{deleted}) {
! 				print "Log: ... and associated Pilot record.\n";
  				DeletePilotRecord($db, $pid);
  				#$db->deleteRecord($pid);
  				#delete $pilotID{$pid};
***************
*** 1205,1223 ****
  					print "Plan message: $'";
  					next;
  				} else {
! 					# print stderr "Reply: |$reply|\n";
  					return $reply;
  				}
  				$reply = "";
  			}
  		}
! 		while ( $partialReply !~ /[^\\]\n$/ )
! 		{
! 		    $SysreadBytes=sysread
! 			($socket,$partialReply,1024,length($partialReply));
  		}
  	}
- 
  }
  	
  
--- 1237,1251 ----
  					print "Plan message: $'";
  					next;
  				} else {
! 					#print "Reply: |$reply|\n";
  					return $reply;
  				}
  				$reply = "";
  			}
  		}
! 		while (sysread($socket,$partialReply,1024,length($partialReply))==1024 or /\\\Z/) {
  		}
  	}
  }
  	
  
***************
*** 1247,1255 ****
  	}
  	
  	$netplanversion = $reply;
! 	# send the netplan v2.0 id string
! 	$id="=plan<uid=$<,gid=$(,pid=$$>\n";
! 	SendPlanCommand($socket, $id);
  	SendPlanCommand($socket, "o$dbname\n");
  	$reply = ReadPlanReply($socket);
  	
--- 1275,1285 ----
  	}
  	
  	$netplanversion = $reply;
! 	
!         # send the netplan v2.0 id string
!         $id="=plan<uid=$<,gid=$(,pid=$$>\n";
!         SendPlanCommand($socket, $id);
! 
  	SendPlanCommand($socket, "o$dbname\n");
  	$reply = ReadPlanReply($socket);
  	
***************
*** 1291,1297 ****
  		$reply = ReadPlanReply($socket);
  		
  		if ($reply !~ /\Art\d+\s+(\d+)\s+/s) {
! 		    die "Didn't get record I was looking for.\n";
  		}
  		
  		dorecord($db, $socket, $control, $_, $');
--- 1321,1327 ----
  		$reply = ReadPlanReply($socket);
  		
  		if ($reply !~ /\Art\d+\s+(\d+)\s+/s) {
! 			die "Didn't get record I was looking for.\n";
  		}
  		
  		dorecord($db, $socket, $control, $_, $');
***************
*** 1441,1446 ****
  
  
  close(C);
- 
- 
- 
--- 1471,1473 ----